aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED6
-rw-r--r--Mk/Uses/gnome.mk4
-rw-r--r--accessibility/Makefile2
-rw-r--r--accessibility/accerciser/Makefile4
-rw-r--r--accessibility/accerciser/distinfo6
-rw-r--r--accessibility/accerciser/pkg-descr2
-rw-r--r--accessibility/accerciser/pkg-plist32
-rw-r--r--accessibility/at-spi2-atk/Makefile9
-rw-r--r--accessibility/at-spi2-atk/distinfo6
-rw-r--r--accessibility/at-spi2-core/Makefile16
-rw-r--r--accessibility/at-spi2-core/distinfo6
-rw-r--r--accessibility/at-spi2-core/pkg-plist46
-rw-r--r--accessibility/atk-reference/Makefile8
-rw-r--r--accessibility/atk-reference/pkg-descr1
-rw-r--r--accessibility/atk/Makefile20
-rw-r--r--accessibility/atk/distinfo6
-rw-r--r--accessibility/atk/pkg-plist2
-rw-r--r--accessibility/caribou/Makefile22
-rw-r--r--accessibility/mousetweaks/Makefile28
-rw-r--r--accessibility/mousetweaks/distinfo2
-rw-r--r--accessibility/mousetweaks/pkg-descr17
-rw-r--r--accessibility/mousetweaks/pkg-plist77
-rw-r--r--accessibility/orca/Makefile10
-rw-r--r--accessibility/orca/distinfo5
-rw-r--r--accessibility/orca/pkg-plist564
-rw-r--r--accessibility/py-atspi/Makefile2
-rw-r--r--accessibility/py-atspi/distinfo6
-rw-r--r--archivers/file-roller/Makefile28
-rw-r--r--archivers/file-roller/distinfo6
-rw-r--r--archivers/file-roller/pkg-plist2
-rw-r--r--archivers/gcab/Makefile10
-rw-r--r--archivers/gcab/distinfo6
-rw-r--r--archivers/gcab/pkg-plist10
-rw-r--r--archivers/gnome-autoar/Makefile2
-rw-r--r--archivers/gnome-autoar/distinfo6
-rw-r--r--audio/abraca/Makefile4
-rw-r--r--audio/ardour/Makefile26
-rw-r--r--audio/ardour/files/patch-libs_gtkmm2ext_idle__adjustment.cc10
-rw-r--r--audio/gnome-music/Makefile24
-rw-r--r--audio/gnome-music/distinfo5
-rw-r--r--audio/gnome-music/pkg-plist252
-rw-r--r--databases/evolution-data-server/Makefile16
-rw-r--r--databases/evolution-data-server/distinfo6
-rw-r--r--databases/evolution-data-server/pkg-plist216
-rw-r--r--databases/libgda5/files/patch-00-unicode83
-rw-r--r--databases/libgda5/files/patch-fix-crash21
-rw-r--r--databases/libgda5/files/patch-ftbfs103
-rw-r--r--databases/libgda5/files/patch-ftbfs-211
-rw-r--r--deskutils/Makefile4
-rw-r--r--deskutils/baobab/Makefile23
-rw-r--r--deskutils/baobab/distinfo6
-rw-r--r--deskutils/baobab/pkg-plist44
-rw-r--r--deskutils/bijiben/Makefile35
-rw-r--r--deskutils/bijiben/distinfo5
-rw-r--r--deskutils/bijiben/pkg-plist89
-rw-r--r--deskutils/glabels/Makefile28
-rw-r--r--deskutils/glabels/distinfo5
-rw-r--r--deskutils/glabels/pkg-plist870
-rw-r--r--deskutils/gnome-calendar/Makefile35
-rw-r--r--deskutils/gnome-calendar/distinfo5
-rw-r--r--deskutils/gnome-calendar/pkg-plist26
-rw-r--r--deskutils/gnome-characters/Makefile18
-rw-r--r--deskutils/gnome-characters/distinfo5
-rw-r--r--deskutils/gnome-characters/pkg-plist26
-rw-r--r--deskutils/gnome-clocks/Makefile9
-rw-r--r--deskutils/gnome-clocks/distinfo6
-rw-r--r--deskutils/gnome-clocks/pkg-plist39
-rw-r--r--deskutils/gnome-contacts/Makefile38
-rw-r--r--deskutils/gnome-contacts/distinfo5
-rw-r--r--deskutils/gnome-contacts/files/patch-src_contacts-contact-editor.vala11
-rw-r--r--deskutils/gnome-contacts/files/patch-src_contacts-contact-pane.vala34
-rw-r--r--deskutils/gnome-contacts/pkg-plist11
-rw-r--r--deskutils/gnome-dictionary/Makefile19
-rw-r--r--deskutils/gnome-dictionary/distinfo5
-rw-r--r--deskutils/gnome-dictionary/pkg-plist101
-rw-r--r--deskutils/gnome-documents/Makefile19
-rw-r--r--deskutils/gnome-documents/distinfo6
-rw-r--r--deskutils/gnome-documents/pkg-plist19
-rw-r--r--deskutils/gnome-font-viewer/Makefile18
-rw-r--r--deskutils/gnome-font-viewer/distinfo5
-rw-r--r--deskutils/gnome-font-viewer/pkg-descr2
-rw-r--r--deskutils/gnome-font-viewer/pkg-plist4
-rw-r--r--deskutils/gnome-maps/Makefile24
-rw-r--r--deskutils/gnome-maps/distinfo6
-rw-r--r--deskutils/gnome-maps/pkg-descr4
-rw-r--r--deskutils/gnome-maps/pkg-plist3
-rw-r--r--deskutils/gnome-photos/Makefile9
-rw-r--r--deskutils/gnome-photos/distinfo6
-rw-r--r--deskutils/gnome-photos/pkg-plist26
-rw-r--r--deskutils/gnome-screenshot/Makefile19
-rw-r--r--deskutils/gnome-screenshot/distinfo6
-rw-r--r--deskutils/gnome-screenshot/files/patch-src_meson.build11
-rw-r--r--deskutils/gnome-screenshot/pkg-plist194
-rw-r--r--deskutils/gnome-shell-extension-audio-output-switcher/Makefile13
-rw-r--r--deskutils/gnome-shell-extension-audio-output-switcher/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-audio-output-switcher/pkg-plist6
-rw-r--r--deskutils/gnome-shell-extension-coverflow/Makefile17
-rw-r--r--deskutils/gnome-shell-extension-coverflow/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-coverflow/pkg-plist8
-rw-r--r--deskutils/gnome-shell-extension-dashtodock/Makefile12
-rw-r--r--deskutils/gnome-shell-extension-dashtodock/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-dashtodock/pkg-plist22
-rw-r--r--deskutils/gnome-shell-extension-hidetopbar/Makefile11
-rw-r--r--deskutils/gnome-shell-extension-hidetopbar/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-hidetopbar/pkg-plist9
-rw-r--r--deskutils/gnome-shell-extension-lockkeys/Makefile15
-rw-r--r--deskutils/gnome-shell-extension-lockkeys/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-lockkeys/pkg-plist2
-rw-r--r--deskutils/gnome-shell-extension-mediaplayer/Makefile25
-rw-r--r--deskutils/gnome-shell-extension-mediaplayer/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-mediaplayer/pkg-plist3
-rw-r--r--deskutils/gnome-shell-extension-openweather/Makefile6
-rw-r--r--deskutils/gnome-shell-extension-openweather/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-openweather/pkg-plist4
-rw-r--r--deskutils/gnome-shell-extension-overlay-icons/Makefile42
-rw-r--r--deskutils/gnome-shell-extension-overlay-icons/distinfo2
-rw-r--r--deskutils/gnome-shell-extension-overlay-icons/pkg-plist18
-rw-r--r--deskutils/gnome-shell-extension-panel-osd/Makefile10
-rw-r--r--deskutils/gnome-shell-extension-panel-osd/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-panel-osd/pkg-plist3
-rw-r--r--deskutils/gnome-shell-extension-recent-items/Makefile16
-rw-r--r--deskutils/gnome-shell-extension-recent-items/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-recent-items/pkg-plist3
-rw-r--r--deskutils/gnome-shell-extension-trash/Makefile10
-rw-r--r--deskutils/gnome-shell-extension-trash/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-trash/pkg-plist4
-rw-r--r--deskutils/gnome-shell-extension-weather/Makefile6
-rw-r--r--deskutils/gnome-shell-extension-weather/distinfo5
-rw-r--r--deskutils/gnome-shell-extension-windowoverlay-icons/Makefile53
-rw-r--r--deskutils/gnome-shell-extension-windowoverlay-icons/distinfo3
-rw-r--r--deskutils/gnome-shell-extension-windowoverlay-icons/pkg-descr (renamed from deskutils/gnome-shell-extension-overlay-icons/pkg-descr)0
-rw-r--r--deskutils/gnome-shell-extension-windowoverlay-icons/pkg-plist14
-rw-r--r--deskutils/gnome-shell-extra-extensions/Makefile4
-rw-r--r--deskutils/gnome-sound-recorder/Makefile10
-rw-r--r--deskutils/gnome-sound-recorder/distinfo5
-rw-r--r--deskutils/gnome-sound-recorder/pkg-plist15
-rw-r--r--deskutils/gnome-todo/Makefile28
-rw-r--r--deskutils/gnome-todo/distinfo5
-rw-r--r--deskutils/gnome-todo/pkg-descr2
-rw-r--r--deskutils/gnome-todo/pkg-plist55
-rw-r--r--deskutils/gnome-tweak-tool/Makefile27
-rw-r--r--deskutils/gnome-tweak-tool/distinfo2
-rw-r--r--deskutils/gnome-tweak-tool/pkg-plist139
-rw-r--r--deskutils/gnome-tweaks/Makefile40
-rw-r--r--deskutils/gnome-tweaks/distinfo3
-rw-r--r--deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__startup.py14
-rw-r--r--deskutils/gnome-tweaks/pkg-descr (renamed from deskutils/gnome-tweak-tool/pkg-descr)0
-rw-r--r--deskutils/gnome-tweaks/pkg-plist149
-rw-r--r--deskutils/gnome-utils/Makefile3
-rw-r--r--deskutils/gnome-weather/Makefile2
-rw-r--r--deskutils/gnome-weather/distinfo6
-rw-r--r--deskutils/gnome-weather/pkg-plist1
-rw-r--r--deskutils/gnote/Makefile18
-rw-r--r--deskutils/gnote/distinfo5
-rw-r--r--deskutils/gnote/files/patch-src_actionmanager.cpp23
-rw-r--r--deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteaddin.cpp24
-rw-r--r--deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin.cpp11
-rw-r--r--deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicationaddin.cpp11
-rw-r--r--deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp11
-rw-r--r--deskutils/gnote/files/patch-src_dbus_searchprovider.cpp11
-rw-r--r--deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp10
-rw-r--r--deskutils/gnote/files/patch-src_note.hpp20
-rw-r--r--deskutils/gnote/files/patch-src_notebuffer.cpp29
-rw-r--r--deskutils/gnote/files/patch-src_notetag.cpp11
-rw-r--r--deskutils/gnote/files/patch-src_notewindow.cpp29
-rw-r--r--deskutils/gnote/files/patch-src_remotecontrolproxy.cpp11
-rw-r--r--deskutils/gnote/files/patch-src_searchnoteswidget.cpp11
-rw-r--r--deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp11
-rw-r--r--deskutils/gnote/pkg-descr2
-rw-r--r--deskutils/gnote/pkg-plist47
-rw-r--r--deskutils/kdepimlibs-kde4/Makefile2
-rw-r--r--deskutils/kdepimlibs-kde4/files/patch-libical-3.0190
-rw-r--r--deskutils/nautilus-sendto/Makefile7
-rw-r--r--deskutils/nautilus-sendto/distinfo5
-rw-r--r--deskutils/nautilus-sendto/pkg-descr2
-rw-r--r--deskutils/nautilus-sendto/pkg-plist2
-rw-r--r--deskutils/notification-daemon/Makefile7
-rw-r--r--deskutils/notification-daemon/distinfo5
-rw-r--r--deskutils/notification-daemon/pkg-plist1
-rw-r--r--deskutils/orage/Makefile2
-rw-r--r--deskutils/orage/files/patch-src_ical-code.c79
-rw-r--r--devel/Makefile3
-rw-r--r--devel/anjuta/Makefile17
-rw-r--r--devel/anjuta/distinfo5
-rw-r--r--devel/anjuta/pkg-plist59
-rw-r--r--devel/appstream-glib/Makefile37
-rw-r--r--devel/appstream-glib/distinfo5
-rw-r--r--devel/appstream-glib/pkg-plist60
-rw-r--r--devel/dconf-editor/Makefile14
-rw-r--r--devel/dconf-editor/distinfo6
-rw-r--r--devel/dconf-editor/pkg-plist143
-rw-r--r--devel/dconf/Makefile16
-rw-r--r--devel/dconf/distinfo6
-rw-r--r--devel/dconf/files/patch-docs_Makefile.in19
-rw-r--r--devel/dconf/files/patch-docs_meson.build34
-rw-r--r--devel/dconf/files/patch-meson.build13
-rw-r--r--devel/dconf/files/patch-userconfigdir40
-rw-r--r--devel/dconf/pkg-plist22
-rw-r--r--devel/devhelp/Makefile4
-rw-r--r--devel/devhelp/distinfo6
-rw-r--r--devel/devhelp/files/patch-src_dh-book-manager.c13
-rw-r--r--devel/devhelp/pkg-plist52
-rw-r--r--devel/glade/Makefile20
-rw-r--r--devel/glade/distinfo5
-rw-r--r--devel/glade/files/patch-configure30
-rw-r--r--devel/glade/pkg-plist627
-rw-r--r--devel/glib20-reference/pkg-plist69
-rw-r--r--devel/glib20/Makefile8
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/files/patch-gio_filemonitor1038
-rw-r--r--devel/glib20/files/patch-gio_glib-compile-schemas.c12
-rw-r--r--devel/glib20/files/patch-gio_glocalfileoutputstream.c38
-rw-r--r--devel/glib20/files/patch-gio_kqueue-kqueue-missing.c93
-rw-r--r--devel/glib20/files/patch-gio_kqueue_Makefile.in87
-rw-r--r--devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c463
-rw-r--r--devel/glib20/files/patch-gio_kqueue_kqueue-helper.c409
-rw-r--r--devel/glib20/files/patch-gio_kqueue_kqueue-helper.h40
-rw-r--r--devel/glib20/pkg-plist66
-rw-r--r--devel/glibmm/Makefile3
-rw-r--r--devel/glibmm/distinfo6
-rw-r--r--devel/glibmm/pkg-plist1
-rw-r--r--devel/gnome-builder/Makefile80
-rw-r--r--devel/gnome-builder/distinfo5
-rw-r--r--devel/gnome-builder/files/patch-libide_git_ide-git-buffer-change-monitor.c14
-rw-r--r--devel/gnome-builder/files/patch-src_dialogs_gb-new-project-dialog.c46
-rw-r--r--devel/gnome-builder/files/patch-src_libide_meson.build10
-rw-r--r--devel/gnome-builder/pkg-plist397
-rw-r--r--devel/gobject-introspection/Makefile15
-rw-r--r--devel/gobject-introspection/distinfo6
-rw-r--r--devel/gobject-introspection/files/patch-giscanner_scannerlexer.l11
-rw-r--r--devel/gobject-introspection/pkg-plist117
-rw-r--r--devel/gsettings-desktop-schemas/Makefile10
-rw-r--r--devel/gsettings-desktop-schemas/distinfo5
-rw-r--r--devel/gsettings-desktop-schemas/pkg-plist8
-rw-r--r--devel/gtranslator/Makefile20
-rw-r--r--devel/gtranslator/pkg-plist4
-rw-r--r--devel/gvfs/Makefile29
-rw-r--r--devel/gvfs/distinfo5
-rw-r--r--devel/gvfs/pkg-plist3
-rw-r--r--devel/json-glib/Makefile24
-rw-r--r--devel/json-glib/distinfo6
-rw-r--r--devel/json-glib/pkg-plist3
-rw-r--r--devel/jsonrpc-glib/Makefile20
-rw-r--r--devel/jsonrpc-glib/distinfo3
-rw-r--r--devel/jsonrpc-glib/pkg-descr2
-rw-r--r--devel/jsonrpc-glib/pkg-plist17
-rw-r--r--devel/libgdata/Makefile5
-rw-r--r--devel/libgdata/distinfo6
-rw-r--r--devel/libgdata/pkg-plist28
-rw-r--r--devel/libgee/Makefile2
-rw-r--r--devel/libgee/distinfo6
-rw-r--r--devel/libgee/pkg-plist2
-rw-r--r--devel/libgtop/Makefile5
-rw-r--r--devel/libgtop/distinfo5
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_netload.c332
-rw-r--r--devel/libgtop/pkg-plist178
-rw-r--r--devel/libical/Makefile20
-rw-r--r--devel/libical/distinfo6
-rw-r--r--devel/libical/files/patch-src_libical_icaltz-util.c520
-rw-r--r--devel/libical/files/patch-src_libical_icaltz-util.h41
-rw-r--r--devel/libical/files/patch-src_test_timezones.c82
-rw-r--r--devel/libical/pkg-plist66
-rw-r--r--devel/libpeas/Makefile4
-rw-r--r--devel/libpeas/distinfo6
-rw-r--r--devel/libpeas/pkg-plist7
-rw-r--r--devel/libsoup-reference/Makefile6
-rw-r--r--devel/libsoup-reference/pkg-descr1
-rw-r--r--devel/libsoup/Makefile21
-rw-r--r--devel/libsoup/distinfo6
-rw-r--r--devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c15
-rw-r--r--devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c49
-rw-r--r--devel/libsoup/pkg-plist4
-rw-r--r--devel/mm-common/Makefile6
-rw-r--r--devel/mm-common/distinfo6
-rw-r--r--devel/mm-common/pkg-plist1
-rw-r--r--devel/py-gobject3/pkg-plist60
-rw-r--r--devel/py-gobject3/pkg-plist-py358
-rw-r--r--devel/pygobject3-common/Makefile8
-rw-r--r--devel/pygobject3-common/distinfo5
-rw-r--r--devel/template-glib/Makefile16
-rw-r--r--devel/template-glib/distinfo3
-rw-r--r--devel/template-glib/pkg-descr7
-rw-r--r--devel/template-glib/pkg-plist33
-rw-r--r--devel/xfce4-vala/Makefile4
-rw-r--r--editors/gedit-plugins/Makefile15
-rw-r--r--editors/gedit-plugins/distinfo5
-rw-r--r--editors/gedit-plugins/files/patch-py-compile64
-rw-r--r--editors/gedit-plugins/pkg-descr2
-rw-r--r--editors/gedit-plugins/pkg-plist254
-rw-r--r--editors/gedit/Makefile8
-rw-r--r--editors/gedit/distinfo6
-rw-r--r--editors/gedit/pkg-descr2
-rw-r--r--editors/gedit/pkg-plist304
-rw-r--r--editors/ghex/Makefile8
-rw-r--r--editors/ghex/distinfo5
-rw-r--r--emulators/tiemu3/Makefile2
-rw-r--r--emulators/tiemu3/files/patch-src_core_uae_Makefile6
-rw-r--r--emulators/tiemu3/files/patch-src_core_uae_build68k.c74
-rw-r--r--emulators/tiemu3/files/patch-src_core_uae_fpp.c45
-rw-r--r--emulators/tiemu3/files/patch-src_core_uae_gencpu.c421
-rw-r--r--emulators/tiemu3/files/patch-src_core_uae_machdep_m68k.h11
-rw-r--r--emulators/tiemu3/files/patch-src_core_uae_newcpu.c20
-rw-r--r--emulators/tiemu3/files/patch-src_core_uae_readcpu.c140
-rw-r--r--emulators/tiemu3/files/patch-src_core_uae_sysdeps.h11
-rw-r--r--games/aisleriot/Makefile5
-rw-r--r--games/aisleriot/distinfo6
-rw-r--r--games/five-or-more/Makefile4
-rw-r--r--games/five-or-more/distinfo6
-rw-r--r--games/five-or-more/pkg-plist84
-rw-r--r--games/four-in-a-row/Makefile4
-rw-r--r--games/four-in-a-row/distinfo6
-rw-r--r--games/four-in-a-row/pkg-plist77
-rw-r--r--games/gnome-2048/Makefile4
-rw-r--r--games/gnome-2048/distinfo6
-rw-r--r--games/gnome-2048/pkg-plist8
-rw-r--r--games/gnome-chess/Makefile13
-rw-r--r--games/gnome-chess/distinfo6
-rw-r--r--games/gnome-chess/pkg-plist141
-rw-r--r--games/gnome-klotski/Makefile4
-rw-r--r--games/gnome-klotski/distinfo6
-rw-r--r--games/gnome-klotski/pkg-plist6
-rw-r--r--games/gnome-mines/Makefile10
-rw-r--r--games/gnome-mines/distinfo6
-rw-r--r--games/gnome-mines/pkg-descr2
-rw-r--r--games/gnome-mines/pkg-plist293
-rw-r--r--games/gnome-robots/Makefile4
-rw-r--r--games/gnome-robots/distinfo6
-rw-r--r--games/gnome-robots/pkg-plist34
-rw-r--r--games/gnome-sudoku/Makefile10
-rw-r--r--games/gnome-sudoku/distinfo6
-rw-r--r--games/gnome-sudoku/pkg-plist275
-rw-r--r--games/gnome-taquin/Makefile2
-rw-r--r--games/gnome-taquin/distinfo6
-rw-r--r--games/gnome-taquin/pkg-plist51
-rw-r--r--games/goldencheetah/Makefile2
-rw-r--r--games/goldencheetah/files/patch-src_CalDAV.cpp21
-rw-r--r--games/hitori/Makefile2
-rw-r--r--games/hitori/distinfo6
-rw-r--r--games/hitori/pkg-plist11
-rw-r--r--games/iagno/Makefile2
-rw-r--r--games/iagno/distinfo6
-rw-r--r--games/iagno/pkg-plist44
-rw-r--r--games/libgnome-games-support/Makefile4
-rw-r--r--games/libgnome-games-support/distinfo6
-rw-r--r--games/libgnome-games-support/pkg-plist9
-rw-r--r--games/lightsoff/Makefile5
-rw-r--r--games/lightsoff/distinfo6
-rw-r--r--games/lightsoff/pkg-plist16
-rw-r--r--games/mudmagic/Makefile2
-rw-r--r--games/swell-foop/Makefile21
-rw-r--r--games/swell-foop/distinfo6
-rw-r--r--games/swell-foop/pkg-plist9
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/cairo-reference/Makefile8
-rw-r--r--graphics/cairo-reference/pkg-descr3
-rw-r--r--graphics/cairo/Makefile32
-rw-r--r--graphics/cairo/distinfo6
-rw-r--r--graphics/cairo/files/patch-src_cairo-ft-font.c51
-rw-r--r--graphics/cairo/pkg-plist78
-rw-r--r--graphics/clutter-gtk3/Makefile8
-rw-r--r--graphics/clutter-gtk3/distinfo6
-rw-r--r--graphics/clutter-gtk3/files/patch-Makefile.in11
-rw-r--r--graphics/clutter-gtk3/pkg-plist2
-rw-r--r--graphics/colord/Makefile2
-rw-r--r--graphics/colord/distinfo6
-rw-r--r--graphics/colord/files/patch-Makefile.in16
-rw-r--r--graphics/colord/pkg-plist15
-rw-r--r--graphics/eog-plugins/Makefile11
-rw-r--r--graphics/eog-plugins/distinfo6
-rw-r--r--graphics/eog-plugins/pkg-plist25
-rw-r--r--graphics/eog/Makefile15
-rw-r--r--graphics/eog/distinfo6
-rw-r--r--graphics/eog/pkg-plist156
-rw-r--r--graphics/evince-lite/Makefile4
-rw-r--r--graphics/evince-lite/pkg-plist269
-rw-r--r--graphics/evince/Makefile40
-rw-r--r--graphics/evince/distinfo6
-rw-r--r--graphics/evince/pkg-plist163
-rw-r--r--graphics/gdk-pixbuf2/Makefile44
-rw-r--r--graphics/gdk-pixbuf2/distinfo6
-rw-r--r--graphics/gdk-pixbuf2/files/patch-Makefile.in11
-rw-r--r--graphics/gdk-pixbuf2/pkg-plist217
-rw-r--r--graphics/gnome-color-manager/Makefile27
-rw-r--r--graphics/gnome-color-manager/distinfo5
-rw-r--r--graphics/gnome-color-manager/pkg-plist41
-rw-r--r--graphics/graphene/Makefile6
-rw-r--r--graphics/graphene/distinfo6
-rw-r--r--graphics/graphene/pkg-plist2
-rw-r--r--graphics/libchamplain/Makefile2
-rw-r--r--graphics/libchamplain/distinfo6
-rw-r--r--graphics/libchamplain/pkg-plist6
-rw-r--r--graphics/libepoxy/Makefile4
-rw-r--r--graphics/libepoxy/distinfo6
-rw-r--r--graphics/libepoxy/files/patch-test_dlwrap.c11
-rw-r--r--graphics/libgxps/Makefile10
-rw-r--r--graphics/libgxps/distinfo6
-rw-r--r--graphics/libgxps/pkg-plist26
-rw-r--r--irc/polari/Makefile23
-rw-r--r--irc/polari/distinfo5
-rw-r--r--irc/polari/pkg-plist141
-rw-r--r--lang/gjs/Makefile25
-rw-r--r--lang/gjs/distinfo5
-rw-r--r--lang/gjs/pkg-plist32
-rw-r--r--lang/vala/Makefile8
-rw-r--r--lang/vala/distinfo6
-rw-r--r--lang/vala/pkg-plist68
-rw-r--r--mail/cyrus-imapd25/Makefile2
-rw-r--r--mail/cyrus-imapd25/files/patch-config.h.in12
-rw-r--r--mail/cyrus-imapd25/files/patch-configure38
-rw-r--r--mail/cyrus-imapd25/files/patch-imap_http__caldav.c11
-rw-r--r--mail/cyrus-imapd25/files/patch-imap_http__dav.h10
-rw-r--r--mail/cyrus-imapd25/files/patch-imap_http__timezone.c113
-rw-r--r--mail/cyrus-imapd25/files/patch-imap_xcal.c11
-rw-r--r--mail/evolution-ews/Makefile7
-rw-r--r--mail/evolution-ews/distinfo6
-rw-r--r--mail/evolution-ews/pkg-plist2
-rw-r--r--mail/evolution/Makefile19
-rw-r--r--mail/evolution/distinfo6
-rw-r--r--mail/evolution/pkg-plist373
-rw-r--r--mail/geary/Makefile4
-rw-r--r--mail/geary/distinfo6
-rw-r--r--mail/geary/pkg-plist14
-rw-r--r--math/gnome-calculator/Makefile19
-rw-r--r--math/gnome-calculator/distinfo6
-rw-r--r--math/gnome-calculator/pkg-plist12
-rw-r--r--misc/Makefile1
-rw-r--r--misc/gnome-devel-docs/Makefile4
-rw-r--r--misc/gnome-devel-docs/distinfo5
-rw-r--r--misc/gnome-devel-docs/pkg-plist1021
-rw-r--r--misc/gnome-getting-started-docs/Makefile25
-rw-r--r--misc/gnome-getting-started-docs/distinfo3
-rw-r--r--misc/gnome-getting-started-docs/pkg-descr1
-rw-r--r--misc/gnome-getting-started-docs/pkg-plist1599
-rw-r--r--misc/gnome-user-docs/Makefile6
-rw-r--r--misc/gnome-user-docs/distinfo5
-rw-r--r--misc/gnome-user-docs/pkg-descr2
-rw-r--r--misc/gnome-user-docs/pkg-plist3879
-rw-r--r--misc/lxde-common/Makefile3
-rw-r--r--multimedia/cheese/Makefile21
-rw-r--r--multimedia/cheese/distinfo5
-rw-r--r--multimedia/cheese/pkg-plist188
-rw-r--r--multimedia/clutter-gst/Makefile9
-rw-r--r--multimedia/clutter-gst/distinfo5
-rw-r--r--multimedia/clutter-gst/pkg-plist2
-rw-r--r--multimedia/clutter-gst3/Makefile30
-rw-r--r--multimedia/clutter-gst3/distinfo5
-rw-r--r--multimedia/clutter-gst3/pkg-plist32
-rw-r--r--multimedia/libmediaart/Makefile31
-rw-r--r--multimedia/libmediaart/distinfo6
-rw-r--r--multimedia/libmediaart/pkg-descr2
-rw-r--r--multimedia/libmediaart/pkg-plist42
-rw-r--r--multimedia/totem-pl-parser/Makefile18
-rw-r--r--multimedia/totem-pl-parser/distinfo6
-rw-r--r--multimedia/totem-pl-parser/pkg-plist26
-rw-r--r--multimedia/totem/Makefile70
-rw-r--r--multimedia/totem/distinfo5
-rw-r--r--multimedia/totem/pkg-descr4
-rw-r--r--multimedia/totem/pkg-plist101
-rw-r--r--multimedia/xine/Makefile2
-rw-r--r--net-im/folks/Makefile23
-rw-r--r--net-im/telepathy-logger/Makefile3
-rw-r--r--net-im/telepathy-logger/distinfo5
-rw-r--r--net-im/telepathy-logger/pkg-plist3
-rw-r--r--net/Makefile3
-rw-r--r--net/geoclue/Makefile2
-rw-r--r--net/geoclue/distinfo6
-rw-r--r--net/geocode-glib/Makefile14
-rw-r--r--net/geocode-glib/distinfo5
-rw-r--r--net/geocode-glib/pkg-descr2
-rw-r--r--net/geocode-glib/pkg-plist46
-rw-r--r--net/glib-networking/Makefile22
-rw-r--r--net/glib-networking/distinfo6
-rw-r--r--net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c30
-rw-r--r--net/glib-networking/pkg-plist7
-rw-r--r--net/gnome-online-accounts/Makefile24
-rw-r--r--net/gnome-online-accounts/distinfo6
-rw-r--r--net/gnome-online-accounts/pkg-plist435
-rw-r--r--net/gnome-online-miners/Makefile21
-rw-r--r--net/gnome-online-miners/distinfo5
-rw-r--r--net/grilo-plugins/Makefile6
-rw-r--r--net/grilo-plugins/distinfo6
-rw-r--r--net/grilo-plugins/pkg-plist5
-rw-r--r--net/grilo-plugins2/Makefile52
-rw-r--r--net/grilo-plugins2/distinfo2
-rw-r--r--net/grilo-plugins2/pkg-descr3
-rw-r--r--net/grilo-plugins2/pkg-plist40
-rw-r--r--net/grilo/Makefile4
-rw-r--r--net/grilo/distinfo6
-rw-r--r--net/grilo/pkg-plist3
-rw-r--r--net/grilo2/Makefile38
-rw-r--r--net/grilo2/distinfo2
-rw-r--r--net/grilo2/pkg-descr3
-rw-r--r--net/grilo2/pkg-plist57
-rw-r--r--net/libdmapsharing/Makefile13
-rw-r--r--net/libdmapsharing/distinfo5
-rw-r--r--net/libdmapsharing/pkg-plist7
-rw-r--r--net/libgrss/Makefile26
-rw-r--r--net/libgrss/distinfo3
-rw-r--r--net/libgrss/files/patch-src_feeds-subscriber.c13
-rw-r--r--net/libgrss/files/patch-src_utils.c13
-rw-r--r--net/libgrss/pkg-descr9
-rw-r--r--net/libgrss/pkg-plist69
-rw-r--r--net/libgweather/Makefile14
-rw-r--r--net/libgweather/distinfo6
-rw-r--r--net/libgweather/pkg-plist25
-rw-r--r--net/samba47/files/patch-source3__wscript23
-rw-r--r--net/samba48/files/patch-source3__wscript21
-rw-r--r--net/vinagre/Makefile20
-rw-r--r--net/vinagre/distinfo5
-rw-r--r--net/vinagre/files/patch-configure22
-rw-r--r--net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c23
-rw-r--r--net/vinagre/pkg-plist16
-rw-r--r--net/vino/Makefile22
-rw-r--r--net/vino/distinfo5
-rw-r--r--net/vino/pkg-descr2
-rw-r--r--security/gcr/Makefile6
-rw-r--r--security/gcr/distinfo5
-rw-r--r--security/gcr/pkg-plist10
-rw-r--r--security/gnome-keyring/Makefile12
-rw-r--r--security/gnome-keyring/distinfo5
-rw-r--r--security/gnome-keyring/pkg-plist2
-rw-r--r--security/libsecret/Makefile4
-rw-r--r--security/seahorse/Makefile8
-rw-r--r--security/seahorse/distinfo5
-rw-r--r--security/seahorse/pkg-plist2
-rw-r--r--sysutils/Makefile1
-rw-r--r--sysutils/accountsservice/Makefile8
-rw-r--r--sysutils/accountsservice/distinfo5
-rw-r--r--sysutils/accountsservice/pkg-plist1
-rw-r--r--sysutils/catfish/Makefile3
-rw-r--r--sysutils/consolekit2/Makefile2
-rw-r--r--sysutils/consolekit2/distinfo6
-rw-r--r--sysutils/gnome-control-center/Makefile58
-rw-r--r--sysutils/gnome-control-center/distinfo5
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_datetime_Makefile.in15
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_info_info-overview.ui11
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_info_info.ui13
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build11
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c29
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_user-accounts_meson.build12
-rw-r--r--sysutils/gnome-control-center/files/patch-shell_meson.build14
-rw-r--r--sysutils/gnome-control-center/pkg-plist100
-rw-r--r--sysutils/gnome-power-manager/Makefile22
-rw-r--r--sysutils/gnome-power-manager/distinfo5
-rw-r--r--sysutils/gnome-power-manager/files/patch-configure20
-rw-r--r--sysutils/gnome-power-manager/pkg-plist19
-rw-r--r--sysutils/gnome-settings-daemon/Makefile65
-rw-r--r--sysutils/gnome-settings-daemon/distinfo5
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-data_Makefile.in39
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in15
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-meson.build25
-rw-r--r--sysutils/gnome-settings-daemon/pkg-plist117
-rw-r--r--sysutils/gnome-system-monitor/Makefile14
-rw-r--r--sysutils/gnome-system-monitor/distinfo5
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist143
-rw-r--r--sysutils/hoz/Makefile6
-rw-r--r--sysutils/hoz/files/patch-src_Makefile23
-rw-r--r--sysutils/tracker-miners/Makefile72
-rw-r--r--sysutils/tracker-miners/distinfo3
-rw-r--r--sysutils/tracker-miners/pkg-descr3
-rw-r--r--sysutils/tracker-miners/pkg-plist140
-rw-r--r--sysutils/tracker/Makefile103
-rw-r--r--sysutils/tracker/distinfo5
-rw-r--r--sysutils/tracker/files/patch-configure128
-rw-r--r--sysutils/tracker/files/patch-src_tracker-extract_tracker-cue-sheet.c29
-rw-r--r--sysutils/tracker/pkg-plist548
-rw-r--r--sysutils/upower/Makefile2
-rw-r--r--sysutils/upower/distinfo6
-rw-r--r--textproc/gspell/Makefile10
-rw-r--r--textproc/gspell/distinfo6
-rw-r--r--textproc/gspell/pkg-plist30
-rw-r--r--textproc/gtk-doc/Makefile16
-rw-r--r--textproc/gtk-doc/distinfo6
-rw-r--r--textproc/gtk-doc/pkg-plist51
-rw-r--r--textproc/gtkspell3/Makefile6
-rw-r--r--textproc/gtkspell3/distinfo6
-rw-r--r--textproc/libgepub/Makefile10
-rw-r--r--textproc/libgepub/distinfo6
-rw-r--r--textproc/libgepub/pkg-plist23
-rw-r--r--textproc/meld/Makefile4
-rw-r--r--textproc/meld/distinfo6
-rw-r--r--textproc/meld/pkg-plist85
-rw-r--r--textproc/sary/Makefile2
-rw-r--r--textproc/sary/files/patch-sary_builder.c29
-rw-r--r--textproc/sary/files/patch-src_mksary.c38
-rw-r--r--textproc/xmlroff/Makefile9
-rw-r--r--textproc/xmlroff/files/patch-configure.ac6
-rw-r--r--textproc/xmlroff/files/patch-docs-Makefile.am76
-rw-r--r--textproc/xmlroff/pkg-plist1
-rw-r--r--textproc/yelp-tools/Makefile2
-rw-r--r--textproc/yelp-tools/distinfo5
-rw-r--r--textproc/yelp-xsl/Makefile7
-rw-r--r--textproc/yelp-xsl/distinfo5
-rw-r--r--textproc/yelp-xsl/pkg-plist63
-rw-r--r--www/epiphany/Makefile24
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/files/patch-src_ephy-window.c25
-rw-r--r--www/epiphany/pkg-plist64
-rw-r--r--www/libepc/Makefile15
-rw-r--r--www/libepc/distinfo5
-rw-r--r--www/libepc/pkg-plist33
-rw-r--r--www/webkit2-gtk3/Makefile3
-rw-r--r--www/webkit2-gtk3/distinfo6
-rw-r--r--www/webkit2-gtk3/files/patch-Source_JavaScriptCore_CMakeLists.txt10
-rw-r--r--www/webkit2-gtk3/pkg-plist4
-rw-r--r--x11-fm/nautilus/Makefile39
-rw-r--r--x11-fm/nautilus/distinfo5
-rw-r--r--x11-fm/nautilus/files/patch-Makefile.in10
-rw-r--r--x11-fm/nautilus/files/patch-data_meson.build28
-rw-r--r--x11-fm/nautilus/files/patch-src_meson.build50
-rw-r--r--x11-fm/nautilus/pkg-descr4
-rw-r--r--x11-fm/nautilus/pkg-plist47
-rw-r--r--x11-fm/nemo/Makefile5
-rw-r--r--x11-fm/sushi/Makefile24
-rw-r--r--x11-fm/sushi/distinfo5
-rw-r--r--x11-fm/sushi/pkg-plist46
-rw-r--r--x11-fonts/cantarell-fonts/Makefile8
-rw-r--r--x11-fonts/cantarell-fonts/distinfo6
-rw-r--r--x11-fonts/cantarell-fonts/pkg-plist7
-rw-r--r--x11-themes/Makefile2
-rw-r--r--x11-themes/adapta-gtk-theme/Makefile1
-rw-r--r--x11-themes/adwaita-icon-theme/Makefile2
-rw-r--r--x11-themes/adwaita-icon-theme/distinfo6
-rw-r--r--x11-themes/adwaita-icon-theme/pkg-plist164
-rw-r--r--x11-themes/gnome-backgrounds/Makefile12
-rw-r--r--x11-themes/gnome-backgrounds/distinfo5
-rw-r--r--x11-themes/gnome-backgrounds/pkg-plist20
-rw-r--r--x11-themes/gnome-themes-extra/Makefile (renamed from x11-themes/gnome-themes-standard/Makefile)11
-rw-r--r--x11-themes/gnome-themes-extra/distinfo3
-rw-r--r--x11-themes/gnome-themes-extra/pkg-descr (renamed from x11-themes/gnome-themes-standard/pkg-descr)0
-rw-r--r--x11-themes/gnome-themes-extra/pkg-plist (renamed from x11-themes/gnome-themes-standard/pkg-plist)0
-rw-r--r--x11-themes/gnome-themes-standard/distinfo3
-rw-r--r--x11-themes/gtk-arc-themes/Makefile6
-rw-r--r--x11-toolkits/Makefile3
-rw-r--r--x11-toolkits/gdl/Makefile2
-rw-r--r--x11-toolkits/gdl/distinfo6
-rw-r--r--x11-toolkits/gdl/pkg-plist2
-rw-r--r--x11-toolkits/gtk30-reference/Makefile23
-rw-r--r--x11-toolkits/gtk30-reference/pkg-descr3
-rw-r--r--x11-toolkits/gtk30-reference/pkg-plist664
-rw-r--r--x11-toolkits/gtk30/Makefile36
-rw-r--r--x11-toolkits/gtk30/distinfo6
-rw-r--r--x11-toolkits/gtk30/files/patch-docs_reference_Makefile.in11
-rw-r--r--x11-toolkits/gtk30/pkg-plist676
-rw-r--r--x11-toolkits/gtkextra2/Makefile2
-rw-r--r--x11-toolkits/gtkmm24/Makefile9
-rw-r--r--x11-toolkits/gtkmm24/distinfo5
-rw-r--r--x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_menushell.cc11
-rw-r--r--x11-toolkits/libdazzle/Makefile20
-rw-r--r--x11-toolkits/libdazzle/distinfo3
-rw-r--r--x11-toolkits/libdazzle/pkg-descr6
-rw-r--r--x11-toolkits/libdazzle/pkg-plist147
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-scores.h26
-rw-r--r--x11-toolkits/libwnck3/Makefile15
-rw-r--r--x11-toolkits/libwnck3/distinfo5
-rw-r--r--x11-toolkits/libwnck3/pkg-plist3
-rw-r--r--x11-toolkits/pango-reference/Makefile6
-rw-r--r--x11-toolkits/pango-reference/pkg-descr3
-rw-r--r--x11-toolkits/pango/Makefile25
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/pango/files/patch-meson.build35
-rw-r--r--x11-toolkits/pango/files/patch-meson_options.txt18
-rw-r--r--x11-toolkits/pango/files/patch-pango_meson.build111
-rw-r--r--x11-toolkits/pango/files/patch-tests_meson.build92
-rw-r--r--x11-toolkits/pango/files/patch-utils_meson.build32
-rw-r--r--x11-toolkits/pango/pkg-plist112
-rw-r--r--x11-toolkits/vte3/Makefile11
-rw-r--r--x11-toolkits/vte3/distinfo6
-rw-r--r--x11-toolkits/vte3/files/extra-src_app_app.cc13
-rw-r--r--x11-toolkits/vte3/pkg-plist4
-rw-r--r--x11-wm/metacity/Makefile7
-rw-r--r--x11-wm/metacity/distinfo5
-rw-r--r--x11-wm/mutter/Makefile48
-rw-r--r--x11-wm/mutter/distinfo6
-rw-r--r--x11-wm/mutter/files/patch-src_Makefile.in11
-rw-r--r--x11-wm/mutter/files/patch-src_backends_meta-egl.c81
-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-descr2
-rw-r--r--x11-wm/mutter/pkg-plist265
-rw-r--r--x11/Makefile1
-rw-r--r--x11/altyo/Makefile2
-rw-r--r--x11/cinnamon/Makefile4
-rw-r--r--x11/gdm/Makefile51
-rw-r--r--x11/gdm/distinfo5
-rw-r--r--x11/gdm/files/Makefile.am18
-rw-r--r--x11/gdm/files/configure.ac154
-rw-r--r--x11/gdm/files/daemon_Makefile.am33
-rw-r--r--x11/gdm/files/gdm.in8
-rw-r--r--x11/gdm/files/patch-CVE-2015-7496207
-rw-r--r--x11/gdm/files/patch-Makefile.in20
-rw-r--r--x11/gdm/files/patch-common_gdm-common.c413
-rw-r--r--x11/gdm/files/patch-common_gdm-common.h20
-rw-r--r--x11/gdm/files/patch-common_gdm-log.c56
-rw-r--r--x11/gdm/files/patch-config.h.in77
-rw-r--r--x11/gdm/files/patch-configure431
-rw-r--r--x11/gdm/files/patch-daemon_Makefile.in100
-rw-r--r--x11/gdm/files/patch-daemon_gdm-launch-environment.c37
-rw-r--r--x11/gdm/files/patch-daemon_gdm-local-display-factory.c132
-rw-r--r--x11/gdm/files/patch-daemon_gdm-manager.c946
-rw-r--r--x11/gdm/files/patch-daemon_gdm-server.c167
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session-worker-job.c20
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session-worker.c611
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session-worker.xml12
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session.c56
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session.h19
-rw-r--r--x11/gdm/files/patch-data_Init.in13
-rw-r--r--x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop4
-rw-r--r--x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings4
-rw-r--r--x11/gdm/files/patch-data_pam-redhat_gdm-autologin.pam10
-rw-r--r--x11/gdm/files/patch-data_pam-redhat_gdm-fingerprint.pam10
-rw-r--r--x11/gdm/files/patch-data_pam-redhat_gdm-password.pam10
-rw-r--r--x11/gdm/files/patch-data_pam-redhat_gdm-pin.pam10
-rw-r--r--x11/gdm/files/patch-data_pam-redhat_gdm-smartcard.pam10
-rw-r--r--x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c11
-rw-r--r--x11/gdm/files/patch-libgdm_gdm-user-switching.c412
-rw-r--r--x11/gdm/pkg-plist22
-rw-r--r--x11/gnome-desktop-reference/Makefile8
-rw-r--r--x11/gnome-desktop-reference/pkg-descr3
-rw-r--r--x11/gnome-desktop/Makefile23
-rw-r--r--x11/gnome-desktop/distinfo5
-rw-r--r--x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c11
-rw-r--r--x11/gnome-desktop/pkg-plist7
-rw-r--r--x11/gnome-session/Makefile28
-rw-r--r--x11/gnome-session/distinfo5
-rw-r--r--x11/gnome-session/pkg-plist20
-rw-r--r--x11/gnome-shell-extensions/Makefile17
-rw-r--r--x11/gnome-shell-extensions/distinfo5
-rw-r--r--x11/gnome-shell-extensions/pkg-descr2
-rw-r--r--x11/gnome-shell-extensions/pkg-plist3
-rw-r--r--x11/gnome-shell/Makefile57
-rw-r--r--x11/gnome-shell/distinfo6
-rw-r--r--x11/gnome-shell/files/patch-js_gdm_loginDialog.js23
-rw-r--r--x11/gnome-shell/files/patch-js_misc_loginManager.js54
-rw-r--r--x11/gnome-shell/files/patch-js_ui_screenShield.js21
-rw-r--r--x11/gnome-shell/files/patch-js_ui_sessionMode.js29
-rw-r--r--x11/gnome-shell/pkg-plist91
-rw-r--r--x11/gnome-terminal/Makefile9
-rw-r--r--x11/gnome-terminal/distinfo6
-rw-r--r--x11/gnome-terminal/files/patch-src_Makefile.in14
-rw-r--r--x11/gnome-terminal/pkg-plist127
-rw-r--r--x11/gnome3-lite/Makefile4
-rw-r--r--x11/gnome3/Makefile14
-rw-r--r--x11/libgnome/Makefile3
-rw-r--r--x11/libgnome/files/patch-libgnome_gnome-config.h11
-rw-r--r--x11/libgnomekbd/Makefile17
-rw-r--r--x11/libgnomekbd/distinfo5
-rw-r--r--x11/libgnomekbd/pkg-plist5
-rw-r--r--x11/pantheon-terminal/Makefile2
-rw-r--r--x11/wmdrawer/Makefile3
-rw-r--r--x11/yelp/Makefile3
-rw-r--r--x11/yelp/distinfo6
-rw-r--r--x11/yelp/pkg-plist1
-rw-r--r--x11/zenity/Makefile12
-rw-r--r--x11/zenity/distinfo5
-rw-r--r--x11/zenity/pkg-plist59
756 files changed, 23327 insertions, 11967 deletions
diff --git a/MOVED b/MOVED
index 0480deccf49e..8a3688d8cca4 100644
--- a/MOVED
+++ b/MOVED
@@ -10546,3 +10546,9 @@ x11/tint-devel|x11/tint|2018-09-30|Has expired: Use x11/tint instead
print/apsfilter||2018-09-30|Mostly unmaintained since 2015 and depends on expired ports
print/hpijs||2018-09-30|Has expired: Unsupported since 2005, please migrate to print/hplip
archivers/freeze||2018-09-30|Has expired: unknown license
+accessibility/atk-reference||2018-09-30|Removed stand alone documentation port
+graphics/cairo-reference||2018-09-30|Removed stand-alone documentation port
+deskutils/gnome-shell-extension-overlay-icons|deskutils/gnome-shell-extension-windowoverlay-icons|2018-09-30|Renamed
+deskutils/gnome-tweak-tool|deskutils/gnome-tweaks|2018-09-30|Renamed
+x11-themes/gnome-themes-standard|x11-themes/gnome-themes-extra|2018-09-30|Renamed
+accessibility/mousetweaks/||2018-09-30|Remove, no longer maintained
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 11271543c788..a64c1c3aebc4 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -100,6 +100,10 @@ _USE_GNOME_ALL+=atkmm cairomm gconfmm26 glibmm gtkmm20 gtkmm24 \
libgtksourceviewmm libxml++26 libsigc++12 libsigc++20 \
pangomm
+# glib-mkenums often fails with C locale
+# https://gitlab.gnome.org/GNOME/glib/issues/1430
+USE_LOCALE?= en_US.UTF-8
+
GNOME_MAKEFILEIN?= Makefile.in
SCROLLKEEPER_DIR= /var/db/rarian
diff --git a/accessibility/Makefile b/accessibility/Makefile
index 3e614b4dfa1f..a39831981ac5 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -7,7 +7,6 @@
SUBDIR += at-spi2-atk
SUBDIR += at-spi2-core
SUBDIR += atk
- SUBDIR += atk-reference
SUBDIR += atkmm
SUBDIR += caribou
SUBDIR += eflite
@@ -23,7 +22,6 @@
SUBDIR += kmouth-kde4
SUBDIR += linux-c6-atk
SUBDIR += linux-c7-atk
- SUBDIR += mousetweaks
SUBDIR += orca
SUBDIR += py-atspi
SUBDIR += py-papi
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 19d958da2dfe..e453262a822a 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -1,10 +1,8 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/accessibility/accerciser/Makefile 19980 2014-10-17 06:01:57Z gusi $
PORTNAME= accerciser
-PORTVERSION= 3.14.0
-PORTREVISION= 1
+PORTVERSION= 3.22.0
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo
index 22acc7e5619a..d7e1c2efe75b 100644
--- a/accessibility/accerciser/distinfo
+++ b/accessibility/accerciser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496181398
-SHA256 (gnome3/accerciser-3.14.0.tar.xz) = f5a5915d475e9241396414ccd167724c88807e77e69151cf0b40b32bd57d0574
-SIZE (gnome3/accerciser-3.14.0.tar.xz) = 3213916
+TIMESTAMP = 1476349785
+SHA256 (gnome3/accerciser-3.22.0.tar.xz) = 883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5
+SIZE (gnome3/accerciser-3.22.0.tar.xz) = 3060756
diff --git a/accessibility/accerciser/pkg-descr b/accessibility/accerciser/pkg-descr
index fe0530271806..bdfaba705ccf 100644
--- a/accessibility/accerciser/pkg-descr
+++ b/accessibility/accerciser/pkg-descr
@@ -3,3 +3,5 @@ desktop. It uses AT-SPI to inspect and control widgets, allowing you to check
if an application is providing correct information to assistive technologies
and automated test frameworks. Accerciser has a simple plugin framework which
you can use to create custom views of accessibility information.
+
+WWW: https://wiki.gnome.org/Apps/Accerciser
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
index 7c099c411e6a..670ea03502eb 100644
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@@ -145,6 +145,7 @@ man/man1/accerciser.1.gz
%%DATADIR%%/plugins/quick_select.py
%%DATADIR%%/plugins/validate.py
%%DATADIR%%/plugins/validate.ui
+share/appdata/org.gnome.accerciser.appdata.xml
share/applications/accerciser.desktop
share/help/C/accerciser/api_browser_plugin.page
share/help/C/accerciser/desktop_tree_view.page
@@ -470,33 +471,6 @@ share/help/oc/accerciser/ipython_plugin.page
share/help/oc/accerciser/preferences.page
share/help/oc/accerciser/quick_select_plugin.page
share/help/oc/accerciser/validator_plugin.page
-share/help/pl/accerciser/api_browser_plugin.page
-share/help/pl/accerciser/desktop_tree_view.page
-share/help/pl/accerciser/event_monitor_plugin.page
-share/help/pl/accerciser/figures/IPython_plugin.png
-share/help/pl/accerciser/figures/accerciser-logo.png
-share/help/pl/accerciser/figures/accerciser-view.png
-share/help/pl/accerciser/figures/accerciser_preferences.png
-share/help/pl/accerciser/figures/accessible_tree.png
-share/help/pl/accerciser/figures/api_browser.png
-share/help/pl/accerciser/figures/event_monitor.png
-share/help/pl/accerciser/figures/event_monitor_plugin.png
-share/help/pl/accerciser/figures/global-hotkeys.png
-share/help/pl/accerciser/figures/highlighting.png
-share/help/pl/accerciser/figures/interface_viewer_plugin.png
-share/help/pl/accerciser/figures/plugins.png
-share/help/pl/accerciser/figures/tree_view_accerciser.png
-share/help/pl/accerciser/figures/validator_app_tree.png
-share/help/pl/accerciser/figures/validator_report.png
-share/help/pl/accerciser/howto_setting_up_accerciser.page
-share/help/pl/accerciser/howto_write_a_plugin.page
-share/help/pl/accerciser/index.page
-share/help/pl/accerciser/interface_viewer_plugin.page
-share/help/pl/accerciser/introduction.page
-share/help/pl/accerciser/ipython_plugin.page
-share/help/pl/accerciser/preferences.page
-share/help/pl/accerciser/quick_select_plugin.page
-share/help/pl/accerciser/validator_plugin.page
share/help/pt_BR/accerciser/api_browser_plugin.page
share/help/pt_BR/accerciser/desktop_tree_view.page
share/help/pt_BR/accerciser/event_monitor_plugin.page
@@ -632,11 +606,11 @@ share/help/zh_CN/accerciser/ipython_plugin.page
share/help/zh_CN/accerciser/preferences.page
share/help/zh_CN/accerciser/quick_select_plugin.page
share/help/zh_CN/accerciser/validator_plugin.page
-share/icons/HighContrast/scalable/apps/accerciser.svg
share/icons/hicolor/16x16/apps/accerciser.png
share/icons/hicolor/22x22/apps/accerciser.png
share/icons/hicolor/32x32/apps/accerciser.png
share/icons/hicolor/48x48/apps/accerciser.png
+share/icons/hicolor/symbolic/apps/accerciser-symbolic.svg
share/icons/hicolor/scalable/apps/accerciser.svg
share/locale/ar/LC_MESSAGES/accerciser.mo
share/locale/as/LC_MESSAGES/accerciser.mo
@@ -646,6 +620,7 @@ share/locale/bg/LC_MESSAGES/accerciser.mo
share/locale/bn/LC_MESSAGES/accerciser.mo
share/locale/bn_IN/LC_MESSAGES/accerciser.mo
share/locale/br/LC_MESSAGES/accerciser.mo
+share/locale/bs/LC_MESSAGES/accerciser.mo
share/locale/ca/LC_MESSAGES/accerciser.mo
share/locale/ca@valencia/LC_MESSAGES/accerciser.mo
share/locale/cs/LC_MESSAGES/accerciser.mo
@@ -671,6 +646,7 @@ share/locale/hy/LC_MESSAGES/accerciser.mo
share/locale/id/LC_MESSAGES/accerciser.mo
share/locale/it/LC_MESSAGES/accerciser.mo
share/locale/ja/LC_MESSAGES/accerciser.mo
+share/locale/kk/LC_MESSAGES/accerciser.mo
share/locale/km/LC_MESSAGES/accerciser.mo
share/locale/kn/LC_MESSAGES/accerciser.mo
share/locale/ko/LC_MESSAGES/accerciser.mo
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index 77ac8504130f..0e7eaac3cf55 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= at-spi2-atk
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.2
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -18,14 +18,9 @@ RUN_DEPENDS= at-spi2-core>=2.17.90:accessibility/at-spi2-core
PORTSCOUT= limitw:1,even
-USES= cpe gmake gnome libtool pathfix pkgconfig tar:xz
+USES= cpe gettext-runtime gnome localbase meson pkgconfig tar:xz
USE_GNOME= atk glib20 intlhack
-GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --enable-p2p
-INSTALL_TARGET= install-strip
CPE_VENDOR= gnome
.include <bsd.port.mk>
diff --git a/accessibility/at-spi2-atk/distinfo b/accessibility/at-spi2-atk/distinfo
index 491ca485f9a4..cac2bfbb20d5 100644
--- a/accessibility/at-spi2-atk/distinfo
+++ b/accessibility/at-spi2-atk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491076376
-SHA256 (gnome3/at-spi2-atk-2.24.0.tar.xz) = 022d68497c05cc65ba7cd2b166132de9a160c8d90e9200b5faa473ef7e784c61
-SIZE (gnome3/at-spi2-atk-2.24.0.tar.xz) = 310032
+TIMESTAMP = 1524773003
+SHA256 (gnome3/at-spi2-atk-2.26.2.tar.xz) = 61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e
+SIZE (gnome3/at-spi2-atk-2.26.2.tar.xz) = 322800
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index ff33d998a679..2715d82063d6 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -2,27 +2,25 @@
# $FreeBSD$
PORTNAME= at-spi2-core
-PORTVERSION= 2.24.0
+PORTVERSION= 2.28.0
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Assistive Technology Service Provider Interface
LICENSE= LGPL21
-LIB_DEPENDS= libdbus-1.so:devel/dbus
+LIB_DEPENDS= libdbus-1.so:devel/dbus \
+ libxkbcommon.so:x11/libxkbcommon
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome localbase libtool pathfix pkgconfig tar:xz
-USE_GNOME= glib20 intlhack introspection:build
-USE_XORG= x11 xi xtst xext
+USES= gettext gnome localbase meson pkgconfig tar:xz
+USE_GNOME= glib20 introspection:build
+USE_XORG= ice sm x11 xi xtst xext
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-xevie
-INSTALL_TARGET= install-strip
post-install:
${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
diff --git a/accessibility/at-spi2-core/distinfo b/accessibility/at-spi2-core/distinfo
index 7d4ac1b1b4c4..26cb93f4d97b 100644
--- a/accessibility/at-spi2-core/distinfo
+++ b/accessibility/at-spi2-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491076488
-SHA256 (gnome3/at-spi2-core-2.24.0.tar.xz) = 6179f314fbd903b3cd3477a57b6b1fecca88b76ce769ce777fda0d3e5f61afcd
-SIZE (gnome3/at-spi2-core-2.24.0.tar.xz) = 454160
+TIMESTAMP = 1525378489
+SHA256 (gnome/at-spi2-core-2.28.0.tar.xz) = 42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87
+SIZE (gnome/at-spi2-core-2.28.0.tar.xz) = 186676
diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist
index 7a9d1eeaee91..025d86688aa4 100644
--- a/accessibility/at-spi2-core/pkg-plist
+++ b/accessibility/at-spi2-core/pkg-plist
@@ -5,14 +5,11 @@ include/at-spi-2.0/atspi/atspi-application.h
include/at-spi-2.0/atspi/atspi-collection.h
include/at-spi-2.0/atspi/atspi-component.h
include/at-spi-2.0/atspi/atspi-constants.h
-include/at-spi-2.0/atspi/atspi-device-listener-private.h
include/at-spi-2.0/atspi/atspi-device-listener.h
include/at-spi-2.0/atspi/atspi-document.h
include/at-spi-2.0/atspi/atspi-editabletext.h
include/at-spi-2.0/atspi/atspi-enum-types.h
-include/at-spi-2.0/atspi/atspi-event-listener-private.h
include/at-spi-2.0/atspi/atspi-event-listener.h
-include/at-spi-2.0/atspi/atspi-gmain.c
include/at-spi-2.0/atspi/atspi-gmain.h
include/at-spi-2.0/atspi/atspi-hyperlink.h
include/at-spi-2.0/atspi/atspi-hypertext.h
@@ -20,7 +17,6 @@ include/at-spi-2.0/atspi/atspi-image.h
include/at-spi-2.0/atspi/atspi-matchrule.h
include/at-spi-2.0/atspi/atspi-misc.h
include/at-spi-2.0/atspi/atspi-object.h
-include/at-spi-2.0/atspi/atspi-private.h
include/at-spi-2.0/atspi/atspi-registry.h
include/at-spi-2.0/atspi/atspi-relation.h
include/at-spi-2.0/atspi/atspi-selection.h
@@ -42,47 +38,6 @@ share/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
share/dbus-1/services/org.a11y.Bus.service
share/defaults/at-spi2/accessibility.conf
share/gir-1.0/Atspi-2.0.gir
-share/gtk-doc/html/libatspi/AtspiAccessible.html
-share/gtk-doc/html/libatspi/AtspiDeviceListener.html
-share/gtk-doc/html/libatspi/AtspiEventListener.html
-share/gtk-doc/html/libatspi/AtspiHyperlink.html
-share/gtk-doc/html/libatspi/AtspiMatchRule.html
-share/gtk-doc/html/libatspi/AtspiObject.html
-share/gtk-doc/html/libatspi/AtspiRelation.html
-share/gtk-doc/html/libatspi/AtspiStateSet.html
-share/gtk-doc/html/libatspi/annotation-glossary.html
-share/gtk-doc/html/libatspi/api-index-full.html
-share/gtk-doc/html/libatspi/ch01.html
-share/gtk-doc/html/libatspi/home.png
-share/gtk-doc/html/libatspi/index.html
-share/gtk-doc/html/libatspi/left-insensitive.png
-share/gtk-doc/html/libatspi/left.png
-share/gtk-doc/html/libatspi/libatspi-AtspiApplication.html
-share/gtk-doc/html/libatspi/libatspi-atspi-action.html
-share/gtk-doc/html/libatspi/libatspi-atspi-collection.html
-share/gtk-doc/html/libatspi/libatspi-atspi-component.html
-share/gtk-doc/html/libatspi/libatspi-atspi-constants.html
-share/gtk-doc/html/libatspi/libatspi-atspi-document.html
-share/gtk-doc/html/libatspi/libatspi-atspi-editabletext.html
-share/gtk-doc/html/libatspi/libatspi-atspi-hypertext.html
-share/gtk-doc/html/libatspi/libatspi-atspi-image.html
-share/gtk-doc/html/libatspi/libatspi-atspi-listener-private.html
-share/gtk-doc/html/libatspi/libatspi-atspi-misc-private.html
-share/gtk-doc/html/libatspi/libatspi-atspi-misc.html
-share/gtk-doc/html/libatspi/libatspi-atspi-registry.html
-share/gtk-doc/html/libatspi/libatspi-atspi-selection.html
-share/gtk-doc/html/libatspi/libatspi-atspi-table-cell.html
-share/gtk-doc/html/libatspi/libatspi-atspi-table.html
-share/gtk-doc/html/libatspi/libatspi-atspi-text.html
-share/gtk-doc/html/libatspi/libatspi-atspi-types.html
-share/gtk-doc/html/libatspi/libatspi-atspi-value.html
-share/gtk-doc/html/libatspi/libatspi.devhelp2
-share/gtk-doc/html/libatspi/object-tree.html
-share/gtk-doc/html/libatspi/right-insensitive.png
-share/gtk-doc/html/libatspi/right.png
-share/gtk-doc/html/libatspi/style.css
-share/gtk-doc/html/libatspi/up-insensitive.png
-share/gtk-doc/html/libatspi/up.png
share/locale/an/LC_MESSAGES/at-spi2-core.mo
share/locale/as/LC_MESSAGES/at-spi2-core.mo
share/locale/ast/LC_MESSAGES/at-spi2-core.mo
@@ -127,6 +82,7 @@ share/locale/ml/LC_MESSAGES/at-spi2-core.mo
share/locale/mr/LC_MESSAGES/at-spi2-core.mo
share/locale/ms/LC_MESSAGES/at-spi2-core.mo
share/locale/nb/LC_MESSAGES/at-spi2-core.mo
+share/locale/ne/LC_MESSAGES/at-spi2-core.mo
share/locale/nl/LC_MESSAGES/at-spi2-core.mo
share/locale/oc/LC_MESSAGES/at-spi2-core.mo
share/locale/or/LC_MESSAGES/at-spi2-core.mo
diff --git a/accessibility/atk-reference/Makefile b/accessibility/atk-reference/Makefile
deleted file mode 100644
index 8fd6e117e965..000000000000
--- a/accessibility/atk-reference/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 0
-
-REFERENCE_SRC= ${WRKSRC}/docs
-
-.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/accessibility/atk-reference/pkg-descr b/accessibility/atk-reference/pkg-descr
deleted file mode 100644
index 4ed38046179d..000000000000
--- a/accessibility/atk-reference/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This port contains the programming reference for accessibility/atk.
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 24ab418a2019..a59002c38b36 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= atk
-PORTVERSION= 2.24.0
+PORTVERSION= 2.28.1
PORTREVISION?= 0
CATEGORIES= accessibility devel
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME accessibility toolkit (ATK)
@@ -14,22 +14,10 @@ COMMENT= GNOME accessibility toolkit (ATK)
LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= tar:xz
PORTSCOUT= limitw:1,even
-.if !defined(REFERENCE_PORT)
-
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-USES+= gettext gmake gnome libtool localbase pathfix pkgconfig
-USE_GNOME= glib20 introspection:build referencehack
-CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
-INSTALL_TARGET= install-strip
-
-post-patch:
- @${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests docs//" \
- ${WRKSRC}/Makefile.in
+USES= gettext gnome localbase meson pkgconfig tar:xz
+USE_GNOME= glib20 introspection:build
.include <bsd.port.mk>
-
-.endif
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 0cfac129a607..9cb2c780a94b 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491075941
-SHA256 (gnome2/atk-2.24.0.tar.xz) = bb2daa9a808c73a7a79d2983f333e0ba74be42fc51e3ba1faf2551a636487a49
-SIZE (gnome2/atk-2.24.0.tar.xz) = 748972
+TIMESTAMP = 1524772876
+SHA256 (gnome/atk-2.28.1.tar.xz) = cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc
+SIZE (gnome/atk-2.28.1.tar.xz) = 712508
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index b4fc3a193ac2..af0c33d2fa74 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -35,7 +35,7 @@ include/atk-1.0/atk/atkwindow.h
lib/girepository-1.0/Atk-1.0.typelib
lib/libatk-1.0.so
lib/libatk-1.0.so.0
-lib/libatk-1.0.so.0.22409.1
+lib/libatk-1.0.so.0.22810.1
libdata/pkgconfig/atk.pc
share/gir-1.0/Atk-1.0.gir
share/locale/af/LC_MESSAGES/atk10.mo
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 25a5ed853687..df8fab27bd1c 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -3,7 +3,7 @@
PORTNAME= caribou
PORTVERSION= 0.4.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -16,18 +16,22 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libclutter-glx-1.0.so:graphics/clutter \
libgee-0.8.so:devel/libgee \
- libxklavier.so:x11/libxklavier
-RUN_DEPENDS= py2?-atspi>=2.1.91:accessibility/py-atspi@${PY_FLAVOR}
+ libxklavier.so:x11/libxklavier \
+ libcogl-path.so:graphics/cogl \
+ libjson-glib-1.0.so:devel/json-glib \
+ libatspi.so:accessibility/at-spi2-core \
+ libdbus-1.so:devel/dbus
+RUN_DEPENDS= py3?-atspi>=2.1.91:accessibility/py-atspi@${PY_FLAVOR}
-USES= gettext gmake gnome libtool pathfix pkgconfig python:2.7 \
- shebangfix tar:xz
-USE_GNOME= gtk30 intlhack introspection:build libxml2 \
+USES= gettext gmake gnome libtool localbase pathfix \
+ pkgconfig python:3.3+ shebangfix tar:xz
+USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack introspection:build libxml2 \
libxslt:build pygobject3
+USE_PYTHON= py3kplist
SHEBANG_FILES= tools/fix_gir.py tools/make_schema.py
-USE_XORG= x11 xtst
+USE_GL= egl
+USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xtst
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --enable-gtk2-module=no
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
deleted file mode 100644
index 49ad15250f5e..000000000000
--- a/accessibility/mousetweaks/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Koop Mast <kwm@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports-experimental/trunk/accessibility/mousetweaks/Makefile 19291 2014-03-24 20:41:35Z gusi $
-
-PORTNAME= mousetweaks
-PORTVERSION= 3.12.0
-PORTREVISION= 1
-CATEGORIES= accessibility
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Mouse accessibility enhancements for the GNOME desktop
-
-BUILD_DEPENDS= gsettings-desktop-schemas>=0.1.0:devel/gsettings-desktop-schemas
-RUN_DEPENDS= gsettings-desktop-schemas>=0.1.0:devel/gsettings-desktop-schemas
-
-USE_XORG= x11 xfixes xcursor xtst
-USE_GNOME= gnomeprefix gtk30 intlhack
-USES= gettext gmake pathfix pkgconfig tar:xz
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-GLIB_SCHEMAS= org.gnome.mousetweaks.enums.xml \
- org.gnome.mousetweaks.gschema.xml
-
-.include <bsd.port.mk>
diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo
deleted file mode 100644
index ab6441aea1b6..000000000000
--- a/accessibility/mousetweaks/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/mousetweaks-3.12.0.tar.xz) = c0db478ccb390665e3201e9d1ce08b1c6573a697b797c9e828debb94b1ae3b97
-SIZE (gnome3/mousetweaks-3.12.0.tar.xz) = 287236
diff --git a/accessibility/mousetweaks/pkg-descr b/accessibility/mousetweaks/pkg-descr
deleted file mode 100644
index 3693b78569ac..000000000000
--- a/accessibility/mousetweaks/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-The Mousetweaks package provides mouse accessibility enhancements for the
-GNOME desktop.
-
-These enhancements are:
-
-1. It offers a way to perform the various clicks without using any
-hardware button.
-
-2. It allows users to perform a right click by doing a click&hold of the
-left mouse button. (For a left-handed mouse user, the terms left and right
-have to be inverted.)
-
-3. It provides an applet that the user can install on a panel. This applet
-creates an area on the panel into which the pointer can be captured until
-the user releases it with a predefined button and modifier combination.
-
-WWW: https://launchpad.net/mousetweaks/
diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist
deleted file mode 100644
index 63da9f12d59d..000000000000
--- a/accessibility/mousetweaks/pkg-plist
+++ /dev/null
@@ -1,77 +0,0 @@
-bin/mousetweaks
-man/man1/mousetweaks.1.gz
-share/GConf/gsettings/mousetweaks.convert
-share/locale/an/LC_MESSAGES/mousetweaks.mo
-share/locale/ar/LC_MESSAGES/mousetweaks.mo
-share/locale/as/LC_MESSAGES/mousetweaks.mo
-share/locale/ast/LC_MESSAGES/mousetweaks.mo
-share/locale/be/LC_MESSAGES/mousetweaks.mo
-share/locale/bg/LC_MESSAGES/mousetweaks.mo
-share/locale/bn/LC_MESSAGES/mousetweaks.mo
-share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo
-share/locale/ca/LC_MESSAGES/mousetweaks.mo
-share/locale/ca@valencia/LC_MESSAGES/mousetweaks.mo
-share/locale/cs/LC_MESSAGES/mousetweaks.mo
-share/locale/da/LC_MESSAGES/mousetweaks.mo
-share/locale/de/LC_MESSAGES/mousetweaks.mo
-share/locale/el/LC_MESSAGES/mousetweaks.mo
-share/locale/en@shaw/LC_MESSAGES/mousetweaks.mo
-share/locale/en_GB/LC_MESSAGES/mousetweaks.mo
-share/locale/eo/LC_MESSAGES/mousetweaks.mo
-share/locale/es/LC_MESSAGES/mousetweaks.mo
-share/locale/et/LC_MESSAGES/mousetweaks.mo
-share/locale/eu/LC_MESSAGES/mousetweaks.mo
-share/locale/fa/LC_MESSAGES/mousetweaks.mo
-share/locale/fi/LC_MESSAGES/mousetweaks.mo
-share/locale/fr/LC_MESSAGES/mousetweaks.mo
-share/locale/fur/LC_MESSAGES/mousetweaks.mo
-share/locale/gd/LC_MESSAGES/mousetweaks.mo
-share/locale/gl/LC_MESSAGES/mousetweaks.mo
-share/locale/gu/LC_MESSAGES/mousetweaks.mo
-share/locale/he/LC_MESSAGES/mousetweaks.mo
-share/locale/hi/LC_MESSAGES/mousetweaks.mo
-share/locale/hu/LC_MESSAGES/mousetweaks.mo
-share/locale/id/LC_MESSAGES/mousetweaks.mo
-share/locale/it/LC_MESSAGES/mousetweaks.mo
-share/locale/ja/LC_MESSAGES/mousetweaks.mo
-share/locale/kn/LC_MESSAGES/mousetweaks.mo
-share/locale/ko/LC_MESSAGES/mousetweaks.mo
-share/locale/lt/LC_MESSAGES/mousetweaks.mo
-share/locale/lv/LC_MESSAGES/mousetweaks.mo
-share/locale/mai/LC_MESSAGES/mousetweaks.mo
-share/locale/mk/LC_MESSAGES/mousetweaks.mo
-share/locale/ml/LC_MESSAGES/mousetweaks.mo
-share/locale/mr/LC_MESSAGES/mousetweaks.mo
-share/locale/nb/LC_MESSAGES/mousetweaks.mo
-share/locale/nl/LC_MESSAGES/mousetweaks.mo
-share/locale/nn/LC_MESSAGES/mousetweaks.mo
-share/locale/oc/LC_MESSAGES/mousetweaks.mo
-share/locale/or/LC_MESSAGES/mousetweaks.mo
-share/locale/pa/LC_MESSAGES/mousetweaks.mo
-share/locale/pl/LC_MESSAGES/mousetweaks.mo
-share/locale/pt/LC_MESSAGES/mousetweaks.mo
-share/locale/pt_BR/LC_MESSAGES/mousetweaks.mo
-share/locale/ro/LC_MESSAGES/mousetweaks.mo
-share/locale/ru/LC_MESSAGES/mousetweaks.mo
-share/locale/sk/LC_MESSAGES/mousetweaks.mo
-share/locale/sl/LC_MESSAGES/mousetweaks.mo
-share/locale/sq/LC_MESSAGES/mousetweaks.mo
-share/locale/sr/LC_MESSAGES/mousetweaks.mo
-share/locale/sr@latin/LC_MESSAGES/mousetweaks.mo
-share/locale/sv/LC_MESSAGES/mousetweaks.mo
-share/locale/ta/LC_MESSAGES/mousetweaks.mo
-share/locale/te/LC_MESSAGES/mousetweaks.mo
-share/locale/tg/LC_MESSAGES/mousetweaks.mo
-share/locale/th/LC_MESSAGES/mousetweaks.mo
-share/locale/tr/LC_MESSAGES/mousetweaks.mo
-share/locale/ug/LC_MESSAGES/mousetweaks.mo
-share/locale/uk/LC_MESSAGES/mousetweaks.mo
-share/locale/vi/LC_MESSAGES/mousetweaks.mo
-share/locale/zh_CN/LC_MESSAGES/mousetweaks.mo
-share/locale/zh_HK/LC_MESSAGES/mousetweaks.mo
-share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo
-%%DATADIR%%/double-click.png
-%%DATADIR%%/drag-click.png
-%%DATADIR%%/mousetweaks.ui
-%%DATADIR%%/right-click.png
-%%DATADIR%%/single-click.png
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index a732393f2d41..7bea01afaea0 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= orca
-PORTVERSION= 3.18.2
+PORTVERSION= 3.28.2
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -10,6 +10,9 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Scriptable screen reader
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \
py3?-xdg>=0:devel/py-xdg@${PY_FLAVOR} \
py3?-cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
@@ -27,12 +30,11 @@ CONFLICTS= py*-json-py-[0-9]*
PORTSCOUT= limitw:1,even
NO_ARCH= yes
-USES= gettext gmake gnome pathfix pkgconfig python:3.4+ tar:xz
+USES= gettext gmake gnome localbase pathfix pkgconfig \
+ python:3.4+ tar:xz
USE_GNOME= gtk30 pygobject3 intlhack
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index 2cdab197530f..8e7315de114c 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/orca-3.18.2.tar.xz) = 986244af7a0891b758eb8e772bc61d72483808e7e9c790360f9f389045d7262a
-SIZE (gnome3/orca-3.18.2.tar.xz) = 2213548
+TIMESTAMP = 1530383819
+SHA256 (gnome3/orca-3.28.2.tar.xz) = 188d168a135a3fad1c73ae4b51a426e0717b78ee591e2b78b6e50164a2343023
+SIZE (gnome3/orca-3.28.2.tar.xz) = 2460112
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index 7dd694b877a5..b1cef3e08fed 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -1,138 +1,138 @@
bin/orca
etc/xdg/autostart/orca-autostart.desktop
%%PYTHON_SITELIBDIR%%/orca/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/acss.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/braille_rolenames.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/caret_navigation.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/caret_navigation.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/caret_navigation.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/cmdnames.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/colornames.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/common_keyboardmap.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/desktop_keyboardmap.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/event_manager.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/eventsynthesizer.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/find.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/flat_review.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/guilabels.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/input_event.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keybindings.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/keynames.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/label_inference.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/laptop_keyboardmap.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/liveregions.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/mathsymbols.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/mathsymbols.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/mathsymbols.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/messages.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/mouse_review.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/notification_messages.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/object_properties.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_console_prefs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_console_prefs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gtkbuilder.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gtkbuilder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_commandlist.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gtkbuilder.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_commandlist.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_find.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_commandlist.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_find.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_navlist.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_find.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_navlist.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_prefs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_navlist.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_prefs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_profile.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_prefs.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_profile.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_i18n.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_gui_profile.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_i18n.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_i18n.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_platform.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/orca_state.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/phonnames.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/pronunciation_dict.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/punctuation_settings.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_manager.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/settings_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/sound.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/sound.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/sound_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/sound_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechdispatcherfactory.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/speechserver.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/structural_navigation.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/text_attribute_names.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/__pycache__/where_am_I.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/tutorialgenerator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/acss.py
%%PYTHON_SITELIBDIR%%/orca/backends/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/backends/__pycache__/json_backend.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/backends/json_backend.py
%%PYTHON_SITELIBDIR%%/orca/bookmarks.py
%%PYTHON_SITELIBDIR%%/orca/braille.py
@@ -168,7 +168,6 @@ etc/xdg/autostart/orca-autostart.desktop
%%PYTHON_SITELIBDIR%%/orca/notification_messages.py
%%PYTHON_SITELIBDIR%%/orca/object_properties.py
%%PYTHON_SITELIBDIR%%/orca/orca.py
-%%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.py
%%PYTHON_SITELIBDIR%%/orca/orca_gtkbuilder.py
%%PYTHON_SITELIBDIR%%/orca/orca_gui_commandlist.py
%%PYTHON_SITELIBDIR%%/orca/orca_gui_find.py
@@ -185,406 +184,384 @@ etc/xdg/autostart/orca-autostart.desktop
%%PYTHON_SITELIBDIR%%/orca/script_manager.py
%%PYTHON_SITELIBDIR%%/orca/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/default.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/__pycache__/self_voicing.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/chat.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/SeaMonkey/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/SeaMonkey/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/SeaMonkey/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/SeaMonkey/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/SeaMonkey/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/SeaMonkey/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/spellcheck.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/epiphany/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evince/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/script.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdm-simple-greeter/script.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/spellcheck.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-documents/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/script.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/formatting.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-shell/script_utilities.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/script.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/chat.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/chat.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/braille_generator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/script.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/spellcheck.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/spellcheck.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/default.py
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/braille_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/terminal/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/formatting.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Qt/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/clutter/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/script_utilities.py
%%PYTHON_SITELIBDIR%%/orca/scripts/web/__init__.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/bookmarks.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/braille_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script_utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/sound_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/sound_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/tutorial_generator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/speech_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/tutorial_generator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/tutorial_generator.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/web/bookmarks.py
%%PYTHON_SITELIBDIR%%/orca/scripts/web/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/web/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/web/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/sound_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/web/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/web/tutorial_generator.py
%%PYTHON_SITELIBDIR%%/orca/settings.py
%%PYTHON_SITELIBDIR%%/orca/settings_manager.py
+%%PYTHON_SITELIBDIR%%/orca/sound.py
+%%PYTHON_SITELIBDIR%%/orca/sound_generator.py
%%PYTHON_SITELIBDIR%%/orca/speech.py
%%PYTHON_SITELIBDIR%%/orca/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.py
@@ -593,9 +570,7 @@ etc/xdg/autostart/orca-autostart.desktop
%%PYTHON_SITELIBDIR%%/orca/structural_navigation.py
%%PYTHON_SITELIBDIR%%/orca/text_attribute_names.py
%%PYTHON_SITELIBDIR%%/orca/tutorialgenerator.py
-%%PYTHON_SITELIBDIR%%/orca/where_am_I.py
man/man1/orca.1.gz
-share/applications/orca.desktop
share/help/C/orca/commands.page
share/help/C/orca/commands_bookmarks.page
share/help/C/orca/commands_braille.page
@@ -630,7 +605,6 @@ share/help/C/orca/howto_setting_up_orca.page
share/help/C/orca/howto_structural_navigation.page
share/help/C/orca/howto_tables.page
share/help/C/orca/howto_text_attributes.page
-share/help/C/orca/howto_text_setup.page
share/help/C/orca/howto_the_orca_modifier.page
share/help/C/orca/howto_toggling_caps_lock.page
share/help/C/orca/howto_whereami.page
@@ -650,6 +624,59 @@ share/help/C/orca/preferences_spellcheck.page
share/help/C/orca/preferences_table_navigation.page
share/help/C/orca/preferences_text_attributes.page
share/help/C/orca/preferences_voice.page
+share/help/bg/orca/commands.page
+share/help/bg/orca/commands_bookmarks.page
+share/help/bg/orca/commands_braille.page
+share/help/bg/orca/commands_chat.page
+share/help/bg/orca/commands_controlling_orca.page
+share/help/bg/orca/commands_debugging.page
+share/help/bg/orca/commands_find.page
+share/help/bg/orca/commands_flat_review.page
+share/help/bg/orca/commands_live_regions.page
+share/help/bg/orca/commands_mouse.page
+share/help/bg/orca/commands_profiles.page
+share/help/bg/orca/commands_reading.page
+share/help/bg/orca/commands_speech_settings.page
+share/help/bg/orca/commands_structural_navigation.page
+share/help/bg/orca/commands_table.page
+share/help/bg/orca/commands_time_date_notifications.page
+share/help/bg/orca/commands_where_am_i.page
+share/help/bg/orca/figures/orca-logo.png
+share/help/bg/orca/howto_bookmarks.page
+share/help/bg/orca/howto_documents.page
+share/help/bg/orca/howto_flat_review.page
+share/help/bg/orca/howto_forms.page
+share/help/bg/orca/howto_key_bindings.page
+share/help/bg/orca/howto_keyboard_layout.page
+share/help/bg/orca/howto_learn_modes.page
+share/help/bg/orca/howto_live_regions.page
+share/help/bg/orca/howto_mouse_review.page
+share/help/bg/orca/howto_notifications.page
+share/help/bg/orca/howto_orca_find.page
+share/help/bg/orca/howto_profiles.page
+share/help/bg/orca/howto_setting_up_orca.page
+share/help/bg/orca/howto_structural_navigation.page
+share/help/bg/orca/howto_tables.page
+share/help/bg/orca/howto_text_attributes.page
+share/help/bg/orca/howto_the_orca_modifier.page
+share/help/bg/orca/howto_toggling_caps_lock.page
+share/help/bg/orca/howto_whereami.page
+share/help/bg/orca/index.page
+share/help/bg/orca/introduction.page
+share/help/bg/orca/preferences.page
+share/help/bg/orca/preferences_braille.page
+share/help/bg/orca/preferences_chat.page
+share/help/bg/orca/preferences_gecko.page
+share/help/bg/orca/preferences_general.page
+share/help/bg/orca/preferences_introduction.page
+share/help/bg/orca/preferences_key_bindings.page
+share/help/bg/orca/preferences_key_echo.page
+share/help/bg/orca/preferences_pronunciation.page
+share/help/bg/orca/preferences_speech.page
+share/help/bg/orca/preferences_spellcheck.page
+share/help/bg/orca/preferences_table_navigation.page
+share/help/bg/orca/preferences_text_attributes.page
+share/help/bg/orca/preferences_voice.page
share/help/cs/orca/commands.page
share/help/cs/orca/commands_bookmarks.page
share/help/cs/orca/commands_braille.page
@@ -684,7 +711,6 @@ share/help/cs/orca/howto_setting_up_orca.page
share/help/cs/orca/howto_structural_navigation.page
share/help/cs/orca/howto_tables.page
share/help/cs/orca/howto_text_attributes.page
-share/help/cs/orca/howto_text_setup.page
share/help/cs/orca/howto_the_orca_modifier.page
share/help/cs/orca/howto_toggling_caps_lock.page
share/help/cs/orca/howto_whereami.page
@@ -738,7 +764,6 @@ share/help/de/orca/howto_setting_up_orca.page
share/help/de/orca/howto_structural_navigation.page
share/help/de/orca/howto_tables.page
share/help/de/orca/howto_text_attributes.page
-share/help/de/orca/howto_text_setup.page
share/help/de/orca/howto_the_orca_modifier.page
share/help/de/orca/howto_toggling_caps_lock.page
share/help/de/orca/howto_whereami.page
@@ -792,7 +817,6 @@ share/help/el/orca/howto_setting_up_orca.page
share/help/el/orca/howto_structural_navigation.page
share/help/el/orca/howto_tables.page
share/help/el/orca/howto_text_attributes.page
-share/help/el/orca/howto_text_setup.page
share/help/el/orca/howto_the_orca_modifier.page
share/help/el/orca/howto_toggling_caps_lock.page
share/help/el/orca/howto_whereami.page
@@ -846,7 +870,6 @@ share/help/es/orca/howto_setting_up_orca.page
share/help/es/orca/howto_structural_navigation.page
share/help/es/orca/howto_tables.page
share/help/es/orca/howto_text_attributes.page
-share/help/es/orca/howto_text_setup.page
share/help/es/orca/howto_the_orca_modifier.page
share/help/es/orca/howto_toggling_caps_lock.page
share/help/es/orca/howto_whereami.page
@@ -900,7 +923,6 @@ share/help/fr/orca/howto_setting_up_orca.page
share/help/fr/orca/howto_structural_navigation.page
share/help/fr/orca/howto_tables.page
share/help/fr/orca/howto_text_attributes.page
-share/help/fr/orca/howto_text_setup.page
share/help/fr/orca/howto_the_orca_modifier.page
share/help/fr/orca/howto_toggling_caps_lock.page
share/help/fr/orca/howto_whereami.page
@@ -954,7 +976,6 @@ share/help/gl/orca/howto_setting_up_orca.page
share/help/gl/orca/howto_structural_navigation.page
share/help/gl/orca/howto_tables.page
share/help/gl/orca/howto_text_attributes.page
-share/help/gl/orca/howto_text_setup.page
share/help/gl/orca/howto_the_orca_modifier.page
share/help/gl/orca/howto_toggling_caps_lock.page
share/help/gl/orca/howto_whereami.page
@@ -1008,7 +1029,6 @@ share/help/hu/orca/howto_setting_up_orca.page
share/help/hu/orca/howto_structural_navigation.page
share/help/hu/orca/howto_tables.page
share/help/hu/orca/howto_text_attributes.page
-share/help/hu/orca/howto_text_setup.page
share/help/hu/orca/howto_the_orca_modifier.page
share/help/hu/orca/howto_toggling_caps_lock.page
share/help/hu/orca/howto_whereami.page
@@ -1062,7 +1082,6 @@ share/help/pt_BR/orca/howto_setting_up_orca.page
share/help/pt_BR/orca/howto_structural_navigation.page
share/help/pt_BR/orca/howto_tables.page
share/help/pt_BR/orca/howto_text_attributes.page
-share/help/pt_BR/orca/howto_text_setup.page
share/help/pt_BR/orca/howto_the_orca_modifier.page
share/help/pt_BR/orca/howto_toggling_caps_lock.page
share/help/pt_BR/orca/howto_whereami.page
@@ -1116,7 +1135,6 @@ share/help/sl/orca/howto_setting_up_orca.page
share/help/sl/orca/howto_structural_navigation.page
share/help/sl/orca/howto_tables.page
share/help/sl/orca/howto_text_attributes.page
-share/help/sl/orca/howto_text_setup.page
share/help/sl/orca/howto_the_orca_modifier.page
share/help/sl/orca/howto_toggling_caps_lock.page
share/help/sl/orca/howto_whereami.page
@@ -1136,6 +1154,59 @@ share/help/sl/orca/preferences_spellcheck.page
share/help/sl/orca/preferences_table_navigation.page
share/help/sl/orca/preferences_text_attributes.page
share/help/sl/orca/preferences_voice.page
+share/help/sv/orca/commands.page
+share/help/sv/orca/commands_bookmarks.page
+share/help/sv/orca/commands_braille.page
+share/help/sv/orca/commands_chat.page
+share/help/sv/orca/commands_controlling_orca.page
+share/help/sv/orca/commands_debugging.page
+share/help/sv/orca/commands_find.page
+share/help/sv/orca/commands_flat_review.page
+share/help/sv/orca/commands_live_regions.page
+share/help/sv/orca/commands_mouse.page
+share/help/sv/orca/commands_profiles.page
+share/help/sv/orca/commands_reading.page
+share/help/sv/orca/commands_speech_settings.page
+share/help/sv/orca/commands_structural_navigation.page
+share/help/sv/orca/commands_table.page
+share/help/sv/orca/commands_time_date_notifications.page
+share/help/sv/orca/commands_where_am_i.page
+share/help/sv/orca/figures/orca-logo.png
+share/help/sv/orca/howto_bookmarks.page
+share/help/sv/orca/howto_documents.page
+share/help/sv/orca/howto_flat_review.page
+share/help/sv/orca/howto_forms.page
+share/help/sv/orca/howto_key_bindings.page
+share/help/sv/orca/howto_keyboard_layout.page
+share/help/sv/orca/howto_learn_modes.page
+share/help/sv/orca/howto_live_regions.page
+share/help/sv/orca/howto_mouse_review.page
+share/help/sv/orca/howto_notifications.page
+share/help/sv/orca/howto_orca_find.page
+share/help/sv/orca/howto_profiles.page
+share/help/sv/orca/howto_setting_up_orca.page
+share/help/sv/orca/howto_structural_navigation.page
+share/help/sv/orca/howto_tables.page
+share/help/sv/orca/howto_text_attributes.page
+share/help/sv/orca/howto_the_orca_modifier.page
+share/help/sv/orca/howto_toggling_caps_lock.page
+share/help/sv/orca/howto_whereami.page
+share/help/sv/orca/index.page
+share/help/sv/orca/introduction.page
+share/help/sv/orca/preferences.page
+share/help/sv/orca/preferences_braille.page
+share/help/sv/orca/preferences_chat.page
+share/help/sv/orca/preferences_gecko.page
+share/help/sv/orca/preferences_general.page
+share/help/sv/orca/preferences_introduction.page
+share/help/sv/orca/preferences_key_bindings.page
+share/help/sv/orca/preferences_key_echo.page
+share/help/sv/orca/preferences_pronunciation.page
+share/help/sv/orca/preferences_speech.page
+share/help/sv/orca/preferences_spellcheck.page
+share/help/sv/orca/preferences_table_navigation.page
+share/help/sv/orca/preferences_text_attributes.page
+share/help/sv/orca/preferences_voice.page
share/icons/hicolor/16x16/apps/orca.png
share/icons/hicolor/22x22/apps/orca.png
share/icons/hicolor/24x24/apps/orca.png
@@ -1167,16 +1238,19 @@ share/locale/et/LC_MESSAGES/orca.mo
share/locale/eu/LC_MESSAGES/orca.mo
share/locale/fi/LC_MESSAGES/orca.mo
share/locale/fr/LC_MESSAGES/orca.mo
+share/locale/fur/LC_MESSAGES/orca.mo
share/locale/ga/LC_MESSAGES/orca.mo
share/locale/gl/LC_MESSAGES/orca.mo
share/locale/gu/LC_MESSAGES/orca.mo
share/locale/he/LC_MESSAGES/orca.mo
share/locale/hi/LC_MESSAGES/orca.mo
+share/locale/hr/LC_MESSAGES/orca.mo
share/locale/hu/LC_MESSAGES/orca.mo
share/locale/id/LC_MESSAGES/orca.mo
share/locale/is/LC_MESSAGES/orca.mo
share/locale/it/LC_MESSAGES/orca.mo
share/locale/ja/LC_MESSAGES/orca.mo
+share/locale/kk/LC_MESSAGES/orca.mo
share/locale/kn/LC_MESSAGES/orca.mo
share/locale/ko/LC_MESSAGES/orca.mo
share/locale/lt/LC_MESSAGES/orca.mo
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index 165910bd5c76..00d24305efc4 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= atspi
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= accessibility x11-toolkits python
MASTER_SITES= GNOME/sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/accessibility/py-atspi/distinfo b/accessibility/py-atspi/distinfo
index 5a057fb5a8f3..30b6acc758b9 100644
--- a/accessibility/py-atspi/distinfo
+++ b/accessibility/py-atspi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491080522
-SHA256 (gnome3/pyatspi-2.24.0.tar.xz) = e7ef47a5d387fdc64a01722ef2bcced54c4d6b225fbe34867189e1f88ff0a692
-SIZE (gnome3/pyatspi-2.24.0.tar.xz) = 298228
+TIMESTAMP = 1505474027
+SHA256 (gnome3/pyatspi-2.26.0.tar.xz) = c696e47cf3d757dc515a2005ce22c7b580655a233ae6e47b39eefdfe4e8fb675
+SIZE (gnome3/pyatspi-2.26.0.tar.xz) = 309780
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 503596e8aa34..74ad94c6dc47 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= file-roller
-PORTVERSION= 3.26.1
+PORTVERSION= 3.28.0
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Archive manager for zip files, tar, etc
@@ -21,35 +21,27 @@ RUN_DEPENDS= gtar:archivers/gtar
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake libarchive libtool \
- localbase pathfix pkgconfig tar:xz
-USE_GNOME= cairo gtk30 intlhack introspection:build
-USE_XORG= sm
+USES= desktop-file-utils gettext libarchive localbase \
+ meson pkgconfig python:3.5+,build tar:xz
+USE_GNOME= cairo gtk30
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-packagekit
-INSTALL_TARGET= install-strip
+MESON_ARGS= -Dpackagekit=false
+BINARY_ALIAS= python3=${PYTHON_VERSION}
-PORTDOCS= AUTHORS NEWS README TODO ChangeLog
GLIB_SCHEMAS= org.gnome.FileRoller.gschema.xml
OPTIONS_SUB= yes
-OPTIONS_DEFINE= DOCS NAUTILUS
+OPTIONS_DEFINE= NAUTILUS
OPTIONS_DEFAULT=NAUTILUS
+
NAUTILUS_DESC= Nautilus context menu actions
NAUTILUS_USE= GNOME=nautilus3
-NAUTILUS_CONFIGURE_ENABLE= nautilus-actions
+NAUTILUS_MESON_TRUE= nautilus-actions
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/src/fr-command-tar.c \
${WRKSRC}/src/fr-command-zip.c
-post-install-DOCS-on:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
-.endfor
-
.include <bsd.port.mk>
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index b0c433a47ab4..f9155c0e0d64 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508523946
-SHA256 (gnome3/file-roller-3.26.1.tar.xz) = ecd5e4c9b8435a6515120c59efeed196ec3f07cb84e1bbda7534cb5456e491ae
-SIZE (gnome3/file-roller-3.26.1.tar.xz) = 1436044
+TIMESTAMP = 1526109355
+SHA256 (gnome/file-roller-3.28.0.tar.xz) = c17139b46dd4c566ae70a7e3cb930b16e46597c7f9931757fcab900e5015f696
+SIZE (gnome/file-roller-3.28.0.tar.xz) = 1367240
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 8d640ce412b9..54600776cee8 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -1,9 +1,7 @@
bin/file-roller
-%%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-fileroller.a
%%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-fileroller.so
libexec/file-roller/isoinfo.sh
libexec/file-roller/rpm2cpio
-share/GConf/gsettings/file-roller.convert
share/applications/org.gnome.FileRoller.desktop
share/dbus-1/services/org.gnome.FileRoller.ArchiveManager1.service
share/dbus-1/services/org.gnome.FileRoller.service
diff --git a/archivers/gcab/Makefile b/archivers/gcab/Makefile
index e777e8250792..d45efb746f86 100644
--- a/archivers/gcab/Makefile
+++ b/archivers/gcab/Makefile
@@ -2,18 +2,18 @@
# $FreeBSD$
PORTNAME= gcab
-PORTVERSION= 0.8
+PORTVERSION= 1.0
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= GObject library to create cabinet files
-BUILD_DEPENDS= vala:lang/vala
+BUILD_DEPENDS= vala:lang/vala \
+ gtkdoc-scan:textproc/gtk-doc
-USES= cpe gettext gmake libtool pathfix pkgconfig tar:xz
-GNU_CONFIGURE= yes
-USE_GNOME= glib20 intlhack introspection:build
+USES= cpe gettext meson pkgconfig tar:xz
+USE_GNOME= glib20 introspection:build
CPE_VENDOR= gnome
.include <bsd.port.mk>
diff --git a/archivers/gcab/distinfo b/archivers/gcab/distinfo
index 5917507555a2..8fd988b96536 100644
--- a/archivers/gcab/distinfo
+++ b/archivers/gcab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517003114
-SHA256 (gcab-0.8.tar.xz) = 0c5f602ca4a89904e045b97762b470726383e399d34a161d0ba26cc6023c7086
-SIZE (gcab-0.8.tar.xz) = 337016
+TIMESTAMP = 1517044336
+SHA256 (gcab-1.0.tar.xz) = 297401e74f9e4b13510acc62c2b7600264f60efe22369fee625ee16e2f9228ca
+SIZE (gcab-1.0.tar.xz) = 75052
diff --git a/archivers/gcab/pkg-plist b/archivers/gcab/pkg-plist
index 37a7589dd0d2..e85917398a7d 100644
--- a/archivers/gcab/pkg-plist
+++ b/archivers/gcab/pkg-plist
@@ -5,25 +5,24 @@ include/libgcab-1.0/libgcab/gcab-enums.h
include/libgcab-1.0/libgcab/gcab-file.h
include/libgcab-1.0/libgcab/gcab-folder.h
lib/girepository-1.0/GCab-1.0.typelib
-lib/libgcab-1.0.a
lib/libgcab-1.0.so
lib/libgcab-1.0.so.0
lib/libgcab-1.0.so.0.0.0
libdata/pkgconfig/libgcab-1.0.pc
man/man1/gcab.1.gz
share/gir-1.0/GCab-1.0.gir
-share/gtk-doc/html/gcab/GCabCabinet.html
-share/gtk-doc/html/gcab/GCabFile.html
-share/gtk-doc/html/gcab/GCabFolder.html
share/gtk-doc/html/gcab/annotation-glossary.html
share/gtk-doc/html/gcab/api-index-full.html
share/gtk-doc/html/gcab/ch01.html
+share/gtk-doc/html/gcab/deprecated-api-index.html
+share/gtk-doc/html/gcab/gcab-GCabCabinet.html
+share/gtk-doc/html/gcab/gcab-GCabFile.html
+share/gtk-doc/html/gcab/gcab-GCabFolder.html
share/gtk-doc/html/gcab/gcab.devhelp2
share/gtk-doc/html/gcab/home.png
share/gtk-doc/html/gcab/index.html
share/gtk-doc/html/gcab/left-insensitive.png
share/gtk-doc/html/gcab/left.png
-share/gtk-doc/html/gcab/object-tree.html
share/gtk-doc/html/gcab/right-insensitive.png
share/gtk-doc/html/gcab/right.png
share/gtk-doc/html/gcab/style.css
@@ -56,4 +55,5 @@ share/locale/sv/LC_MESSAGES/gcab.mo
share/locale/tg/LC_MESSAGES/gcab.mo
share/locale/tr/LC_MESSAGES/gcab.mo
share/locale/zh_CN/LC_MESSAGES/gcab.mo
+share/vala/vapi/libgcab-1.0.deps
share/vala/vapi/libgcab-1.0.vapi
diff --git a/archivers/gnome-autoar/Makefile b/archivers/gnome-autoar/Makefile
index 7386825669ce..19f0acf2015a 100644
--- a/archivers/gnome-autoar/Makefile
+++ b/archivers/gnome-autoar/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-autoar
-PORTVERSION= 0.2.2
+PORTVERSION= 0.2.3
CATEGORIES= archivers
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/archivers/gnome-autoar/distinfo b/archivers/gnome-autoar/distinfo
index 6cdf9d3fd4e9..d46bc2308c49 100644
--- a/archivers/gnome-autoar/distinfo
+++ b/archivers/gnome-autoar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497213634
-SHA256 (gnome3/gnome-autoar-0.2.2.tar.xz) = e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62
-SIZE (gnome3/gnome-autoar-0.2.2.tar.xz) = 295488
+TIMESTAMP = 1525954206
+SHA256 (gnome3/gnome-autoar-0.2.3.tar.xz) = 5de9db0db028cd6cab7c2fec46ba90965474ecf9cd68cfd681a6488cf1fb240a
+SIZE (gnome3/gnome-autoar-0.2.3.tar.xz) = 297632
diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index a81fa1f757bd..f8cbb2fbbb03 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -3,7 +3,7 @@
PORTNAME= abraca
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.GPL
BUILD_DEPENDS= ${LOCALBASE}/bin/valac:lang/vala
LIB_DEPENDS= libxmmsclient.so:audio/xmms2 \
libgee-0.8.so:devel/libgee
-RUN_DEPENDS= gnome-themes-standard>=3.0.0:x11-themes/gnome-themes-standard \
+RUN_DEPENDS= gnome-themes-extra>=3.0.0:x11-themes/gnome-themes-extra \
gnome-icon-theme>=0:misc/gnome-icon-theme
USES= pkgconfig waf tar:bzip2
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index b28dc0b0d328..95e8f8ff7da5 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -13,20 +13,30 @@ COMMENT= Multichannel digital audio workstation
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+BROKEN_powerpc64= Does not build
+
BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
-LIB_DEPENDS= liblo.so:audio/liblo \
- liblrdf.so:textproc/liblrdf \
- libjack.so:audio/jack \
- libaubio.so:audio/aubio \
+LIB_DEPENDS= libaubio.so:audio/aubio \
+ libboost_date_time.so:devel/boost-libs \
+ libcurl.so:ftp/curl \
libfftw3.so:math/fftw3 \
libfftw3f.so:math/fftw3-float \
- libboost_date_time.so:devel/boost-libs \
- libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26 \
+ libjack.so:audio/jack \
+ liblo.so:audio/liblo \
+ liblrdf.so:textproc/liblrdf \
+ libraptor2.so:textproc/raptor2 \
+ libsamplerate.so:audio/libsamplerate \
+ libsndfile.so:audio/libsndfile
USES= cpe gettext scons pkgconfig tar:bzip2
MAKE_ARGS+= SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
CFLAGS+= -I${LOCALBASE}/include -DHAVE_AUBIO4
-USE_GNOME= libxslt
+USE_GNOME= atk atkmm cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 \
+ libartlgpl2 libgnomecanvas libsigc++20 libxslt pango pangomm
+
USE_LDCONFIG= ${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces
PLIST_SUB= DISTVERSION=${DISTVERSION}
@@ -34,8 +44,6 @@ PLIST_SUB= DISTVERSION=${DISTVERSION}
OPTIONS_DEFINE= OPTIMIZED_CFLAGS VST
VST_DESC= VST plugins support
-BROKEN_powerpc64= Does not build
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MVST}
diff --git a/audio/ardour/files/patch-libs_gtkmm2ext_idle__adjustment.cc b/audio/ardour/files/patch-libs_gtkmm2ext_idle__adjustment.cc
new file mode 100644
index 000000000000..aca975159d3a
--- /dev/null
+++ b/audio/ardour/files/patch-libs_gtkmm2ext_idle__adjustment.cc
@@ -0,0 +1,10 @@
+--- libs/gtkmm2ext/idle_adjustment.cc.orig 2018-09-03 19:39:58 UTC
++++ libs/gtkmm2ext/idle_adjustment.cc
+@@ -21,6 +21,7 @@
+ #include <gtkmm2ext/idle_adjustment.h>
+ #include <gtkmm/main.h>
+ #include <iostream>
++#include <gtkmm.h>
+
+ using namespace Gtk;
+ using namespace sigc;
diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile
index 8af2b69e087c..567be29f037b 100644
--- a/audio/gnome-music/Makefile
+++ b/audio/gnome-music/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-music
-PORTVERSION= 3.18.2
-PORTREVISION= 2
+PORTVERSION= 3.28.2.1
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,22 +10,25 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME music playing application
-BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libgrilo-0.2.so:net/grilo2 \
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+BUILD_DEPENDS= itstool:textproc/itstool \
+ appstream-util:devel/appstream-glib
+LIB_DEPENDS= libgrilo-0.3.so:net/grilo \
+ libtracker-sparql-2.0.so:sysutils/tracker \
libmediaart-2.0.so:multimedia/libmediaart
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool pathfix pkgconfig python:3.4+ tar:xz
+USES= desktop-file-utils gettext gnome localbase meson pkgconfig \
+ python:3.4+ shebangfix tar:xz
USE_LDCONFIG= yes
-USE_GNOME= gnomedesktop3 gtk30 intltool introspection:build
-GNU_CONFIGURE= yes
+USE_GNOME= cairo gtk30 introspection pygobject3
USE_GSTREAMER1= ogg mpg123
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV= XDG_CACHE_HOME=${WRKDIR}
-INSTALL_TARGET= install-strip
+SHEBANG_FILES= gnome-music.in
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.Music.gschema.xml
diff --git a/audio/gnome-music/distinfo b/audio/gnome-music/distinfo
index c89ccd93a5f9..3a41f3c523d3 100644
--- a/audio/gnome-music/distinfo
+++ b/audio/gnome-music/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-music-3.18.2.tar.xz) = 81b6ae8b4193774a1dc05e77c59ad8ff5e7debc0aea30ce2ecd13b2ceda10bff
-SIZE (gnome3/gnome-music-3.18.2.tar.xz) = 1545232
+TIMESTAMP = 1525956862
+SHA256 (gnome3/gnome-music-3.28.2.1.tar.xz) = bbf4556b77a97d86b586eeb3015482d800c46bcd293adbda0438ca0871bc9b26
+SIZE (gnome3/gnome-music-3.28.2.1.tar.xz) = 2990404
diff --git a/audio/gnome-music/pkg-plist b/audio/gnome-music/pkg-plist
index ed3743403d20..db970fe1625a 100644
--- a/audio/gnome-music/pkg-plist
+++ b/audio/gnome-music/pkg-plist
@@ -1,8 +1,8 @@
bin/gnome-music
-lib/gnome-music/libgd.so
-lib/gnome-music/girepository-1.0/Gd-1.0.typelib
+lib/org.gnome.Music/girepository-1.0/Gd-1.0.typelib
+lib/org.gnome.Music/libgd.so
%%PYTHON_SITELIBDIR%%/gnomemusic/__init__.py
-%%PYTHON_SITELIBDIR%%/gnomemusic/albumArtCache.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/albumartcache.py
%%PYTHON_SITELIBDIR%%/gnomemusic/application.py
%%PYTHON_SITELIBDIR%%/gnomemusic/grilo.py
%%PYTHON_SITELIBDIR%%/gnomemusic/mpris.py
@@ -10,44 +10,31 @@ lib/gnome-music/girepository-1.0/Gd-1.0.typelib
%%PYTHON_SITELIBDIR%%/gnomemusic/player.py
%%PYTHON_SITELIBDIR%%/gnomemusic/playlists.py
%%PYTHON_SITELIBDIR%%/gnomemusic/query.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/scrobbler.py
%%PYTHON_SITELIBDIR%%/gnomemusic/searchbar.py
%%PYTHON_SITELIBDIR%%/gnomemusic/toolbar.py
-%%PYTHON_SITELIBDIR%%/gnomemusic/view.py
-%%PYTHON_SITELIBDIR%%/gnomemusic/widgets.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/utils.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/views/__init__.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/views/albumsview.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/views/artistsview.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/views/baseview.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/views/emptysearchview.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/views/emptyview.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/views/initialstateview.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/views/playlistview.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/views/searchview.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/views/songsview.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/__init__.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/albumwidget.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/artistalbumswidget.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/artistalbumwidget.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/coverstack.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/disclistboxwidget.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/notificationspopup.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/playlistdialog.py
+%%PYTHON_SITELIBDIR%%/gnomemusic/widgets/starhandlerwidget.py
%%PYTHON_SITELIBDIR%%/gnomemusic/window.py
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/albumArtCache.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/albumArtCache.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/grilo.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/grilo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/mpris.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/mpris.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/notification.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/notification.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/player.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/player.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/playlists.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/playlists.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/query.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/query.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/searchbar.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/searchbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/toolbar.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/toolbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-man/man1/gnome-music.1.gz
-share/appdata/gnome-music.appdata.xml
-share/applications/gnome-music.desktop
-%%DATADIR%%/gnome-music.gresource
-%%DATADIR%%/gir-1.0/Gd-1.0.gir
+share/applications/org.gnome.Music.desktop
share/help/C/gnome-music/figures/gnome-music-3.12.png
share/help/C/gnome-music/index.page
share/help/C/gnome-music/introduction.page
@@ -61,6 +48,19 @@ share/help/C/gnome-music/playlist-remove-songs.page
share/help/C/gnome-music/playlist-repeat.page
share/help/C/gnome-music/playlist-shuffle.page
share/help/C/gnome-music/search.page
+share/help/ca/gnome-music/figures/gnome-music-3.12.png
+share/help/ca/gnome-music/index.page
+share/help/ca/gnome-music/introduction.page
+share/help/ca/gnome-music/legal.xml
+share/help/ca/gnome-music/play-music.page
+share/help/ca/gnome-music/playlist-create-albums.page
+share/help/ca/gnome-music/playlist-create-artists.page
+share/help/ca/gnome-music/playlist-create-songs.page
+share/help/ca/gnome-music/playlist-delete.page
+share/help/ca/gnome-music/playlist-remove-songs.page
+share/help/ca/gnome-music/playlist-repeat.page
+share/help/ca/gnome-music/playlist-shuffle.page
+share/help/ca/gnome-music/search.page
share/help/cs/gnome-music/figures/gnome-music-3.12.png
share/help/cs/gnome-music/index.page
share/help/cs/gnome-music/introduction.page
@@ -74,6 +74,19 @@ share/help/cs/gnome-music/playlist-remove-songs.page
share/help/cs/gnome-music/playlist-repeat.page
share/help/cs/gnome-music/playlist-shuffle.page
share/help/cs/gnome-music/search.page
+share/help/da/gnome-music/figures/gnome-music-3.12.png
+share/help/da/gnome-music/index.page
+share/help/da/gnome-music/introduction.page
+share/help/da/gnome-music/legal.xml
+share/help/da/gnome-music/play-music.page
+share/help/da/gnome-music/playlist-create-albums.page
+share/help/da/gnome-music/playlist-create-artists.page
+share/help/da/gnome-music/playlist-create-songs.page
+share/help/da/gnome-music/playlist-delete.page
+share/help/da/gnome-music/playlist-remove-songs.page
+share/help/da/gnome-music/playlist-repeat.page
+share/help/da/gnome-music/playlist-shuffle.page
+share/help/da/gnome-music/search.page
share/help/de/gnome-music/figures/gnome-music-3.12.png
share/help/de/gnome-music/index.page
share/help/de/gnome-music/introduction.page
@@ -165,6 +178,19 @@ share/help/ko/gnome-music/playlist-remove-songs.page
share/help/ko/gnome-music/playlist-repeat.page
share/help/ko/gnome-music/playlist-shuffle.page
share/help/ko/gnome-music/search.page
+share/help/pl/gnome-music/figures/gnome-music-3.12.png
+share/help/pl/gnome-music/index.page
+share/help/pl/gnome-music/introduction.page
+share/help/pl/gnome-music/legal.xml
+share/help/pl/gnome-music/play-music.page
+share/help/pl/gnome-music/playlist-create-albums.page
+share/help/pl/gnome-music/playlist-create-artists.page
+share/help/pl/gnome-music/playlist-create-songs.page
+share/help/pl/gnome-music/playlist-delete.page
+share/help/pl/gnome-music/playlist-remove-songs.page
+share/help/pl/gnome-music/playlist-repeat.page
+share/help/pl/gnome-music/playlist-shuffle.page
+share/help/pl/gnome-music/search.page
share/help/pt_BR/gnome-music/figures/gnome-music-3.12.png
share/help/pt_BR/gnome-music/index.page
share/help/pt_BR/gnome-music/introduction.page
@@ -191,70 +217,86 @@ share/help/ro/gnome-music/playlist-remove-songs.page
share/help/ro/gnome-music/playlist-repeat.page
share/help/ro/gnome-music/playlist-shuffle.page
share/help/ro/gnome-music/search.page
-share/icons/HighContrast/16x16/apps/gnome-music.png
-share/icons/HighContrast/22x22/apps/gnome-music.png
-share/icons/HighContrast/256x256/apps/gnome-music.png
-share/icons/HighContrast/32x32/apps/gnome-music.png
-share/icons/HighContrast/48x48/apps/gnome-music.png
-share/icons/hicolor/16x16/apps/gnome-music.png
-share/icons/hicolor/22x22/apps/gnome-music.png
-share/icons/hicolor/256x256/apps/gnome-music.png
-share/icons/hicolor/32x32/apps/gnome-music.png
-share/icons/hicolor/48x48/apps/gnome-music.png
-share/locale/af/LC_MESSAGES/gnome-music.mo
-share/locale/an/LC_MESSAGES/gnome-music.mo
-share/locale/ar/LC_MESSAGES/gnome-music.mo
-share/locale/as/LC_MESSAGES/gnome-music.mo
-share/locale/be/LC_MESSAGES/gnome-music.mo
-share/locale/bs/LC_MESSAGES/gnome-music.mo
-share/locale/ca/LC_MESSAGES/gnome-music.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-music.mo
-share/locale/cs/LC_MESSAGES/gnome-music.mo
-share/locale/da/LC_MESSAGES/gnome-music.mo
-share/locale/de/LC_MESSAGES/gnome-music.mo
-share/locale/el/LC_MESSAGES/gnome-music.mo
-share/locale/en_GB/LC_MESSAGES/gnome-music.mo
-share/locale/eo/LC_MESSAGES/gnome-music.mo
-share/locale/es/LC_MESSAGES/gnome-music.mo
-share/locale/et/LC_MESSAGES/gnome-music.mo
-share/locale/eu/LC_MESSAGES/gnome-music.mo
-share/locale/fa/LC_MESSAGES/gnome-music.mo
-share/locale/fi/LC_MESSAGES/gnome-music.mo
-share/locale/fr/LC_MESSAGES/gnome-music.mo
-share/locale/fur/LC_MESSAGES/gnome-music.mo
-share/locale/ga/LC_MESSAGES/gnome-music.mo
-share/locale/gl/LC_MESSAGES/gnome-music.mo
-share/locale/he/LC_MESSAGES/gnome-music.mo
-share/locale/hu/LC_MESSAGES/gnome-music.mo
-share/locale/id/LC_MESSAGES/gnome-music.mo
-share/locale/is/LC_MESSAGES/gnome-music.mo
-share/locale/it/LC_MESSAGES/gnome-music.mo
-share/locale/ja/LC_MESSAGES/gnome-music.mo
-share/locale/kk/LC_MESSAGES/gnome-music.mo
-share/locale/kn/LC_MESSAGES/gnome-music.mo
-share/locale/ko/LC_MESSAGES/gnome-music.mo
-share/locale/lt/LC_MESSAGES/gnome-music.mo
-share/locale/lv/LC_MESSAGES/gnome-music.mo
-share/locale/ml/LC_MESSAGES/gnome-music.mo
-share/locale/nb/LC_MESSAGES/gnome-music.mo
-share/locale/ne/LC_MESSAGES/gnome-music.mo
-share/locale/nl/LC_MESSAGES/gnome-music.mo
-share/locale/oc/LC_MESSAGES/gnome-music.mo
-share/locale/pa/LC_MESSAGES/gnome-music.mo
-share/locale/pl/LC_MESSAGES/gnome-music.mo
-share/locale/pt/LC_MESSAGES/gnome-music.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-music.mo
-share/locale/ro/LC_MESSAGES/gnome-music.mo
-share/locale/ru/LC_MESSAGES/gnome-music.mo
-share/locale/sk/LC_MESSAGES/gnome-music.mo
-share/locale/sl/LC_MESSAGES/gnome-music.mo
-share/locale/sr/LC_MESSAGES/gnome-music.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-music.mo
-share/locale/sv/LC_MESSAGES/gnome-music.mo
-share/locale/te/LC_MESSAGES/gnome-music.mo
-share/locale/tg/LC_MESSAGES/gnome-music.mo
-share/locale/tr/LC_MESSAGES/gnome-music.mo
-share/locale/uk/LC_MESSAGES/gnome-music.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-music.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-music.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-music.mo
+share/help/sv/gnome-music/figures/gnome-music-3.12.png
+share/help/sv/gnome-music/index.page
+share/help/sv/gnome-music/introduction.page
+share/help/sv/gnome-music/legal.xml
+share/help/sv/gnome-music/play-music.page
+share/help/sv/gnome-music/playlist-create-albums.page
+share/help/sv/gnome-music/playlist-create-artists.page
+share/help/sv/gnome-music/playlist-create-songs.page
+share/help/sv/gnome-music/playlist-delete.page
+share/help/sv/gnome-music/playlist-remove-songs.page
+share/help/sv/gnome-music/playlist-repeat.page
+share/help/sv/gnome-music/playlist-shuffle.page
+share/help/sv/gnome-music/search.page
+share/icons/hicolor/16x16/apps/org.gnome.Music.png
+share/icons/hicolor/22x22/apps/org.gnome.Music.png
+share/icons/hicolor/256x256/apps/org.gnome.Music.png
+share/icons/hicolor/32x32/apps/org.gnome.Music.png
+share/icons/hicolor/48x48/apps/org.gnome.Music.png
+share/icons/hicolor/symbolic/apps/org.gnome.Music-symbolic.svg
+share/locale/af/LC_MESSAGES/org.gnome.Music.mo
+share/locale/an/LC_MESSAGES/org.gnome.Music.mo
+share/locale/ar/LC_MESSAGES/org.gnome.Music.mo
+share/locale/as/LC_MESSAGES/org.gnome.Music.mo
+share/locale/be/LC_MESSAGES/org.gnome.Music.mo
+share/locale/bg/LC_MESSAGES/org.gnome.Music.mo
+share/locale/bs/LC_MESSAGES/org.gnome.Music.mo
+share/locale/ca/LC_MESSAGES/org.gnome.Music.mo
+share/locale/ca@valencia/LC_MESSAGES/org.gnome.Music.mo
+share/locale/cs/LC_MESSAGES/org.gnome.Music.mo
+share/locale/da/LC_MESSAGES/org.gnome.Music.mo
+share/locale/de/LC_MESSAGES/org.gnome.Music.mo
+share/locale/el/LC_MESSAGES/org.gnome.Music.mo
+share/locale/en_GB/LC_MESSAGES/org.gnome.Music.mo
+share/locale/eo/LC_MESSAGES/org.gnome.Music.mo
+share/locale/es/LC_MESSAGES/org.gnome.Music.mo
+share/locale/et/LC_MESSAGES/org.gnome.Music.mo
+share/locale/eu/LC_MESSAGES/org.gnome.Music.mo
+share/locale/fa/LC_MESSAGES/org.gnome.Music.mo
+share/locale/fi/LC_MESSAGES/org.gnome.Music.mo
+share/locale/fr/LC_MESSAGES/org.gnome.Music.mo
+share/locale/fur/LC_MESSAGES/org.gnome.Music.mo
+share/locale/ga/LC_MESSAGES/org.gnome.Music.mo
+share/locale/gd/LC_MESSAGES/org.gnome.Music.mo
+share/locale/gl/LC_MESSAGES/org.gnome.Music.mo
+share/locale/he/LC_MESSAGES/org.gnome.Music.mo
+share/locale/hr/LC_MESSAGES/org.gnome.Music.mo
+share/locale/hu/LC_MESSAGES/org.gnome.Music.mo
+share/locale/id/LC_MESSAGES/org.gnome.Music.mo
+share/locale/is/LC_MESSAGES/org.gnome.Music.mo
+share/locale/it/LC_MESSAGES/org.gnome.Music.mo
+share/locale/ja/LC_MESSAGES/org.gnome.Music.mo
+share/locale/kk/LC_MESSAGES/org.gnome.Music.mo
+share/locale/kn/LC_MESSAGES/org.gnome.Music.mo
+share/locale/ko/LC_MESSAGES/org.gnome.Music.mo
+share/locale/lt/LC_MESSAGES/org.gnome.Music.mo
+share/locale/lv/LC_MESSAGES/org.gnome.Music.mo
+share/locale/ml/LC_MESSAGES/org.gnome.Music.mo
+share/locale/nb/LC_MESSAGES/org.gnome.Music.mo
+share/locale/ne/LC_MESSAGES/org.gnome.Music.mo
+share/locale/nl/LC_MESSAGES/org.gnome.Music.mo
+share/locale/oc/LC_MESSAGES/org.gnome.Music.mo
+share/locale/pa/LC_MESSAGES/org.gnome.Music.mo
+share/locale/pl/LC_MESSAGES/org.gnome.Music.mo
+share/locale/pt/LC_MESSAGES/org.gnome.Music.mo
+share/locale/pt_BR/LC_MESSAGES/org.gnome.Music.mo
+share/locale/ro/LC_MESSAGES/org.gnome.Music.mo
+share/locale/ru/LC_MESSAGES/org.gnome.Music.mo
+share/locale/sk/LC_MESSAGES/org.gnome.Music.mo
+share/locale/sl/LC_MESSAGES/org.gnome.Music.mo
+share/locale/sr/LC_MESSAGES/org.gnome.Music.mo
+share/locale/sr@latin/LC_MESSAGES/org.gnome.Music.mo
+share/locale/sv/LC_MESSAGES/org.gnome.Music.mo
+share/locale/te/LC_MESSAGES/org.gnome.Music.mo
+share/locale/tg/LC_MESSAGES/org.gnome.Music.mo
+share/locale/tr/LC_MESSAGES/org.gnome.Music.mo
+share/locale/uk/LC_MESSAGES/org.gnome.Music.mo
+share/locale/vi/LC_MESSAGES/org.gnome.Music.mo
+share/locale/zh_CN/LC_MESSAGES/org.gnome.Music.mo
+share/locale/zh_HK/LC_MESSAGES/org.gnome.Music.mo
+share/locale/zh_TW/LC_MESSAGES/org.gnome.Music.mo
+share/metainfo/org.gnome.Music.appdata.xml
+share/org.gnome.Music/gir-1.0/Gd-1.0.gir
+share/org.gnome.Music/org.gnome.Music.gresource
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 47c3f5d94e6a..a175cc4f3fff 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= evolution-data-server
-PORTVERSION= 3.24.2
-PORTREVISION= 11
+PORTVERSION= 3.28.3
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -16,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
+ libfribidi.so:converters/fribidi \
libgcr-base-3.so:security/gcr \
libgoa-1.0.so:net/gnome-online-accounts \
libgdata.so:devel/libgdata \
@@ -31,7 +31,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
PORTSCOUT= limitw:1,even
USES= bdb:5 cmake compiler:c++11-lib gettext gnome gperf \
- iconv localbase pathfix pkgconfig python:3.3+,build\
+ iconv localbase pathfix pkgconfig python:3.6+,build\
sqlite tar:xz
USE_CXXSTD= gnu++11
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
@@ -44,14 +44,14 @@ CMAKE_ARGS= -DENABLE_VALA_BINDINGS=ON \
CMAKE_ARGS+= -DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \
-DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb-5"
-GLIB_SCHEMAS= org.gnome.Evolution.DefaultSources.gschema.xml \
- org.gnome.evolution.eds-shell.gschema.xml \
- org.gnome.evolution-data-server.addressbook.gschema.xml \
+GLIB_SCHEMAS= org.gnome.evolution-data-server.addressbook.gschema.xml \
org.gnome.evolution-data-server.calendar.gschema.xml \
org.gnome.evolution-data-server.gschema.xml \
+ org.gnome.Evolution.DefaultSources.gschema.xml \
+ org.gnome.evolution.eds-shell.gschema.xml \
org.gnome.evolution.shell.network-config.gschema.xml
-PLIST_SUB= VERSION="3.24" EVO_VERSION="1.2"
+PLIST_SUB= EVO_VERSION="1.2"
OPTIONS_SUB= yes
OPTIONS_DEFINE= WEATHER KERBEROS LDAP
@@ -72,7 +72,7 @@ WEATHER_CMAKE_BOOL= ENABLE_WEATHER
.include <bsd.port.options.mk>
post-patch:
- @${REINPLACE_CMD} -e 's| python| ${PYTHON_VERSION}|g' \
+ @${REINPLACE_CMD} -e 's| python3| ${PYTHON_VERSION}|g' \
${WRKSRC}/CMakeLists.txt
post-install:
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 7bfe05b38ffb..4a900061749f 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496410963
-SHA256 (gnome3/evolution-data-server-3.24.2.tar.xz) = a9bbb98308f935bac8550838b3b5a2b54b38a3d1dd5b0ad91cfb089b46f298fb
-SIZE (gnome3/evolution-data-server-3.24.2.tar.xz) = 4306528
+TIMESTAMP = 1529613250
+SHA256 (gnome3/evolution-data-server-3.28.3.tar.xz) = 437e91f03fe49bf531416d30828e943aa2c74d657aeb44fb637997104a3a5887
+SIZE (gnome3/evolution-data-server-3.28.3.tar.xz) = 4452080
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index a04ffa733b7f..0b0d425602dd 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -84,6 +84,9 @@ include/evolution-data-server/camel/camel-sasl-login.h
include/evolution-data-server/camel/camel-sasl-ntlm.h
include/evolution-data-server/camel/camel-sasl-plain.h
include/evolution-data-server/camel/camel-sasl-popb4smtp.h
+include/evolution-data-server/camel/camel-sasl-xoauth2-google.h
+include/evolution-data-server/camel/camel-sasl-xoauth2-outlook.h
+include/evolution-data-server/camel/camel-sasl-xoauth2.h
include/evolution-data-server/camel/camel-sasl.h
include/evolution-data-server/camel/camel-search-private.h
include/evolution-data-server/camel/camel-search-sql-sexp.h
@@ -125,6 +128,7 @@ include/evolution-data-server/libebackend/e-backend-enumtypes.h
include/evolution-data-server/libebackend/e-backend-factory.h
include/evolution-data-server/libebackend/e-backend.h
include/evolution-data-server/libebackend/e-cache-reaper.h
+include/evolution-data-server/libebackend/e-cache.h
include/evolution-data-server/libebackend/e-collection-backend-factory.h
include/evolution-data-server/libebackend/e-collection-backend.h
include/evolution-data-server/libebackend/e-data-factory.h
@@ -142,6 +146,7 @@ include/evolution-data-server/libebackend/e-subprocess-factory.h
include/evolution-data-server/libebackend/e-user-prompter-server-extension.h
include/evolution-data-server/libebackend/e-user-prompter-server.h
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-enumtypes.h
@@ -183,7 +188,10 @@ 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.h
+include/evolution-data-server/libedata-book/e-book-cache.h
+include/evolution-data-server/libedata-book/e-book-meta-backend.h
include/evolution-data-server/libedata-book/e-book-sqlite.h
+include/evolution-data-server/libedata-book/e-data-book-cursor-cache.h
include/evolution-data-server/libedata-book/e-data-book-cursor-sqlite.h
include/evolution-data-server/libedata-book/e-data-book-cursor.h
include/evolution-data-server/libedata-book/e-data-book-direct.h
@@ -200,6 +208,8 @@ 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
+include/evolution-data-server/libedata-cal/e-cal-cache.h
+include/evolution-data-server/libedata-cal/e-cal-meta-backend.h
include/evolution-data-server/libedata-cal/e-data-cal-factory.h
include/evolution-data-server/libedata-cal/e-data-cal-view.h
include/evolution-data-server/libedata-cal/e-data-cal.h
@@ -216,6 +226,7 @@ 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
@@ -223,11 +234,17 @@ include/evolution-data-server/libedataserver/e-list.h
include/evolution-data-server/libedataserver/e-memory.h
include/evolution-data-server/libedataserver/e-module.h
include/evolution-data-server/libedataserver/e-network-monitor.h
+include/evolution-data-server/libedataserver/e-oauth2-service-base.h
+include/evolution-data-server/libedataserver/e-oauth2-service-google.h
+include/evolution-data-server/libedataserver/e-oauth2-service-outlook.h
+include/evolution-data-server/libedataserver/e-oauth2-service.h
+include/evolution-data-server/libedataserver/e-oauth2-services.h
include/evolution-data-server/libedataserver/e-operation-pool.h
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-session.h
include/evolution-data-server/libedataserver/e-soup-ssl-trust.h
include/evolution-data-server/libedataserver/e-source-address-book.h
include/evolution-data-server/libedataserver/e-source-alarms.h
@@ -239,7 +256,7 @@ include/evolution-data-server/libedataserver/e-source-calendar.h
include/evolution-data-server/libedataserver/e-source-camel.h
include/evolution-data-server/libedataserver/e-source-collection.h
include/evolution-data-server/libedataserver/e-source-contacts.h
-include/evolution-data-server/libedataserver/e-source-credentials-provider-impl-google.h
+include/evolution-data-server/libedataserver/e-source-credentials-provider-impl-oauth2.h
include/evolution-data-server/libedataserver/e-source-credentials-provider-impl-password.h
include/evolution-data-server/libedataserver/e-source-credentials-provider-impl.h
include/evolution-data-server/libedataserver/e-source-credentials-provider.h
@@ -261,6 +278,7 @@ include/evolution-data-server/libedataserver/e-source-offline.h
include/evolution-data-server/libedataserver/e-source-openpgp.h
include/evolution-data-server/libedataserver/e-source-proxy.h
include/evolution-data-server/libedataserver/e-source-refresh.h
+include/evolution-data-server/libedataserver/e-source-registry-watcher.h
include/evolution-data-server/libedataserver/e-source-registry.h
include/evolution-data-server/libedataserver/e-source-resource.h
include/evolution-data-server/libedataserver/e-source-revision-guards.h
@@ -276,12 +294,14 @@ include/evolution-data-server/libedataserver/e-time-utils.h
include/evolution-data-server/libedataserver/e-uid.h
include/evolution-data-server/libedataserver/e-url.h
include/evolution-data-server/libedataserver/e-webdav-discover.h
+include/evolution-data-server/libedataserver/e-webdav-session.h
+include/evolution-data-server/libedataserver/e-xml-document.h
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-cell-renderer-color.h
-include/evolution-data-server/libedataserverui/e-credentials-prompter-impl-google.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
@@ -315,10 +335,11 @@ lib/evolution-data-server/libedbus-private.so
lib/evolution-data-server/registry-modules/module-cache-reaper.so
lib/evolution-data-server/registry-modules/module-gnome-online-accounts.so
lib/evolution-data-server/registry-modules/module-google-backend.so
+lib/evolution-data-server/registry-modules/module-oauth2-services.so
lib/evolution-data-server/registry-modules/module-outlook-backend.so
-lib/evolution-data-server/registry-modules/module-owncloud-backend.so
lib/evolution-data-server/registry-modules/module-secret-monitor.so
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/EBook-%%EVO_VERSION%%.typelib
@@ -326,8 +347,8 @@ lib/girepository-1.0/EBookContacts-%%EVO_VERSION%%.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.60
-lib/libcamel-%%EVO_VERSION%%.so.60.0.0
+lib/libcamel-%%EVO_VERSION%%.so.61
+lib/libcamel-%%EVO_VERSION%%.so.61.0.0
lib/libebackend-%%EVO_VERSION%%.so
lib/libebackend-%%EVO_VERSION%%.so.10
lib/libebackend-%%EVO_VERSION%%.so.10.0.0
@@ -347,11 +368,11 @@ lib/libedata-cal-%%EVO_VERSION%%.so
lib/libedata-cal-%%EVO_VERSION%%.so.28
lib/libedata-cal-%%EVO_VERSION%%.so.28.0.0
lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.22
-lib/libedataserver-%%EVO_VERSION%%.so.22.0.0
+lib/libedataserver-%%EVO_VERSION%%.so.23
+lib/libedataserver-%%EVO_VERSION%%.so.23.0.0
lib/libedataserverui-%%EVO_VERSION%%.so
-lib/libedataserverui-%%EVO_VERSION%%.so.1
-lib/libedataserverui-%%EVO_VERSION%%.so.1.0.0
+lib/libedataserverui-%%EVO_VERSION%%.so.2
+lib/libedataserverui-%%EVO_VERSION%%.so.2.0.0
libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc
libdata/pkgconfig/libebackend-%%EVO_VERSION%%.pc
@@ -371,6 +392,7 @@ libexec/evolution-calendar-factory
libexec/evolution-calendar-factory-subprocess
libexec/evolution-data-server/addressbook-export
libexec/evolution-data-server/csv2vcard
+libexec/evolution-data-server/list-sources
libexec/evolution-scan-gconf-tree-xml
libexec/evolution-source-registry
libexec/evolution-user-prompter
@@ -385,94 +407,94 @@ share/gir-1.0/EBook-%%EVO_VERSION%%.gir
share/gir-1.0/EBookContacts-%%EVO_VERSION%%.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-%%VERSION%%.mo
-share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/as/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ast/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/be/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/bn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/bs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/cy/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/dz/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/en@shaw/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/en_AU/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/eo/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/et/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/fa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/fur/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ga/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/gu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/he/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/hi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/is/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ka/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/kk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/km/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/kn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ku/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/mai/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ml/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/mn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/mr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ne/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/oc/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/or/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ro/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/rw/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/si/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/sl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/sr@latin/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ta/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/te/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/tg/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/th/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/ug/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/wa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/xh/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/am/LC_MESSAGES/evolution-data-server.mo
+share/locale/ar/LC_MESSAGES/evolution-data-server.mo
+share/locale/as/LC_MESSAGES/evolution-data-server.mo
+share/locale/ast/LC_MESSAGES/evolution-data-server.mo
+share/locale/az/LC_MESSAGES/evolution-data-server.mo
+share/locale/be/LC_MESSAGES/evolution-data-server.mo
+share/locale/bg/LC_MESSAGES/evolution-data-server.mo
+share/locale/bn/LC_MESSAGES/evolution-data-server.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-data-server.mo
+share/locale/bs/LC_MESSAGES/evolution-data-server.mo
+share/locale/ca/LC_MESSAGES/evolution-data-server.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-data-server.mo
+share/locale/cs/LC_MESSAGES/evolution-data-server.mo
+share/locale/cy/LC_MESSAGES/evolution-data-server.mo
+share/locale/da/LC_MESSAGES/evolution-data-server.mo
+share/locale/de/LC_MESSAGES/evolution-data-server.mo
+share/locale/dz/LC_MESSAGES/evolution-data-server.mo
+share/locale/el/LC_MESSAGES/evolution-data-server.mo
+share/locale/en@shaw/LC_MESSAGES/evolution-data-server.mo
+share/locale/en_AU/LC_MESSAGES/evolution-data-server.mo
+share/locale/en_CA/LC_MESSAGES/evolution-data-server.mo
+share/locale/en_GB/LC_MESSAGES/evolution-data-server.mo
+share/locale/eo/LC_MESSAGES/evolution-data-server.mo
+share/locale/es/LC_MESSAGES/evolution-data-server.mo
+share/locale/et/LC_MESSAGES/evolution-data-server.mo
+share/locale/eu/LC_MESSAGES/evolution-data-server.mo
+share/locale/fa/LC_MESSAGES/evolution-data-server.mo
+share/locale/fi/LC_MESSAGES/evolution-data-server.mo
+share/locale/fr/LC_MESSAGES/evolution-data-server.mo
+share/locale/fur/LC_MESSAGES/evolution-data-server.mo
+share/locale/ga/LC_MESSAGES/evolution-data-server.mo
+share/locale/gl/LC_MESSAGES/evolution-data-server.mo
+share/locale/gu/LC_MESSAGES/evolution-data-server.mo
+share/locale/he/LC_MESSAGES/evolution-data-server.mo
+share/locale/hi/LC_MESSAGES/evolution-data-server.mo
+share/locale/hr/LC_MESSAGES/evolution-data-server.mo
+share/locale/hu/LC_MESSAGES/evolution-data-server.mo
+share/locale/id/LC_MESSAGES/evolution-data-server.mo
+share/locale/is/LC_MESSAGES/evolution-data-server.mo
+share/locale/it/LC_MESSAGES/evolution-data-server.mo
+share/locale/ja/LC_MESSAGES/evolution-data-server.mo
+share/locale/ka/LC_MESSAGES/evolution-data-server.mo
+share/locale/kk/LC_MESSAGES/evolution-data-server.mo
+share/locale/km/LC_MESSAGES/evolution-data-server.mo
+share/locale/kn/LC_MESSAGES/evolution-data-server.mo
+share/locale/ko/LC_MESSAGES/evolution-data-server.mo
+share/locale/ku/LC_MESSAGES/evolution-data-server.mo
+share/locale/lt/LC_MESSAGES/evolution-data-server.mo
+share/locale/lv/LC_MESSAGES/evolution-data-server.mo
+share/locale/mai/LC_MESSAGES/evolution-data-server.mo
+share/locale/mk/LC_MESSAGES/evolution-data-server.mo
+share/locale/ml/LC_MESSAGES/evolution-data-server.mo
+share/locale/mn/LC_MESSAGES/evolution-data-server.mo
+share/locale/mr/LC_MESSAGES/evolution-data-server.mo
+share/locale/ms/LC_MESSAGES/evolution-data-server.mo
+share/locale/nb/LC_MESSAGES/evolution-data-server.mo
+share/locale/ne/LC_MESSAGES/evolution-data-server.mo
+share/locale/nl/LC_MESSAGES/evolution-data-server.mo
+share/locale/nn/LC_MESSAGES/evolution-data-server.mo
+share/locale/oc/LC_MESSAGES/evolution-data-server.mo
+share/locale/or/LC_MESSAGES/evolution-data-server.mo
+share/locale/pa/LC_MESSAGES/evolution-data-server.mo
+share/locale/pl/LC_MESSAGES/evolution-data-server.mo
+share/locale/pt/LC_MESSAGES/evolution-data-server.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-data-server.mo
+share/locale/ro/LC_MESSAGES/evolution-data-server.mo
+share/locale/ru/LC_MESSAGES/evolution-data-server.mo
+share/locale/rw/LC_MESSAGES/evolution-data-server.mo
+share/locale/si/LC_MESSAGES/evolution-data-server.mo
+share/locale/sk/LC_MESSAGES/evolution-data-server.mo
+share/locale/sl/LC_MESSAGES/evolution-data-server.mo
+share/locale/sq/LC_MESSAGES/evolution-data-server.mo
+share/locale/sr/LC_MESSAGES/evolution-data-server.mo
+share/locale/sr@latin/LC_MESSAGES/evolution-data-server.mo
+share/locale/sv/LC_MESSAGES/evolution-data-server.mo
+share/locale/ta/LC_MESSAGES/evolution-data-server.mo
+share/locale/te/LC_MESSAGES/evolution-data-server.mo
+share/locale/tg/LC_MESSAGES/evolution-data-server.mo
+share/locale/th/LC_MESSAGES/evolution-data-server.mo
+share/locale/tr/LC_MESSAGES/evolution-data-server.mo
+share/locale/ug/LC_MESSAGES/evolution-data-server.mo
+share/locale/uk/LC_MESSAGES/evolution-data-server.mo
+share/locale/vi/LC_MESSAGES/evolution-data-server.mo
+share/locale/wa/LC_MESSAGES/evolution-data-server.mo
+share/locale/xh/LC_MESSAGES/evolution-data-server.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-data-server.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-data-server.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-data-server.mo
share/pixmaps/evolution-data-server/category_birthday_16.png
share/pixmaps/evolution-data-server/category_business_16.png
share/pixmaps/evolution-data-server/category_favorites_16.png
diff --git a/databases/libgda5/files/patch-00-unicode b/databases/libgda5/files/patch-00-unicode
new file mode 100644
index 000000000000..5308f41f6543
--- /dev/null
+++ b/databases/libgda5/files/patch-00-unicode
@@ -0,0 +1,83 @@
+From b611c805b3a2248e2f4f85f993f96c13a05b4730 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Mon, 17 Jul 2017 22:37:50 +0100
+Subject: Convert files to Unicode
+
+These header files have mixed encoding, and makes various tools choke on
+them.
+---
+ libgda/gda-connection.h | 2 +-
+ libgda/sql-parser/gda-sql-statement.h | 2 +-
+ libgda/sql-parser/gda-statement-struct-delete.h | 2 +-
+ libgda/sql-parser/gda-statement-struct-unknown.h | 2 +-
+ libgda/sql-parser/gda-statement-struct-util.h | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libgda/gda-connection.h b/libgda/gda-connection.h
+index 94d1b27b5..19ca63fc3 100644
+--- a/libgda/gda-connection.h
++++ libgda/gda-connection.h
+@@ -6,7 +6,7 @@
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+ * Copyright (C) 2003 Filip Van Raemdonck <mechanix@debian.org>
+ * Copyright (C) 2004 - 2005 Alan Knowles <alank@src.gnome.org>
+- * Copyright (C) 2004 José María Casanova Crespo <jmcasanova@igalia.com>
++ * Copyright (C) 2004 José María Casanova Crespo <jmcasanova@igalia.com>
+ * Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen@xobas.com>
+ * Copyright (C) 2006 - 2008 Murray Cumming <murrayc@murrayc.com>
+ * Copyright (C) 2007 Leonardo Boshell <lb@kmc.com.co>
+diff --git a/libgda/sql-parser/gda-sql-statement.h b/libgda/sql-parser/gda-sql-statement.h
+index 0ba1f9edc..8783ca8a1 100644
+--- a/libgda/sql-parser/gda-sql-statement.h
++++ libgda/sql-parser/gda-sql-statement.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
+ * Copyright (C) 2011 Murray Cumming <murrayc@murrayc.com>
+diff --git a/libgda/sql-parser/gda-statement-struct-delete.h b/libgda/sql-parser/gda-statement-struct-delete.h
+index cab8b9dad..2e51c5eae 100644
+--- a/libgda/sql-parser/gda-statement-struct-delete.h
++++ libgda/sql-parser/gda-statement-struct-delete.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
+- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
++ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net>
+ * Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
+ * Copyright (C) 2007 - 2009 Murray Cumming <murrayc@murrayc.com>
+ *
+diff --git a/libgda/sql-parser/gda-statement-struct-unknown.h b/libgda/sql-parser/gda-statement-struct-unknown.h
+index 5c530d4d9..e0aaf945f 100644
+--- a/libgda/sql-parser/gda-statement-struct-unknown.h
++++ libgda/sql-parser/gda-statement-struct-unknown.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
+ * Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
+diff --git a/libgda/sql-parser/gda-statement-struct-util.h b/libgda/sql-parser/gda-statement-struct-util.h
+index cd4596281..252d6edcc 100644
+--- a/libgda/sql-parser/gda-statement-struct-util.h
++++ libgda/sql-parser/gda-statement-struct-util.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
+- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
++ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net>
+ * Copyright (C) 2007 - 2009 Murray Cumming <murrayc@murrayc.com>
+ *
+ * This library is free software; you can redistribute it and/or
+--
+2.11.0
+
diff --git a/databases/libgda5/files/patch-fix-crash b/databases/libgda5/files/patch-fix-crash
new file mode 100644
index 000000000000..54399873f496
--- /dev/null
+++ b/databases/libgda5/files/patch-fix-crash
@@ -0,0 +1,21 @@
+diff --git i/libgda-ui/data-entries/plugins/libmain.c w/libgda-ui/data-entries/plugins/libmain.c
+index a30c2db2c3258111..1356488c8b0940f9 100644
+--- libgda-ui/data-entries/plugins/libmain.c
++++ libgda-ui/data-entries/plugins/libmain.c
+@@ -39,15 +39,7 @@
+ #endif
+
+ #ifdef HAVE_GTKSOURCEVIEW
+- #ifdef GTK_DISABLE_SINGLE_INCLUDES
+- #undef GTK_DISABLE_SINGLE_INCLUDES
+- #endif
+-
+- #include <gtksourceview/gtksourceview.h>
+- #include <gtksourceview/gtksourcelanguagemanager.h>
+- #include <gtksourceview/gtksourcebuffer.h>
+- #include <gtksourceview/gtksourcestyleschememanager.h>
+- #include <gtksourceview/gtksourcestylescheme.h>
++#include <gtksourceview/gtksource.h>
+ #endif
+
+ static GdauiDataEntry *plugin_entry_filesel_create_func (GdaDataHandler *handler, GType type, const gchar *options);
diff --git a/databases/libgda5/files/patch-ftbfs b/databases/libgda5/files/patch-ftbfs
new file mode 100644
index 000000000000..d493b571f55a
--- /dev/null
+++ b/databases/libgda5/files/patch-ftbfs
@@ -0,0 +1,103 @@
+Description: Fix FTBFS with glib 2.54
+ glib-mkenums now expects input files to be UTF-8,
+ fix the encoding of libgnomeui/gnome-scores.h
+Author: Adrian Bunk <bunk@debian.org>
+
+--- libgda5-5.2.4.orig/libgda/gda-column.h
++++ libgda/gda-column.h
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
+- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
++ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net>
+ * Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+--- libgda5-5.2.4.orig/libgda/gda-data-model-extra.h
++++ libgda/gda-data-model-extra.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
+ * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+--- libgda5-5.2.4.orig/libgda/gda-data-model-iter-extra.h
++++ libgda/gda-data-model-iter-extra.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
+ *
+--- libgda5-5.2.4.orig/libgda/gda-data-model.h
++++ libgda/gda-data-model.h
+@@ -4,7 +4,7 @@
+ * Copyright (C) 2003 Laurent Sansonetti <lrz@gnome.org>
+ * Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
+ * Copyright (C) 2005 - 2012 Vivien Malerba <malerba@gnome-db.org>
+- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
++ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net>
+ * Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
+ * Copyright (C) 2011 Daniel Espinosa <despinosa@src.gnome.org>
+ *
+--- libgda5-5.2.4.orig/libgda/gda-mutex.h
++++ libgda/gda-mutex.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
+ * Copyright (C) 2001 - 2013 Vivien Malerba <malerba@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
+ *
+--- libgda5-5.2.4.orig/libgda/gda-row.h
++++ libgda/gda-row.h
+@@ -3,10 +3,10 @@
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+ * Copyright (C) 2003 Laurent Sansonetti <laurent@datarescue.be>
+- * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcalvar@igalia.com>
++ * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcalvar@igalia.com>
+ * Copyright (C) 2004 Paisa Seeluangsawat <paisa@users.sf.net>
+ * Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
+- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
++ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+--- libgda5-5.2.4.orig/libgda/gda-server-provider-private.h
++++ libgda/gda-server-provider-private.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
+- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
++ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net>
+ * Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
+ *
+ * This library is free software; you can redistribute it and/or
+--- libgda5-5.2.4.orig/libgda/gda-util.h
++++ libgda/gda-util.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
+ * Copyright (C) 2001 - 2013 Vivien Malerba <malerba@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
+ * Copyright (C) 2006 - 2007 Murray Cumming <murrayc@murrayc.com>
+--- libgda5-5.2.4.orig/libgda/libgda-global-variables.h
++++ libgda/libgda-global-variables.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
+ * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
diff --git a/databases/libgda5/files/patch-ftbfs-2 b/databases/libgda5/files/patch-ftbfs-2
new file mode 100644
index 000000000000..7c368cd42cae
--- /dev/null
+++ b/databases/libgda5/files/patch-ftbfs-2
@@ -0,0 +1,11 @@
+--- libgda-ui/gdaui-easy.h 2017-10-08 21:17:30.203226827 +0000
++++ libgda-ui/gdaui-easy.h 2017-10-08 21:19:38.143497887 +0000
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
+- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
+ *
diff --git a/deskutils/Makefile b/deskutils/Makefile
index b2663d8d2398..2d9a9adf82f4 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -81,16 +81,16 @@
SUBDIR += gnome-shell-extension-lockkeys
SUBDIR += gnome-shell-extension-mediaplayer
SUBDIR += gnome-shell-extension-openweather
- SUBDIR += gnome-shell-extension-overlay-icons
SUBDIR += gnome-shell-extension-panel-osd
SUBDIR += gnome-shell-extension-recent-items
SUBDIR += gnome-shell-extension-trash
SUBDIR += gnome-shell-extension-weather
+ SUBDIR += gnome-shell-extension-windowoverlay-icons
SUBDIR += gnome-shell-extra-extensions
SUBDIR += gnome-sound-recorder
SUBDIR += gnome-system-log
SUBDIR += gnome-todo
- SUBDIR += gnome-tweak-tool
+ SUBDIR += gnome-tweaks
SUBDIR += gnome-utils
SUBDIR += gnome-weather
SUBDIR += gnote
diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile
index 4fab0c8bdaa9..3acc32f12961 100644
--- a/deskutils/baobab/Makefile
+++ b/deskutils/baobab/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= baobab
-PORTVERSION= 3.24.0
+PORTVERSION= 3.28.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 3 graphical directory tree analyzer
@@ -13,25 +13,18 @@ COMMENT= GNOME 3 graphical directory tree analyzer
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= itstool:textproc/itstool \
- vapigen:lang/vala
-LIB_DEPENDS= libgtop-2.0.so:devel/libgtop
-
-CONFLICTS= gnome-utils-2.[0-9]*
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake gnome localbase \
- pathfix pkgconfig tar:xz
-USE_GNOME= cairo gnomeprefix gtk30 libxml2
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
+BUILD_DEPENDS= valac:lang/vala \
+ itstool:textproc/itstool
+
+USES= desktop-file-utils gettext gnome meson pkgconfig tar:xz
+USE_GNOME= cairo gtk30
GLIB_SCHEMAS= org.gnome.baobab.gschema.xml
post-patch:
- @${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
- ${WRKSRC}/src/Makefile.in
@${REINPLACE_CMD} -e 's|MimeType=inode/directory;|MimeType=|g' \
- ${WRKSRC}/data/org.gnome.baobab.desktop.in.in
+ ${WRKSRC}/data/org.gnome.baobab.desktop.in
.include <bsd.port.mk>
diff --git a/deskutils/baobab/distinfo b/deskutils/baobab/distinfo
index 014a1a5b0071..3d21a47b4f70 100644
--- a/deskutils/baobab/distinfo
+++ b/deskutils/baobab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494659608
-SHA256 (gnome3/baobab-3.24.0.tar.xz) = 5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f
-SIZE (gnome3/baobab-3.24.0.tar.xz) = 970636
+TIMESTAMP = 1526111043
+SHA256 (gnome/baobab-3.28.0.tar.xz) = 530bb269e19d1f9f562fab90377eda8ce3c3efd521e4d569f7c40e56fa3e5d63
+SIZE (gnome/baobab-3.28.0.tar.xz) = 763952
diff --git a/deskutils/baobab/pkg-plist b/deskutils/baobab/pkg-plist
index 80f5edad829c..e9486a6fd947 100644
--- a/deskutils/baobab/pkg-plist
+++ b/deskutils/baobab/pkg-plist
@@ -1,6 +1,5 @@
bin/baobab
man/man1/baobab.1.gz
-share/appdata/org.gnome.baobab.appdata.xml
share/applications/org.gnome.baobab.desktop
share/dbus-1/services/org.gnome.baobab.service
share/help/C/baobab/index.page
@@ -133,6 +132,19 @@ share/help/gl/baobab/scan-file-system.page
share/help/gl/baobab/scan-folder.page
share/help/gl/baobab/scan-home.page
share/help/gl/baobab/scan-remote.page
+share/help/hr/baobab/index.page
+share/help/hr/baobab/introduction.page
+share/help/hr/baobab/legal.xml
+share/help/hr/baobab/media/hicolor_apps_48x48_baobab.png
+share/help/hr/baobab/pref-view-chart.page
+share/help/hr/baobab/problem-permissions.page
+share/help/hr/baobab/problem-slow-scan.page
+share/help/hr/baobab/question-open-folder.page
+share/help/hr/baobab/question-trash.page
+share/help/hr/baobab/scan-file-system.page
+share/help/hr/baobab/scan-folder.page
+share/help/hr/baobab/scan-home.page
+share/help/hr/baobab/scan-remote.page
share/help/hu/baobab/index.page
share/help/hu/baobab/introduction.page
share/help/hu/baobab/legal.xml
@@ -185,6 +197,32 @@ share/help/ko/baobab/scan-file-system.page
share/help/ko/baobab/scan-folder.page
share/help/ko/baobab/scan-home.page
share/help/ko/baobab/scan-remote.page
+share/help/pl/baobab/index.page
+share/help/pl/baobab/introduction.page
+share/help/pl/baobab/legal.xml
+share/help/pl/baobab/media/hicolor_apps_48x48_baobab.png
+share/help/pl/baobab/pref-view-chart.page
+share/help/pl/baobab/problem-permissions.page
+share/help/pl/baobab/problem-slow-scan.page
+share/help/pl/baobab/question-open-folder.page
+share/help/pl/baobab/question-trash.page
+share/help/pl/baobab/scan-file-system.page
+share/help/pl/baobab/scan-folder.page
+share/help/pl/baobab/scan-home.page
+share/help/pl/baobab/scan-remote.page
+share/help/pt/baobab/index.page
+share/help/pt/baobab/introduction.page
+share/help/pt/baobab/legal.xml
+share/help/pt/baobab/media/hicolor_apps_48x48_baobab.png
+share/help/pt/baobab/pref-view-chart.page
+share/help/pt/baobab/problem-permissions.page
+share/help/pt/baobab/problem-slow-scan.page
+share/help/pt/baobab/question-open-folder.page
+share/help/pt/baobab/question-trash.page
+share/help/pt/baobab/scan-file-system.page
+share/help/pt/baobab/scan-folder.page
+share/help/pt/baobab/scan-home.page
+share/help/pt/baobab/scan-remote.page
share/help/pt_BR/baobab/index.page
share/help/pt_BR/baobab/introduction.page
share/help/pt_BR/baobab/legal.xml
@@ -252,11 +290,10 @@ share/help/zh_CN/baobab/scan-home.page
share/help/zh_CN/baobab/scan-remote.page
share/icons/hicolor/16x16/apps/baobab.png
share/icons/hicolor/22x22/apps/baobab.png
-share/icons/hicolor/24x24/apps/baobab.png
share/icons/hicolor/256x256/apps/baobab.png
share/icons/hicolor/32x32/apps/baobab.png
share/icons/hicolor/48x48/apps/baobab.png
-share/icons/hicolor/scalable/apps/baobab-symbolic.svg
+share/icons/hicolor/symbolic/apps/baobab-symbolic.svg
share/locale/af/LC_MESSAGES/baobab.mo
share/locale/am/LC_MESSAGES/baobab.mo
share/locale/an/LC_MESSAGES/baobab.mo
@@ -353,3 +390,4 @@ share/locale/xh/LC_MESSAGES/baobab.mo
share/locale/zh_CN/LC_MESSAGES/baobab.mo
share/locale/zh_HK/LC_MESSAGES/baobab.mo
share/locale/zh_TW/LC_MESSAGES/baobab.mo
+share/metainfo/org.gnome.baobab.appdata.xml
diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
index e7e6a1e41680..7b3354cb1d5e 100644
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -2,36 +2,37 @@
# $FreeBSD$
PORTNAME= bijiben
-PORTVERSION= 3.18.2
-PORTREVISION= 9
+PORTVERSION= 3.28.3
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Note editor designed to remain simple to use
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libtracker-control-1.0.so:sysutils/tracker \
+LIB_DEPENDS= libtracker-control-2.0.so:sysutils/tracker \
+ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
libgoa-1.0.so:net/gnome-online-accounts \
- libwebkitgtk-3.0.so:www/webkit-gtk3 \
- libclutter-gtk-1.0.so:graphics/clutter-gtk3
+ libical.so:devel/libical \
+ libzeitgeist-2.0.so:sysutils/zeitgeist \
+ libuuid.so:misc/e2fsprogs-libuuid
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake gnome libtool \
- pathfix pkgconfig shared-mime-info tar:xz
+USES= compiler:c++11-lib desktop-file-utils gettext gnome \
+ localbase meson pkgconfig python:build,3.4+ \
+ shared-mime-info shebangfix tar:xz
USE_LDCONFIG= yes
-USE_GNOME= evolutiondataserver3 gnomedesktop3 gtk30 intlhack \
- introspection:build
-GNU_CONFIGURE= yes
+USE_GNOME= cairo evolutiondataserver3 intltool
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-GLIB_SCHEMAS= org.gnome.bijiben.gschema.xml
+MESON_ARGS= -Dzeitgeist=true
+SHEBANG_FILES= ${WRKSRC}/build-aux/meson_post_install.py
-# needed for webkit
-USES+= compiler:c++11-lib
+GLIB_SCHEMAS= org.gnome.bijiben.gschema.xml \
+ org.gnome.bijiben.enums.xml
.include <bsd.port.mk>
diff --git a/deskutils/bijiben/distinfo b/deskutils/bijiben/distinfo
index a32d494159a3..0e8680fe448c 100644
--- a/deskutils/bijiben/distinfo
+++ b/deskutils/bijiben/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/bijiben-3.18.2.tar.xz) = 45fed3242ba092138760b99e725f0a4d3c8d749ef37c607d43c8f010e11a645d
-SIZE (gnome3/bijiben-3.18.2.tar.xz) = 682036
+TIMESTAMP = 1529614643
+SHA256 (gnome/bijiben-3.28.3.tar.xz) = 22d2a5f03dbaa9e8c5d186863289f185249c51f610bfa1fb5c3ed766a813e951
+SIZE (gnome/bijiben-3.28.3.tar.xz) = 683372
diff --git a/deskutils/bijiben/pkg-plist b/deskutils/bijiben/pkg-plist
index 3a6eb465a8ae..b81786bb08a3 100644
--- a/deskutils/bijiben/pkg-plist
+++ b/deskutils/bijiben/pkg-plist
@@ -1,14 +1,14 @@
bin/bijiben
libexec/bijiben-shell-search-provider
-share/appdata/bijiben.appdata.xml
-share/applications/bijiben.desktop
+share/applications/org.gnome.bijiben.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/bijiben-search-provider.ini
+share/dbus-1/services/org.gnome.bijiben.SearchProvider.service
+share/gnome-shell/search-providers/org.gnome.bijiben-search-provider.ini
share/help/C/bijiben/colors.page
share/help/C/bijiben/create.page
share/help/C/bijiben/cut-copy-paste.page
@@ -142,6 +142,44 @@ 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/ko/bijiben/colors.page
+share/help/ko/bijiben/create.page
+share/help/ko/bijiben/cut-copy-paste.page
+share/help/ko/bijiben/delete-permanent.page
+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/format-list.page
+share/help/ko/bijiben/format-text.page
+share/help/ko/bijiben/index.page
+share/help/ko/bijiben/introduction.page
+share/help/ko/bijiben/legal.xml
+share/help/ko/bijiben/new-window.page
+share/help/ko/bijiben/notebooks.page
+share/help/ko/bijiben/rename.page
+share/help/ko/bijiben/search.page
+share/help/ko/bijiben/share.page
+share/help/pl/bijiben/colors.page
+share/help/pl/bijiben/create.page
+share/help/pl/bijiben/cut-copy-paste.page
+share/help/pl/bijiben/delete-permanent.page
+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/format-list.page
+share/help/pl/bijiben/format-text.page
+share/help/pl/bijiben/index.page
+share/help/pl/bijiben/introduction.page
+share/help/pl/bijiben/legal.xml
+share/help/pl/bijiben/new-window.page
+share/help/pl/bijiben/notebooks.page
+share/help/pl/bijiben/rename.page
+share/help/pl/bijiben/search.page
+share/help/pl/bijiben/share.page
share/help/pt_BR/bijiben/colors.page
share/help/pt_BR/bijiben/create.page
share/help/pt_BR/bijiben/cut-copy-paste.page
@@ -161,15 +199,36 @@ share/help/pt_BR/bijiben/notebooks.page
share/help/pt_BR/bijiben/rename.page
share/help/pt_BR/bijiben/search.page
share/help/pt_BR/bijiben/share.page
-share/icons/hicolor/16x16/apps/bijiben.png
-share/icons/hicolor/22x22/apps/bijiben.png
-share/icons/hicolor/24x24/apps/bijiben.png
-share/icons/hicolor/256x256/apps/bijiben.png
-share/icons/hicolor/32x32/apps/bijiben.png
-share/icons/hicolor/48x48/apps/bijiben.png
-share/icons/hicolor/scalable/apps/bijiben-symbolic.svg
+share/help/sv/bijiben/colors.page
+share/help/sv/bijiben/create.page
+share/help/sv/bijiben/cut-copy-paste.page
+share/help/sv/bijiben/delete-permanent.page
+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/format-list.page
+share/help/sv/bijiben/format-text.page
+share/help/sv/bijiben/index.page
+share/help/sv/bijiben/introduction.page
+share/help/sv/bijiben/legal.xml
+share/help/sv/bijiben/new-window.page
+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/locale/af/LC_MESSAGES/bijiben.mo
share/locale/ar/LC_MESSAGES/bijiben.mo
share/locale/as/LC_MESSAGES/bijiben.mo
+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
@@ -178,16 +237,19 @@ share/locale/da/LC_MESSAGES/bijiben.mo
share/locale/de/LC_MESSAGES/bijiben.mo
share/locale/el/LC_MESSAGES/bijiben.mo
share/locale/en_AU/LC_MESSAGES/bijiben.mo
+share/locale/en_GB/LC_MESSAGES/bijiben.mo
share/locale/eo/LC_MESSAGES/bijiben.mo
share/locale/es/LC_MESSAGES/bijiben.mo
share/locale/et/LC_MESSAGES/bijiben.mo
share/locale/eu/LC_MESSAGES/bijiben.mo
+share/locale/fa/LC_MESSAGES/bijiben.mo
share/locale/fi/LC_MESSAGES/bijiben.mo
share/locale/fr/LC_MESSAGES/bijiben.mo
share/locale/fur/LC_MESSAGES/bijiben.mo
share/locale/ga/LC_MESSAGES/bijiben.mo
share/locale/gl/LC_MESSAGES/bijiben.mo
share/locale/he/LC_MESSAGES/bijiben.mo
+share/locale/hr/LC_MESSAGES/bijiben.mo
share/locale/hu/LC_MESSAGES/bijiben.mo
share/locale/id/LC_MESSAGES/bijiben.mo
share/locale/is/LC_MESSAGES/bijiben.mo
@@ -218,8 +280,9 @@ share/locale/te/LC_MESSAGES/bijiben.mo
share/locale/tg/LC_MESSAGES/bijiben.mo
share/locale/tr/LC_MESSAGES/bijiben.mo
share/locale/uk/LC_MESSAGES/bijiben.mo
+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/mime/application/x-note.xml
-share/mime/packages/bijiben.xml
+share/metainfo/org.gnome.bijiben.appdata.xml
+share/mime/packages/org.gnome.bijiben.xml
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 500ef7fc93b7..2462e095653f 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -2,34 +2,30 @@
# $FreeBSD$
PORTNAME= glabels
-PORTVERSION= 2.2.8
-PORTREVISION= 6
+PORTVERSION= 3.4.1
CATEGORIES= deskutils
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Program to create labels and business cards
-OPTIONS_DEFINE= EVOLUTION
-EVOLUTION_DESC= Support evolution data server
+BUILD_DEPENDS= itstool:textproc/itstool
+LIB_DEPENDS= libsecret-1.so:security/libsecret \
+ libsoup-2.4.so:devel/libsoup
USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
- shared-mime-info tar:bzip2
-USE_GNOME= gnomeprefix libgnomeui gnomedocutils intlhack
-INSTALLS_OMF= yes
+ shared-mime-info tar:xz
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool librsvg2
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-update-desktopdb --disable-update-mimedb
-CPPFLAGS+= -I${LOCALBASE}/include -DGLIB_COMPILATION
-LDFLAGS+= -L${LOCALBASE}/lib
-EVOLUTION_USE= GNOME=evolutiondataserver
-EVOLUTION_CONFIGURE_WITH= libebook
+GLIB_SCHEMAS= org.gnome.glabels-3.gschema.xml
-post-patch:
- @${REINPLACE_CMD} -e 's|malloc\.h|stdlib\.h|g' \
- ${WRKSRC}/iec16022-0.2.1/*.c
- @${REINPLACE_CMD} 's/_LDADD =/& -lm/' ${WRKSRC}/src/Makefile.in
+OPTIONS_DEFINE= EVOLUTION
+EVOLUTION_DESC= Support evolution data server
+
+EVOLUTION_USE= GNOME=evolutiondataserver3
+EVOLUTION_CONFIGURE_WITH= libebook
.include <bsd.port.mk>
diff --git a/deskutils/glabels/distinfo b/deskutils/glabels/distinfo
index 7fadde99b7e4..a1df2476b08c 100644
--- a/deskutils/glabels/distinfo
+++ b/deskutils/glabels/distinfo
@@ -1,2 +1,3 @@
-SHA256 (glabels-2.2.8.tar.bz2) = 105829187e8c36f25d26d95a099006f3489afe13489cf1765b19f6b8d1969bbe
-SIZE (glabels-2.2.8.tar.bz2) = 3468735
+TIMESTAMP = 1525964956
+SHA256 (glabels-3.4.1.tar.xz) = 18e457298abb1c617187361109eeae769317686303fc07726af31e11519c5938
+SIZE (glabels-3.4.1.tar.xz) = 3467992
diff --git a/deskutils/glabels/pkg-plist b/deskutils/glabels/pkg-plist
index 028adcd8ea89..10b09f0ac37d 100644
--- a/deskutils/glabels/pkg-plist
+++ b/deskutils/glabels/pkg-plist
@@ -1,192 +1,678 @@
-bin/glabels
-bin/glabels-batch
-include/libglabels/category.h
-include/libglabels/db.h
-include/libglabels/enums.h
-include/libglabels/libglabels.h
-include/libglabels/paper.h
-include/libglabels/str.h
-include/libglabels/template.h
-include/libglabels/xml-category.h
-include/libglabels/xml-paper.h
-include/libglabels/xml-template.h
-include/libglabels/xml.h
-lib/libglabels.a
-lib/libglabels.so
-lib/libglabels.so.5
-lib/libglabels.so.5.1.2
-libdata/pkgconfig/libglabels.pc
-man/man1/glabels.1.gz
-share/application-registry/glabels.applications
-share/applications/glabels.desktop
-share/doc/libglabels/ch01.html
-share/doc/libglabels/ch02.html
-share/doc/libglabels/ch03.html
-share/doc/libglabels/home.png
-share/doc/libglabels/index.html
-share/doc/libglabels/index.sgml
-share/doc/libglabels/left.png
-share/doc/libglabels/libglabels-category.html
-share/doc/libglabels/libglabels-db.html
-share/doc/libglabels/libglabels-enums.html
-share/doc/libglabels/libglabels-paper.html
-share/doc/libglabels/libglabels-str.html
-share/doc/libglabels/libglabels-template.html
-share/doc/libglabels/libglabels-xml-category.html
-share/doc/libglabels/libglabels-xml-paper.html
-share/doc/libglabels/libglabels-xml-template.html
-share/doc/libglabels/libglabels-xml.html
-share/doc/libglabels/libglabels.devhelp
-share/doc/libglabels/libglabels.devhelp2
-share/doc/libglabels/right.png
-share/doc/libglabels/style.css
-share/doc/libglabels/up.png
-%%DATADIR%%/dtd/glabels-2.2.dtd
-%%DATADIR%%/glade/merge-properties-dialog.glade
-%%DATADIR%%/glade/new-label-dialog.glade
-%%DATADIR%%/glade/object-editor.glade
-%%DATADIR%%/glade/prefs-dialog.glade
-%%DATADIR%%/glade/print-custom-widget.glade
-%%DATADIR%%/glade/property-bar.glade
-%%DATADIR%%/glade/template-designer.glade
-%%DATADIR%%/glade/wdgt-media-select.glade
-%%DATADIR%%/glade/wdgt-rotate-label.glade
-%%DATADIR%%/templates/avery-iso-templates.xml
-%%DATADIR%%/templates/avery-other-templates.xml
-%%DATADIR%%/templates/avery-us-templates.xml
-%%DATADIR%%/templates/brother-other-templates.xml
-%%DATADIR%%/templates/categories.xml
-%%DATADIR%%/templates/dymo-other-templates.xml
-%%DATADIR%%/templates/misc-iso-templates.xml
-%%DATADIR%%/templates/misc-other-templates.xml
-%%DATADIR%%/templates/misc-us-templates.xml
-%%DATADIR%%/templates/paper-sizes.xml
-%%DATADIR%%/templates/pearl-templates.xml
-%%DATADIR%%/templates/zweckform-iso-templates.xml
-share/gnome/help/glabels/C/figures/glabels-template-cd.png
-share/gnome/help/glabels/C/figures/glabels-template-label.png
-share/gnome/help/glabels/C/figures/glabels-template-layout.png
-share/gnome/help/glabels/C/figures/main-window-empty.png
-share/gnome/help/glabels/C/figures/merge-ex1-1.png
-share/gnome/help/glabels/C/figures/merge-ex1-2.png
-share/gnome/help/glabels/C/figures/merge-ex1-3.png
-share/gnome/help/glabels/C/figures/merge-ex1-4.png
-share/gnome/help/glabels/C/figures/merge-ex2-1.png
-share/gnome/help/glabels/C/figures/merge-ex2-2.png
-share/gnome/help/glabels/C/figures/merge-ex2-3.png
-share/gnome/help/glabels/C/figures/merge-ex2-4.png
-share/gnome/help/glabels/C/figures/merge-ex3-1.png
-share/gnome/help/glabels/C/figures/merge-ex3-2.png
-share/gnome/help/glabels/C/figures/object-editor-sidebar.png
-share/gnome/help/glabels/C/figures/print-copies.png
-share/gnome/help/glabels/C/figures/print-merge.png
-share/gnome/help/glabels/C/glabels.xml
-share/gnome/help/glabels/C/legal.xml
-share/gnome/help/glabels/cs/figures/glabels-template-cd.png
-share/gnome/help/glabels/cs/figures/glabels-template-label.png
-share/gnome/help/glabels/cs/figures/glabels-template-layout.png
-share/gnome/help/glabels/cs/figures/main-window-empty.png
-share/gnome/help/glabels/cs/figures/merge-ex1-1.png
-share/gnome/help/glabels/cs/figures/merge-ex1-2.png
-share/gnome/help/glabels/cs/figures/merge-ex1-3.png
-share/gnome/help/glabels/cs/figures/merge-ex1-4.png
-share/gnome/help/glabels/cs/figures/merge-ex2-1.png
-share/gnome/help/glabels/cs/figures/merge-ex2-2.png
-share/gnome/help/glabels/cs/figures/merge-ex2-3.png
-share/gnome/help/glabels/cs/figures/merge-ex2-4.png
-share/gnome/help/glabels/cs/figures/merge-ex3-1.png
-share/gnome/help/glabels/cs/figures/merge-ex3-2.png
-share/gnome/help/glabels/cs/figures/object-editor-sidebar.png
-share/gnome/help/glabels/cs/figures/print-copies.png
-share/gnome/help/glabels/cs/figures/print-merge.png
-share/gnome/help/glabels/cs/glabels.xml
-share/gnome/help/glabels/de/figures/glabels-template-cd.png
-share/gnome/help/glabels/de/figures/glabels-template-label.png
-share/gnome/help/glabels/de/figures/glabels-template-layout.png
-share/gnome/help/glabels/de/figures/main-window-empty.png
-share/gnome/help/glabels/de/figures/merge-ex1-1.png
-share/gnome/help/glabels/de/figures/merge-ex1-2.png
-share/gnome/help/glabels/de/figures/merge-ex1-3.png
-share/gnome/help/glabels/de/figures/merge-ex1-4.png
-share/gnome/help/glabels/de/figures/merge-ex2-1.png
-share/gnome/help/glabels/de/figures/merge-ex2-2.png
-share/gnome/help/glabels/de/figures/merge-ex2-3.png
-share/gnome/help/glabels/de/figures/merge-ex2-4.png
-share/gnome/help/glabels/de/figures/merge-ex3-1.png
-share/gnome/help/glabels/de/figures/merge-ex3-2.png
-share/gnome/help/glabels/de/figures/object-editor-sidebar.png
-share/gnome/help/glabels/de/figures/print-copies.png
-share/gnome/help/glabels/de/figures/print-merge.png
-share/gnome/help/glabels/de/glabels.xml
-share/gnome/help/glabels/es/figures/glabels-template-cd.png
-share/gnome/help/glabels/es/figures/glabels-template-label.png
-share/gnome/help/glabels/es/figures/glabels-template-layout.png
-share/gnome/help/glabels/es/figures/main-window-empty.png
-share/gnome/help/glabels/es/figures/merge-ex1-1.png
-share/gnome/help/glabels/es/figures/merge-ex1-2.png
-share/gnome/help/glabels/es/figures/merge-ex1-3.png
-share/gnome/help/glabels/es/figures/merge-ex1-4.png
-share/gnome/help/glabels/es/figures/merge-ex2-1.png
-share/gnome/help/glabels/es/figures/merge-ex2-2.png
-share/gnome/help/glabels/es/figures/merge-ex2-3.png
-share/gnome/help/glabels/es/figures/merge-ex2-4.png
-share/gnome/help/glabels/es/figures/merge-ex3-1.png
-share/gnome/help/glabels/es/figures/merge-ex3-2.png
-share/gnome/help/glabels/es/figures/object-editor-sidebar.png
-share/gnome/help/glabels/es/figures/print-copies.png
-share/gnome/help/glabels/es/figures/print-merge.png
-share/gnome/help/glabels/es/glabels.xml
-share/gnome/help/glabels/fr/figures/glabels-template-cd.png
-share/gnome/help/glabels/fr/figures/glabels-template-label.png
-share/gnome/help/glabels/fr/figures/glabels-template-layout.png
-share/gnome/help/glabels/fr/figures/main-window-empty.png
-share/gnome/help/glabels/fr/figures/merge-ex1-1.png
-share/gnome/help/glabels/fr/figures/merge-ex1-2.png
-share/gnome/help/glabels/fr/figures/merge-ex1-3.png
-share/gnome/help/glabels/fr/figures/merge-ex1-4.png
-share/gnome/help/glabels/fr/figures/merge-ex2-1.png
-share/gnome/help/glabels/fr/figures/merge-ex2-2.png
-share/gnome/help/glabels/fr/figures/merge-ex2-3.png
-share/gnome/help/glabels/fr/figures/merge-ex2-4.png
-share/gnome/help/glabels/fr/figures/merge-ex3-1.png
-share/gnome/help/glabels/fr/figures/merge-ex3-2.png
-share/gnome/help/glabels/fr/figures/object-editor-sidebar.png
-share/gnome/help/glabels/fr/figures/print-copies.png
-share/gnome/help/glabels/fr/figures/print-merge.png
-share/gnome/help/glabels/fr/glabels.xml
-share/locale/ca/LC_MESSAGES/glabels.mo
-share/locale/cs/LC_MESSAGES/glabels.mo
-share/locale/da/LC_MESSAGES/glabels.mo
-share/locale/de/LC_MESSAGES/glabels.mo
-share/locale/eo/LC_MESSAGES/glabels.mo
-share/locale/es/LC_MESSAGES/glabels.mo
-share/locale/fr/LC_MESSAGES/glabels.mo
-share/locale/it/LC_MESSAGES/glabels.mo
-share/locale/ja/LC_MESSAGES/glabels.mo
-share/locale/ko/LC_MESSAGES/glabels.mo
-share/locale/nb/LC_MESSAGES/glabels.mo
-share/locale/pl/LC_MESSAGES/glabels.mo
-share/locale/pt/LC_MESSAGES/glabels.mo
-share/locale/pt_BR/LC_MESSAGES/glabels.mo
-share/locale/ru/LC_MESSAGES/glabels.mo
-share/locale/sl/LC_MESSAGES/glabels.mo
-share/locale/sv/LC_MESSAGES/glabels.mo
-share/locale/zh_CN/LC_MESSAGES/glabels.mo
-share/locale/zh_TW/LC_MESSAGES/glabels.mo
-share/mime-info/glabels.keys
-share/mime-info/glabels.mime
-share/mime/packages/glabels.xml
-share/omf/glabels/glabels-C.omf
-share/omf/glabels/glabels-cs.omf
-share/omf/glabels/glabels-de.omf
-share/omf/glabels/glabels-es.omf
-share/omf/glabels/glabels-fr.omf
-share/pixmaps/glabels-application-x-glabels.png
-share/pixmaps/glabels.png
-share/pixmaps/glabels/ex-1layout.png
-share/pixmaps/glabels/ex-2layouts.png
-share/pixmaps/glabels/ex-cd-size.png
-share/pixmaps/glabels/ex-rect-size.png
-share/pixmaps/glabels/ex-round-size.png
-share/pixmaps/glabels/glabels-about-logo.png
-share/pixmaps/glabels/glabels-splash.png
+bin/glabels-3
+bin/glabels-3-batch
+include/libglabels-3.0/libglabels.h
+include/libglabels-3.0/libglabels/lgl-category.h
+include/libglabels-3.0/libglabels/lgl-db.h
+include/libglabels-3.0/libglabels/lgl-paper.h
+include/libglabels-3.0/libglabels/lgl-str.h
+include/libglabels-3.0/libglabels/lgl-template.h
+include/libglabels-3.0/libglabels/lgl-units.h
+include/libglabels-3.0/libglabels/lgl-xml-category.h
+include/libglabels-3.0/libglabels/lgl-xml-paper.h
+include/libglabels-3.0/libglabels/lgl-xml-template.h
+include/libglabels-3.0/libglabels/lgl-xml.h
+include/libglbarcode-3.0/libglbarcode.h
+include/libglbarcode-3.0/libglbarcode/lgl-barcode-code39.h
+include/libglbarcode-3.0/libglbarcode/lgl-barcode-create.h
+include/libglbarcode-3.0/libglbarcode/lgl-barcode-onecode.h
+include/libglbarcode-3.0/libglbarcode/lgl-barcode-postnet.h
+include/libglbarcode-3.0/libglbarcode/lgl-barcode-render-to-cairo.h
+include/libglbarcode-3.0/libglbarcode/lgl-barcode-type.h
+include/libglbarcode-3.0/libglbarcode/lgl-barcode.h
+lib/libglabels-3.0.a
+lib/libglabels-3.0.so
+lib/libglabels-3.0.so.8
+lib/libglabels-3.0.so.8.0.0
+lib/libglbarcode-3.0.a
+lib/libglbarcode-3.0.so
+lib/libglbarcode-3.0.so.0
+lib/libglbarcode-3.0.so.0.0.0
+libdata/pkgconfig/libglabels-3.0.pc
+libdata/pkgconfig/libglbarcode-3.0.pc
+man/man1/glabels-3-batch.1.gz
+man/man1/glabels-3.1.gz
+share/appdata/glabels-3.appdata.xml
+share/applications/glabels-3.0.desktop
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-align-bottom.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-align-hcenter.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-align-left.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-align-right.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-align-top.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-align-vcenter.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-arrow.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-barcode.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-box.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-bucket-fill.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-center-horiz.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-center-vert.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-ellipse.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-flip-horiz.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-flip-vert.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-image.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-line.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-merge.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-object-properties.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-order-bottom.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-order-top.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-pencil.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-rotate-left.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-rotate-right.png
+%%DATADIR%%-3.0/icons/hicolor/16x16/actions/glabels-text.png
+%%DATADIR%%-3.0/icons/hicolor/22x22/actions/glabels-align-text-bottom.png
+%%DATADIR%%-3.0/icons/hicolor/22x22/actions/glabels-align-text-middle.png
+%%DATADIR%%-3.0/icons/hicolor/22x22/actions/glabels-align-text-top.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-align-text-bottom.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-align-text-middle.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-align-text-top.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-arrow.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-barcode.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-box.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-bucket-fill.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-ellipse.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-hchain-broken.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-hchain.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-image.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-line.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-merge.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-object-properties.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-pencil.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-text.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-vchain-broken.png
+%%DATADIR%%-3.0/icons/hicolor/24x24/actions/glabels-vchain.png
+%%DATADIR%%-3.0/pixmaps/ex-1layout.png
+%%DATADIR%%-3.0/pixmaps/ex-2layouts.png
+%%DATADIR%%-3.0/pixmaps/ex-cd-size.png
+%%DATADIR%%-3.0/pixmaps/ex-ellipse-size.png
+%%DATADIR%%-3.0/pixmaps/ex-rect-size.png
+%%DATADIR%%-3.0/pixmaps/ex-round-size.png
+%%DATADIR%%-3.0/pixmaps/glabels-logo.png
+%%DATADIR%%-3.0/pixmaps/new-confirm.png
+%%DATADIR%%-3.0/pixmaps/new-rotate.png
+%%DATADIR%%-3.0/pixmaps/new-select.png
+%%DATADIR%%-3.0/pixmaps/template-designer.png
+%%DATADIR%%-3.0/ui/label-properties-dialog.ui
+%%DATADIR%%-3.0/ui/media-select.ui
+%%DATADIR%%-3.0/ui/merge-properties-dialog.ui
+%%DATADIR%%-3.0/ui/new-label-dialog.ui
+%%DATADIR%%-3.0/ui/object-editor.ui
+%%DATADIR%%-3.0/ui/prefs-dialog.ui
+%%DATADIR%%-3.0/ui/print-op-dialog-custom-widget.ui
+%%DATADIR%%-3.0/ui/property-bar.ui
+%%DATADIR%%-3.0/ui/template-designer.ui
+share/gtk-doc/html/libglabels-3.0/ch01.html
+share/gtk-doc/html/libglabels-3.0/ch02.html
+share/gtk-doc/html/libglabels-3.0/ch03.html
+share/gtk-doc/html/libglabels-3.0/home.png
+share/gtk-doc/html/libglabels-3.0/index.html
+share/gtk-doc/html/libglabels-3.0/left-insensitive.png
+share/gtk-doc/html/libglabels-3.0/left.png
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-category.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-db.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-paper.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-str.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-template.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-units.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-vendor.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-xml-category.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-xml-paper.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-xml-template.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-xml-vendor.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0-xml.html
+share/gtk-doc/html/libglabels-3.0/libglabels-3.0.devhelp2
+share/gtk-doc/html/libglabels-3.0/right-insensitive.png
+share/gtk-doc/html/libglabels-3.0/right.png
+share/gtk-doc/html/libglabels-3.0/style.css
+share/gtk-doc/html/libglabels-3.0/up-insensitive.png
+share/gtk-doc/html/libglabels-3.0/up.png
+share/gtk-doc/html/libglbarcode-3.0/api.html
+share/gtk-doc/html/libglbarcode-3.0/home.png
+share/gtk-doc/html/libglbarcode-3.0/index.html
+share/gtk-doc/html/libglbarcode-3.0/left-insensitive.png
+share/gtk-doc/html/libglbarcode-3.0/left.png
+share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html
+share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html
+share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html
+share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html
+share/gtk-doc/html/libglbarcode-3.0/libglbarcode-3.0.devhelp2
+share/gtk-doc/html/libglbarcode-3.0/libglbarcode-intro.html
+share/gtk-doc/html/libglbarcode-3.0/overview.html
+share/gtk-doc/html/libglbarcode-3.0/right-insensitive.png
+share/gtk-doc/html/libglbarcode-3.0/right.png
+share/gtk-doc/html/libglbarcode-3.0/style.css
+share/gtk-doc/html/libglbarcode-3.0/up-insensitive.png
+share/gtk-doc/html/libglbarcode-3.0/up.png
+share/help/C/glabels-3.0/about.page
+share/help/C/glabels-3.0/basicusage.page
+share/help/C/glabels-3.0/createnew.page
+share/help/C/glabels-3.0/customize.page
+share/help/C/glabels-3.0/customtemplate.page
+share/help/C/glabels-3.0/editprop.page
+share/help/C/glabels-3.0/figures/glabels-logo.png
+share/help/C/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/C/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/C/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/C/glabels-3.0/figures/glabels-template-layout.png
+share/help/C/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/C/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/C/glabels-3.0/figures/merge-ex1-1.png
+share/help/C/glabels-3.0/figures/merge-ex1-2.png
+share/help/C/glabels-3.0/figures/merge-ex1-3.png
+share/help/C/glabels-3.0/figures/merge-ex1-4.png
+share/help/C/glabels-3.0/figures/merge-ex2-1.png
+share/help/C/glabels-3.0/figures/merge-ex2-2.png
+share/help/C/glabels-3.0/figures/merge-ex2-3.png
+share/help/C/glabels-3.0/figures/merge-ex2-4.png
+share/help/C/glabels-3.0/figures/object-editor-sidebar.png
+share/help/C/glabels-3.0/figures/print-copies.png
+share/help/C/glabels-3.0/figures/print-merge.png
+share/help/C/glabels-3.0/figures/skip-fields-output.png
+share/help/C/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/C/glabels-3.0/index.page
+share/help/C/glabels-3.0/labelprop.page
+share/help/C/glabels-3.0/license.page
+share/help/C/glabels-3.0/mancreate.page
+share/help/C/glabels-3.0/merge-ex1.page
+share/help/C/glabels-3.0/merge-ex2.page
+share/help/C/glabels-3.0/merge-ex3.page
+share/help/C/glabels-3.0/merge-ex4.page
+share/help/C/glabels-3.0/merge.page
+share/help/C/glabels-3.0/mergefeatures.page
+share/help/C/glabels-3.0/multifile.page
+share/help/C/glabels-3.0/newlabel.page
+share/help/C/glabels-3.0/printfile.page
+share/help/C/glabels-3.0/select.page
+share/help/C/glabels-3.0/skipfields.page
+share/help/cs/glabels-3.0/about.page
+share/help/cs/glabels-3.0/basicusage.page
+share/help/cs/glabels-3.0/createnew.page
+share/help/cs/glabels-3.0/customize.page
+share/help/cs/glabels-3.0/customtemplate.page
+share/help/cs/glabels-3.0/editprop.page
+share/help/cs/glabels-3.0/figures/glabels-logo.png
+share/help/cs/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/cs/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/cs/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/cs/glabels-3.0/figures/glabels-template-layout.png
+share/help/cs/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/cs/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/cs/glabels-3.0/figures/merge-ex1-1.png
+share/help/cs/glabels-3.0/figures/merge-ex1-2.png
+share/help/cs/glabels-3.0/figures/merge-ex1-3.png
+share/help/cs/glabels-3.0/figures/merge-ex1-4.png
+share/help/cs/glabels-3.0/figures/merge-ex2-1.png
+share/help/cs/glabels-3.0/figures/merge-ex2-2.png
+share/help/cs/glabels-3.0/figures/merge-ex2-3.png
+share/help/cs/glabels-3.0/figures/merge-ex2-4.png
+share/help/cs/glabels-3.0/figures/object-editor-sidebar.png
+share/help/cs/glabels-3.0/figures/print-copies.png
+share/help/cs/glabels-3.0/figures/print-merge.png
+share/help/cs/glabels-3.0/figures/skip-fields-output.png
+share/help/cs/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/cs/glabels-3.0/index.page
+share/help/cs/glabels-3.0/labelprop.page
+share/help/cs/glabels-3.0/license.page
+share/help/cs/glabels-3.0/mancreate.page
+share/help/cs/glabels-3.0/merge-ex1.page
+share/help/cs/glabels-3.0/merge-ex2.page
+share/help/cs/glabels-3.0/merge-ex3.page
+share/help/cs/glabels-3.0/merge-ex4.page
+share/help/cs/glabels-3.0/merge.page
+share/help/cs/glabels-3.0/mergefeatures.page
+share/help/cs/glabels-3.0/multifile.page
+share/help/cs/glabels-3.0/newlabel.page
+share/help/cs/glabels-3.0/printfile.page
+share/help/cs/glabels-3.0/select.page
+share/help/cs/glabels-3.0/skipfields.page
+share/help/de/glabels-3.0/about.page
+share/help/de/glabels-3.0/basicusage.page
+share/help/de/glabels-3.0/createnew.page
+share/help/de/glabels-3.0/customize.page
+share/help/de/glabels-3.0/customtemplate.page
+share/help/de/glabels-3.0/editprop.page
+share/help/de/glabels-3.0/figures/glabels-logo.png
+share/help/de/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/de/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/de/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/de/glabels-3.0/figures/glabels-template-layout.png
+share/help/de/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/de/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/de/glabels-3.0/figures/merge-ex1-1.png
+share/help/de/glabels-3.0/figures/merge-ex1-2.png
+share/help/de/glabels-3.0/figures/merge-ex1-3.png
+share/help/de/glabels-3.0/figures/merge-ex1-4.png
+share/help/de/glabels-3.0/figures/merge-ex2-1.png
+share/help/de/glabels-3.0/figures/merge-ex2-2.png
+share/help/de/glabels-3.0/figures/merge-ex2-3.png
+share/help/de/glabels-3.0/figures/merge-ex2-4.png
+share/help/de/glabels-3.0/figures/object-editor-sidebar.png
+share/help/de/glabels-3.0/figures/print-copies.png
+share/help/de/glabels-3.0/figures/print-merge.png
+share/help/de/glabels-3.0/figures/skip-fields-output.png
+share/help/de/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/de/glabels-3.0/index.page
+share/help/de/glabels-3.0/labelprop.page
+share/help/de/glabels-3.0/license.page
+share/help/de/glabels-3.0/mancreate.page
+share/help/de/glabels-3.0/merge-ex1.page
+share/help/de/glabels-3.0/merge-ex2.page
+share/help/de/glabels-3.0/merge-ex3.page
+share/help/de/glabels-3.0/merge-ex4.page
+share/help/de/glabels-3.0/merge.page
+share/help/de/glabels-3.0/mergefeatures.page
+share/help/de/glabels-3.0/multifile.page
+share/help/de/glabels-3.0/newlabel.page
+share/help/de/glabels-3.0/printfile.page
+share/help/de/glabels-3.0/select.page
+share/help/de/glabels-3.0/skipfields.page
+share/help/el/glabels-3.0/about.page
+share/help/el/glabels-3.0/basicusage.page
+share/help/el/glabels-3.0/createnew.page
+share/help/el/glabels-3.0/customize.page
+share/help/el/glabels-3.0/customtemplate.page
+share/help/el/glabels-3.0/editprop.page
+share/help/el/glabels-3.0/figures/glabels-logo.png
+share/help/el/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/el/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/el/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/el/glabels-3.0/figures/glabels-template-layout.png
+share/help/el/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/el/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/el/glabels-3.0/figures/merge-ex1-1.png
+share/help/el/glabels-3.0/figures/merge-ex1-2.png
+share/help/el/glabels-3.0/figures/merge-ex1-3.png
+share/help/el/glabels-3.0/figures/merge-ex1-4.png
+share/help/el/glabels-3.0/figures/merge-ex2-1.png
+share/help/el/glabels-3.0/figures/merge-ex2-2.png
+share/help/el/glabels-3.0/figures/merge-ex2-3.png
+share/help/el/glabels-3.0/figures/merge-ex2-4.png
+share/help/el/glabels-3.0/figures/object-editor-sidebar.png
+share/help/el/glabels-3.0/figures/print-copies.png
+share/help/el/glabels-3.0/figures/print-merge.png
+share/help/el/glabels-3.0/figures/skip-fields-output.png
+share/help/el/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/el/glabels-3.0/index.page
+share/help/el/glabels-3.0/labelprop.page
+share/help/el/glabels-3.0/license.page
+share/help/el/glabels-3.0/mancreate.page
+share/help/el/glabels-3.0/merge-ex1.page
+share/help/el/glabels-3.0/merge-ex2.page
+share/help/el/glabels-3.0/merge-ex3.page
+share/help/el/glabels-3.0/merge-ex4.page
+share/help/el/glabels-3.0/merge.page
+share/help/el/glabels-3.0/mergefeatures.page
+share/help/el/glabels-3.0/multifile.page
+share/help/el/glabels-3.0/newlabel.page
+share/help/el/glabels-3.0/printfile.page
+share/help/el/glabels-3.0/select.page
+share/help/el/glabels-3.0/skipfields.page
+share/help/es/glabels-3.0/about.page
+share/help/es/glabels-3.0/basicusage.page
+share/help/es/glabels-3.0/createnew.page
+share/help/es/glabels-3.0/customize.page
+share/help/es/glabels-3.0/customtemplate.page
+share/help/es/glabels-3.0/editprop.page
+share/help/es/glabels-3.0/figures/glabels-logo.png
+share/help/es/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/es/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/es/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/es/glabels-3.0/figures/glabels-template-layout.png
+share/help/es/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/es/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/es/glabels-3.0/figures/merge-ex1-1.png
+share/help/es/glabels-3.0/figures/merge-ex1-2.png
+share/help/es/glabels-3.0/figures/merge-ex1-3.png
+share/help/es/glabels-3.0/figures/merge-ex1-4.png
+share/help/es/glabels-3.0/figures/merge-ex2-1.png
+share/help/es/glabels-3.0/figures/merge-ex2-2.png
+share/help/es/glabels-3.0/figures/merge-ex2-3.png
+share/help/es/glabels-3.0/figures/merge-ex2-4.png
+share/help/es/glabels-3.0/figures/object-editor-sidebar.png
+share/help/es/glabels-3.0/figures/print-copies.png
+share/help/es/glabels-3.0/figures/print-merge.png
+share/help/es/glabels-3.0/figures/skip-fields-output.png
+share/help/es/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/es/glabels-3.0/index.page
+share/help/es/glabels-3.0/labelprop.page
+share/help/es/glabels-3.0/license.page
+share/help/es/glabels-3.0/mancreate.page
+share/help/es/glabels-3.0/merge-ex1.page
+share/help/es/glabels-3.0/merge-ex2.page
+share/help/es/glabels-3.0/merge-ex3.page
+share/help/es/glabels-3.0/merge-ex4.page
+share/help/es/glabels-3.0/merge.page
+share/help/es/glabels-3.0/mergefeatures.page
+share/help/es/glabels-3.0/multifile.page
+share/help/es/glabels-3.0/newlabel.page
+share/help/es/glabels-3.0/printfile.page
+share/help/es/glabels-3.0/select.page
+share/help/es/glabels-3.0/skipfields.page
+share/help/fr/glabels-3.0/about.page
+share/help/fr/glabels-3.0/basicusage.page
+share/help/fr/glabels-3.0/createnew.page
+share/help/fr/glabels-3.0/customize.page
+share/help/fr/glabels-3.0/customtemplate.page
+share/help/fr/glabels-3.0/editprop.page
+share/help/fr/glabels-3.0/figures/glabels-logo.png
+share/help/fr/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/fr/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/fr/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/fr/glabels-3.0/figures/glabels-template-layout.png
+share/help/fr/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/fr/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/fr/glabels-3.0/figures/merge-ex1-1.png
+share/help/fr/glabels-3.0/figures/merge-ex1-2.png
+share/help/fr/glabels-3.0/figures/merge-ex1-3.png
+share/help/fr/glabels-3.0/figures/merge-ex1-4.png
+share/help/fr/glabels-3.0/figures/merge-ex2-1.png
+share/help/fr/glabels-3.0/figures/merge-ex2-2.png
+share/help/fr/glabels-3.0/figures/merge-ex2-3.png
+share/help/fr/glabels-3.0/figures/merge-ex2-4.png
+share/help/fr/glabels-3.0/figures/object-editor-sidebar.png
+share/help/fr/glabels-3.0/figures/print-copies.png
+share/help/fr/glabels-3.0/figures/print-merge.png
+share/help/fr/glabels-3.0/figures/skip-fields-output.png
+share/help/fr/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/fr/glabels-3.0/index.page
+share/help/fr/glabels-3.0/labelprop.page
+share/help/fr/glabels-3.0/license.page
+share/help/fr/glabels-3.0/mancreate.page
+share/help/fr/glabels-3.0/merge-ex1.page
+share/help/fr/glabels-3.0/merge-ex2.page
+share/help/fr/glabels-3.0/merge-ex3.page
+share/help/fr/glabels-3.0/merge-ex4.page
+share/help/fr/glabels-3.0/merge.page
+share/help/fr/glabels-3.0/mergefeatures.page
+share/help/fr/glabels-3.0/multifile.page
+share/help/fr/glabels-3.0/newlabel.page
+share/help/fr/glabels-3.0/printfile.page
+share/help/fr/glabels-3.0/select.page
+share/help/fr/glabels-3.0/skipfields.page
+share/help/id/glabels-3.0/about.page
+share/help/id/glabels-3.0/basicusage.page
+share/help/id/glabels-3.0/createnew.page
+share/help/id/glabels-3.0/customize.page
+share/help/id/glabels-3.0/customtemplate.page
+share/help/id/glabels-3.0/editprop.page
+share/help/id/glabels-3.0/figures/glabels-logo.png
+share/help/id/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/id/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/id/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/id/glabels-3.0/figures/glabels-template-layout.png
+share/help/id/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/id/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/id/glabels-3.0/figures/merge-ex1-1.png
+share/help/id/glabels-3.0/figures/merge-ex1-2.png
+share/help/id/glabels-3.0/figures/merge-ex1-3.png
+share/help/id/glabels-3.0/figures/merge-ex1-4.png
+share/help/id/glabels-3.0/figures/merge-ex2-1.png
+share/help/id/glabels-3.0/figures/merge-ex2-2.png
+share/help/id/glabels-3.0/figures/merge-ex2-3.png
+share/help/id/glabels-3.0/figures/merge-ex2-4.png
+share/help/id/glabels-3.0/figures/object-editor-sidebar.png
+share/help/id/glabels-3.0/figures/print-copies.png
+share/help/id/glabels-3.0/figures/print-merge.png
+share/help/id/glabels-3.0/figures/skip-fields-output.png
+share/help/id/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/id/glabels-3.0/index.page
+share/help/id/glabels-3.0/labelprop.page
+share/help/id/glabels-3.0/license.page
+share/help/id/glabels-3.0/mancreate.page
+share/help/id/glabels-3.0/merge-ex1.page
+share/help/id/glabels-3.0/merge-ex2.page
+share/help/id/glabels-3.0/merge-ex3.page
+share/help/id/glabels-3.0/merge-ex4.page
+share/help/id/glabels-3.0/merge.page
+share/help/id/glabels-3.0/mergefeatures.page
+share/help/id/glabels-3.0/multifile.page
+share/help/id/glabels-3.0/newlabel.page
+share/help/id/glabels-3.0/printfile.page
+share/help/id/glabels-3.0/select.page
+share/help/id/glabels-3.0/skipfields.page
+share/help/nl/glabels-3.0/about.page
+share/help/nl/glabels-3.0/basicusage.page
+share/help/nl/glabels-3.0/createnew.page
+share/help/nl/glabels-3.0/customize.page
+share/help/nl/glabels-3.0/customtemplate.page
+share/help/nl/glabels-3.0/editprop.page
+share/help/nl/glabels-3.0/figures/glabels-logo.png
+share/help/nl/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/nl/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/nl/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/nl/glabels-3.0/figures/glabels-template-layout.png
+share/help/nl/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/nl/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/nl/glabels-3.0/figures/merge-ex1-1.png
+share/help/nl/glabels-3.0/figures/merge-ex1-2.png
+share/help/nl/glabels-3.0/figures/merge-ex1-3.png
+share/help/nl/glabels-3.0/figures/merge-ex1-4.png
+share/help/nl/glabels-3.0/figures/merge-ex2-1.png
+share/help/nl/glabels-3.0/figures/merge-ex2-2.png
+share/help/nl/glabels-3.0/figures/merge-ex2-3.png
+share/help/nl/glabels-3.0/figures/merge-ex2-4.png
+share/help/nl/glabels-3.0/figures/object-editor-sidebar.png
+share/help/nl/glabels-3.0/figures/print-copies.png
+share/help/nl/glabels-3.0/figures/print-merge.png
+share/help/nl/glabels-3.0/figures/skip-fields-output.png
+share/help/nl/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/nl/glabels-3.0/index.page
+share/help/nl/glabels-3.0/labelprop.page
+share/help/nl/glabels-3.0/license.page
+share/help/nl/glabels-3.0/mancreate.page
+share/help/nl/glabels-3.0/merge-ex1.page
+share/help/nl/glabels-3.0/merge-ex2.page
+share/help/nl/glabels-3.0/merge-ex3.page
+share/help/nl/glabels-3.0/merge-ex4.page
+share/help/nl/glabels-3.0/merge.page
+share/help/nl/glabels-3.0/mergefeatures.page
+share/help/nl/glabels-3.0/multifile.page
+share/help/nl/glabels-3.0/newlabel.page
+share/help/nl/glabels-3.0/printfile.page
+share/help/nl/glabels-3.0/select.page
+share/help/nl/glabels-3.0/skipfields.page
+share/help/pt_BR/glabels-3.0/about.page
+share/help/pt_BR/glabels-3.0/basicusage.page
+share/help/pt_BR/glabels-3.0/createnew.page
+share/help/pt_BR/glabels-3.0/customize.page
+share/help/pt_BR/glabels-3.0/customtemplate.page
+share/help/pt_BR/glabels-3.0/editprop.page
+share/help/pt_BR/glabels-3.0/figures/glabels-logo.png
+share/help/pt_BR/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/pt_BR/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/pt_BR/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/pt_BR/glabels-3.0/figures/glabels-template-layout.png
+share/help/pt_BR/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/pt_BR/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/pt_BR/glabels-3.0/figures/merge-ex1-1.png
+share/help/pt_BR/glabels-3.0/figures/merge-ex1-2.png
+share/help/pt_BR/glabels-3.0/figures/merge-ex1-3.png
+share/help/pt_BR/glabels-3.0/figures/merge-ex1-4.png
+share/help/pt_BR/glabels-3.0/figures/merge-ex2-1.png
+share/help/pt_BR/glabels-3.0/figures/merge-ex2-2.png
+share/help/pt_BR/glabels-3.0/figures/merge-ex2-3.png
+share/help/pt_BR/glabels-3.0/figures/merge-ex2-4.png
+share/help/pt_BR/glabels-3.0/figures/object-editor-sidebar.png
+share/help/pt_BR/glabels-3.0/figures/print-copies.png
+share/help/pt_BR/glabels-3.0/figures/print-merge.png
+share/help/pt_BR/glabels-3.0/figures/skip-fields-output.png
+share/help/pt_BR/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/pt_BR/glabels-3.0/index.page
+share/help/pt_BR/glabels-3.0/labelprop.page
+share/help/pt_BR/glabels-3.0/license.page
+share/help/pt_BR/glabels-3.0/mancreate.page
+share/help/pt_BR/glabels-3.0/merge-ex1.page
+share/help/pt_BR/glabels-3.0/merge-ex2.page
+share/help/pt_BR/glabels-3.0/merge-ex3.page
+share/help/pt_BR/glabels-3.0/merge-ex4.page
+share/help/pt_BR/glabels-3.0/merge.page
+share/help/pt_BR/glabels-3.0/mergefeatures.page
+share/help/pt_BR/glabels-3.0/multifile.page
+share/help/pt_BR/glabels-3.0/newlabel.page
+share/help/pt_BR/glabels-3.0/printfile.page
+share/help/pt_BR/glabels-3.0/select.page
+share/help/pt_BR/glabels-3.0/skipfields.page
+share/help/ru/glabels-3.0/about.page
+share/help/ru/glabels-3.0/basicusage.page
+share/help/ru/glabels-3.0/createnew.page
+share/help/ru/glabels-3.0/customize.page
+share/help/ru/glabels-3.0/customtemplate.page
+share/help/ru/glabels-3.0/editprop.page
+share/help/ru/glabels-3.0/figures/glabels-logo.png
+share/help/ru/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/ru/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/ru/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/ru/glabels-3.0/figures/glabels-template-layout.png
+share/help/ru/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/ru/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/ru/glabels-3.0/figures/merge-ex1-1.png
+share/help/ru/glabels-3.0/figures/merge-ex1-2.png
+share/help/ru/glabels-3.0/figures/merge-ex1-3.png
+share/help/ru/glabels-3.0/figures/merge-ex1-4.png
+share/help/ru/glabels-3.0/figures/merge-ex2-1.png
+share/help/ru/glabels-3.0/figures/merge-ex2-2.png
+share/help/ru/glabels-3.0/figures/merge-ex2-3.png
+share/help/ru/glabels-3.0/figures/merge-ex2-4.png
+share/help/ru/glabels-3.0/figures/object-editor-sidebar.png
+share/help/ru/glabels-3.0/figures/print-copies.png
+share/help/ru/glabels-3.0/figures/print-merge.png
+share/help/ru/glabels-3.0/figures/skip-fields-output.png
+share/help/ru/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/ru/glabels-3.0/index.page
+share/help/ru/glabels-3.0/labelprop.page
+share/help/ru/glabels-3.0/license.page
+share/help/ru/glabels-3.0/mancreate.page
+share/help/ru/glabels-3.0/merge-ex1.page
+share/help/ru/glabels-3.0/merge-ex2.page
+share/help/ru/glabels-3.0/merge-ex3.page
+share/help/ru/glabels-3.0/merge-ex4.page
+share/help/ru/glabels-3.0/merge.page
+share/help/ru/glabels-3.0/mergefeatures.page
+share/help/ru/glabels-3.0/multifile.page
+share/help/ru/glabels-3.0/newlabel.page
+share/help/ru/glabels-3.0/printfile.page
+share/help/ru/glabels-3.0/select.page
+share/help/ru/glabels-3.0/skipfields.page
+share/help/sl/glabels-3.0/about.page
+share/help/sl/glabels-3.0/basicusage.page
+share/help/sl/glabels-3.0/createnew.page
+share/help/sl/glabels-3.0/customize.page
+share/help/sl/glabels-3.0/customtemplate.page
+share/help/sl/glabels-3.0/editprop.page
+share/help/sl/glabels-3.0/figures/glabels-logo.png
+share/help/sl/glabels-3.0/figures/glabels-template-cd-label.png
+share/help/sl/glabels-3.0/figures/glabels-template-circle-label.png
+share/help/sl/glabels-3.0/figures/glabels-template-ellipse-label.png
+share/help/sl/glabels-3.0/figures/glabels-template-layout.png
+share/help/sl/glabels-3.0/figures/glabels-template-rect-label.png
+share/help/sl/glabels-3.0/figures/introduction-glabels-main-window.png
+share/help/sl/glabels-3.0/figures/merge-ex1-1.png
+share/help/sl/glabels-3.0/figures/merge-ex1-2.png
+share/help/sl/glabels-3.0/figures/merge-ex1-3.png
+share/help/sl/glabels-3.0/figures/merge-ex1-4.png
+share/help/sl/glabels-3.0/figures/merge-ex2-1.png
+share/help/sl/glabels-3.0/figures/merge-ex2-2.png
+share/help/sl/glabels-3.0/figures/merge-ex2-3.png
+share/help/sl/glabels-3.0/figures/merge-ex2-4.png
+share/help/sl/glabels-3.0/figures/object-editor-sidebar.png
+share/help/sl/glabels-3.0/figures/print-copies.png
+share/help/sl/glabels-3.0/figures/print-merge.png
+share/help/sl/glabels-3.0/figures/skip-fields-output.png
+share/help/sl/glabels-3.0/figures/skip-fields-screenshot.png
+share/help/sl/glabels-3.0/index.page
+share/help/sl/glabels-3.0/labelprop.page
+share/help/sl/glabels-3.0/license.page
+share/help/sl/glabels-3.0/mancreate.page
+share/help/sl/glabels-3.0/merge-ex1.page
+share/help/sl/glabels-3.0/merge-ex2.page
+share/help/sl/glabels-3.0/merge-ex3.page
+share/help/sl/glabels-3.0/merge-ex4.page
+share/help/sl/glabels-3.0/merge.page
+share/help/sl/glabels-3.0/mergefeatures.page
+share/help/sl/glabels-3.0/multifile.page
+share/help/sl/glabels-3.0/newlabel.page
+share/help/sl/glabels-3.0/printfile.page
+share/help/sl/glabels-3.0/select.page
+share/help/sl/glabels-3.0/skipfields.page
+share/icons/hicolor/16x16/apps/glabels-3.0.png
+share/icons/hicolor/22x22/apps/glabels-3.0.png
+share/icons/hicolor/24x24/apps/glabels-3.0.png
+share/icons/hicolor/32x32/apps/glabels-3.0.png
+share/icons/hicolor/48x48/apps/glabels-3.0.png
+share/icons/hicolor/48x48/mimetypes/application-x-glabels.png
+share/icons/hicolor/scalable/apps/glabels-3.0.svg
+share/icons/hicolor/scalable/mimetypes/application-x-glabels.svg
+share/libglabels-3.0/dtd/glabels-3.0.dtd
+share/libglabels-3.0/templates/ascom-iso-templates.xml
+share/libglabels-3.0/templates/avery-iso-templates.xml
+share/libglabels-3.0/templates/avery-other-templates.xml
+share/libglabels-3.0/templates/avery-us-templates.xml
+share/libglabels-3.0/templates/begalabel-templates.xml
+share/libglabels-3.0/templates/brother-other-templates.xml
+share/libglabels-3.0/templates/cablelabel-templates.xml
+share/libglabels-3.0/templates/canon-other-templates.xml
+share/libglabels-3.0/templates/categories.xml
+share/libglabels-3.0/templates/databecker-iso-templates.xml
+share/libglabels-3.0/templates/dataline-iso-templates.xml
+share/libglabels-3.0/templates/decadry-iso-templates.xml
+share/libglabels-3.0/templates/desmat-templates.xml
+share/libglabels-3.0/templates/dymo-other-templates.xml
+share/libglabels-3.0/templates/endisch-templates.xml
+share/libglabels-3.0/templates/felga-templates.xml
+share/libglabels-3.0/templates/geha-iso-templates.xml
+share/libglabels-3.0/templates/hama-iso-templates.xml
+share/libglabels-3.0/templates/herma-iso-templates.xml
+share/libglabels-3.0/templates/hisago-templates.xml
+share/libglabels-3.0/templates/igepa-templates.xml
+share/libglabels-3.0/templates/jac-iso-templates.xml
+share/libglabels-3.0/templates/maco-us-templates.xml
+share/libglabels-3.0/templates/mayspies-templates.xml
+share/libglabels-3.0/templates/meritline-us-templates.xml
+share/libglabels-3.0/templates/microapp-templates.xml
+share/libglabels-3.0/templates/misc-iso-templates.xml
+share/libglabels-3.0/templates/misc-other-templates.xml
+share/libglabels-3.0/templates/misc-us-templates.xml
+share/libglabels-3.0/templates/online-templates.xml
+share/libglabels-3.0/templates/paper-sizes.xml
+share/libglabels-3.0/templates/pearl-iso-templates.xml
+share/libglabels-3.0/templates/rayfilm-templates.xml
+share/libglabels-3.0/templates/sheetlabels-us-templates.xml
+share/libglabels-3.0/templates/uline-us-templates.xml
+share/libglabels-3.0/templates/vendors.xml
+share/libglabels-3.0/templates/worldlabel-us-templates.xml
+share/libglabels-3.0/templates/zweckform-iso-templates.xml
+share/locale/ar/LC_MESSAGES/glabels-3.0.mo
+share/locale/bs/LC_MESSAGES/glabels-3.0.mo
+share/locale/ca/LC_MESSAGES/glabels-3.0.mo
+share/locale/ca@valencia/LC_MESSAGES/glabels-3.0.mo
+share/locale/cs/LC_MESSAGES/glabels-3.0.mo
+share/locale/da/LC_MESSAGES/glabels-3.0.mo
+share/locale/de/LC_MESSAGES/glabels-3.0.mo
+share/locale/el/LC_MESSAGES/glabels-3.0.mo
+share/locale/en_GB/LC_MESSAGES/glabels-3.0.mo
+share/locale/eo/LC_MESSAGES/glabels-3.0.mo
+share/locale/es/LC_MESSAGES/glabels-3.0.mo
+share/locale/fi/LC_MESSAGES/glabels-3.0.mo
+share/locale/fr/LC_MESSAGES/glabels-3.0.mo
+share/locale/gl/LC_MESSAGES/glabels-3.0.mo
+share/locale/hu/LC_MESSAGES/glabels-3.0.mo
+share/locale/id/LC_MESSAGES/glabels-3.0.mo
+share/locale/it/LC_MESSAGES/glabels-3.0.mo
+share/locale/ja/LC_MESSAGES/glabels-3.0.mo
+share/locale/ko/LC_MESSAGES/glabels-3.0.mo
+share/locale/lv/LC_MESSAGES/glabels-3.0.mo
+share/locale/nb/LC_MESSAGES/glabels-3.0.mo
+share/locale/nl/LC_MESSAGES/glabels-3.0.mo
+share/locale/oc/LC_MESSAGES/glabels-3.0.mo
+share/locale/pt/LC_MESSAGES/glabels-3.0.mo
+share/locale/pt_BR/LC_MESSAGES/glabels-3.0.mo
+share/locale/ro/LC_MESSAGES/glabels-3.0.mo
+share/locale/ru/LC_MESSAGES/glabels-3.0.mo
+share/locale/sk/LC_MESSAGES/glabels-3.0.mo
+share/locale/sl/LC_MESSAGES/glabels-3.0.mo
+share/locale/sr/LC_MESSAGES/glabels-3.0.mo
+share/locale/sr@latin/LC_MESSAGES/glabels-3.0.mo
+share/locale/sv/LC_MESSAGES/glabels-3.0.mo
+share/locale/tr/LC_MESSAGES/glabels-3.0.mo
+share/locale/zh_CN/LC_MESSAGES/glabels-3.0.mo
+share/locale/zh_HK/LC_MESSAGES/glabels-3.0.mo
+share/locale/zh_TW/LC_MESSAGES/glabels-3.0.mo
+share/mime/packages/glabels-3.0.xml
diff --git a/deskutils/gnome-calendar/Makefile b/deskutils/gnome-calendar/Makefile
index 975e3d47e5fa..31e65d8a2725 100644
--- a/deskutils/gnome-calendar/Makefile
+++ b/deskutils/gnome-calendar/Makefile
@@ -2,34 +2,37 @@
# $FreeBSD$
PORTNAME= gnome-calendar
-PORTVERSION= 3.18.2.1
-PORTREVISION= 8
+PORTVERSION= 3.28.2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Simple and beatiful calendar application for GNOME
-PORTSCOUT= limitw:1,even
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libical.so:devel/libical
+PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
+BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS= libical.so:devel/libical \
+ libdazzle-1.0.so:x11-toolkits/libdazzle \
+ libsoup-2.4.so:devel/libsoup \
+ libgweather-3.so:net/libgweather \
+ libgeoclue-2.so:net/geoclue \
+ libgeocode-glib.so:net/geocode-glib \
+ libgoa-1.0.so:net/gnome-online-accounts
+RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+
+USES= desktop-file-utils gettext gnome localbase:ldflags meson \
+ pkgconfig python:3.4+,build tar:xz
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-USE_GNOME= evolutiondataserver3 gtk30 intlhack \
- introspection
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+USE_GNOME= cairo evolutiondataserver3 gtksourceview3
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.calendar.enums.xml \
org.gnome.calendar.gschema.xml
-# for gcc 4.2.1
-post-patch:
- @${REINPLACE_CMD} -e 's|-Wempty-body||g' \
- ${WRKSRC}/configure
-
.include <bsd.port.mk>
diff --git a/deskutils/gnome-calendar/distinfo b/deskutils/gnome-calendar/distinfo
index 8268ee0f6d7d..b78847beb34e 100644
--- a/deskutils/gnome-calendar/distinfo
+++ b/deskutils/gnome-calendar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-calendar-3.18.2.1.tar.xz) = eedd9b10da837db6e7dc02794a942e9a98b3cdaa975b0d46226aa0cdaf88c0f6
-SIZE (gnome3/gnome-calendar-3.18.2.1.tar.xz) = 2290232
+TIMESTAMP = 1525503444
+SHA256 (gnome/gnome-calendar-3.28.2.tar.xz) = dcf72dd7850a8a29dd16ebd2594acd83ac9c35b83f9f6ee87a7c3ae49eeddc74
+SIZE (gnome/gnome-calendar-3.28.2.tar.xz) = 2440592
diff --git a/deskutils/gnome-calendar/pkg-plist b/deskutils/gnome-calendar/pkg-plist
index 01e7c5d1843d..a608d22050b0 100644
--- a/deskutils/gnome-calendar/pkg-plist
+++ b/deskutils/gnome-calendar/pkg-plist
@@ -1,19 +1,22 @@
bin/gnome-calendar
-share/appdata/org.gnome.Calendar.appdata.xml
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/gnome-calendar.png
-share/icons/hicolor/22x22/apps/gnome-calendar.png
-share/icons/hicolor/24x24/apps/gnome-calendar.png
-share/icons/hicolor/256x256/apps/gnome-calendar.png
-share/icons/hicolor/32x32/apps/gnome-calendar.png
-share/icons/hicolor/48x48/apps/gnome-calendar.png
-share/icons/hicolor/512x512/apps/gnome-calendar.png
+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/symbolic/apps/org.gnome.Calendar-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
+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/cs/LC_MESSAGES/gnome-calendar.mo
share/locale/da/LC_MESSAGES/gnome-calendar.mo
share/locale/de/LC_MESSAGES/gnome-calendar.mo
@@ -21,14 +24,17 @@ share/locale/el/LC_MESSAGES/gnome-calendar.mo
share/locale/en_GB/LC_MESSAGES/gnome-calendar.mo
share/locale/eo/LC_MESSAGES/gnome-calendar.mo
share/locale/es/LC_MESSAGES/gnome-calendar.mo
+share/locale/et/LC_MESSAGES/gnome-calendar.mo
share/locale/eu/LC_MESSAGES/gnome-calendar.mo
share/locale/fa/LC_MESSAGES/gnome-calendar.mo
share/locale/fi/LC_MESSAGES/gnome-calendar.mo
share/locale/fr/LC_MESSAGES/gnome-calendar.mo
share/locale/fur/LC_MESSAGES/gnome-calendar.mo
share/locale/ga/LC_MESSAGES/gnome-calendar.mo
+share/locale/gd/LC_MESSAGES/gnome-calendar.mo
share/locale/gl/LC_MESSAGES/gnome-calendar.mo
share/locale/he/LC_MESSAGES/gnome-calendar.mo
+share/locale/hr/LC_MESSAGES/gnome-calendar.mo
share/locale/hu/LC_MESSAGES/gnome-calendar.mo
share/locale/id/LC_MESSAGES/gnome-calendar.mo
share/locale/is/LC_MESSAGES/gnome-calendar.mo
@@ -37,7 +43,10 @@ share/locale/ja/LC_MESSAGES/gnome-calendar.mo
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/ml/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
share/locale/oc/LC_MESSAGES/gnome-calendar.mo
share/locale/pa/LC_MESSAGES/gnome-calendar.mo
@@ -58,3 +67,4 @@ share/locale/uk/LC_MESSAGES/gnome-calendar.mo
share/locale/zh_CN/LC_MESSAGES/gnome-calendar.mo
share/locale/zh_HK/LC_MESSAGES/gnome-calendar.mo
share/locale/zh_TW/LC_MESSAGES/gnome-calendar.mo
+share/metainfo/org.gnome.Calendar.appdata.xml
diff --git a/deskutils/gnome-characters/Makefile b/deskutils/gnome-characters/Makefile
index be7a289c70f5..d6bf7766bf72 100644
--- a/deskutils/gnome-characters/Makefile
+++ b/deskutils/gnome-characters/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-characters
-PORTVERSION= 3.18.1
+PORTVERSION= 3.28.2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -10,19 +10,21 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= find and insert unusual characters for GNOME 3
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/COPYING
+
PORTSCOUT= limitw:1,even
-BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgjs.so:lang/gjs \
- libunistring.so:devel/libunistring
+ libunistring.so:devel/libunistring \
+ libdbus-1.so:devel/dbus
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USES= gettext gnome iconv:wchar_t localbase:ldflags meson \
+ pkgconfig python:3.6+,build tar:xz
+USE_GNOME= gtk30 introspection
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-USE_GNOME= gtk30 intlhack introspection
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.Characters.gschema.xml
diff --git a/deskutils/gnome-characters/distinfo b/deskutils/gnome-characters/distinfo
index 4e4c1efbe4b2..e842b50ef03c 100644
--- a/deskutils/gnome-characters/distinfo
+++ b/deskutils/gnome-characters/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-characters-3.18.1.tar.xz) = 161839bb6c1ffca78b6c11b8d4f3f32b8263705911df0aed3268672c050b9bac
-SIZE (gnome3/gnome-characters-3.18.1.tar.xz) = 1358396
+TIMESTAMP = 1525963295
+SHA256 (gnome3/gnome-characters-3.28.2.tar.xz) = 8016f974f4fcdd207f1a3784b2e82c66ebe62451ced0d03fd3bc181e87b0d512
+SIZE (gnome3/gnome-characters-3.28.2.tar.xz) = 1565148
diff --git a/deskutils/gnome-characters/pkg-plist b/deskutils/gnome-characters/pkg-plist
index 035832a2e600..765a17c9cffd 100644
--- a/deskutils/gnome-characters/pkg-plist
+++ b/deskutils/gnome-characters/pkg-plist
@@ -1,7 +1,6 @@
bin/gnome-characters
lib/org.gnome.Characters/girepository-1.0/Gc-1.0.typelib
lib/org.gnome.Characters/libgc.so
-share/appdata/org.gnome.Characters.appdata.xml
share/applications/org.gnome.Characters.desktop
share/dbus-1/services/org.gnome.Characters.BackgroundService.service
share/dbus-1/services/org.gnome.Characters.service
@@ -11,50 +10,61 @@ share/icons/hicolor/22x22/apps/gnome-characters.png
share/icons/hicolor/256x256/apps/gnome-characters.png
share/icons/hicolor/32x32/apps/gnome-characters.png
share/icons/hicolor/48x48/apps/gnome-characters.png
-share/icons/hicolor/scalable/categories/characters-arrow-symbolic.svg
-share/icons/hicolor/scalable/categories/characters-bullet-symbolic.svg
-share/icons/hicolor/scalable/categories/characters-currency-symbolic.svg
-share/icons/hicolor/scalable/categories/characters-latin-symbolic.svg
-share/icons/hicolor/scalable/categories/characters-math-symbolic.svg
-share/icons/hicolor/scalable/categories/characters-picture-symbolic.svg
-share/icons/hicolor/scalable/categories/characters-punctuation-symbolic.svg
share/icons/hicolor/symbolic/apps/gnome-characters-symbolic.svg
+share/locale/af/LC_MESSAGES/org.gnome.Characters.mo
share/locale/ar/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/be/LC_MESSAGES/org.gnome.Characters.mo
share/locale/ca/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/ca@valencia/LC_MESSAGES/org.gnome.Characters.mo
share/locale/cs/LC_MESSAGES/org.gnome.Characters.mo
share/locale/da/LC_MESSAGES/org.gnome.Characters.mo
share/locale/de/LC_MESSAGES/org.gnome.Characters.mo
share/locale/el/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/en_GB/LC_MESSAGES/org.gnome.Characters.mo
share/locale/eo/LC_MESSAGES/org.gnome.Characters.mo
share/locale/es/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/eu/LC_MESSAGES/org.gnome.Characters.mo
share/locale/fa/LC_MESSAGES/org.gnome.Characters.mo
share/locale/fi/LC_MESSAGES/org.gnome.Characters.mo
share/locale/fr/LC_MESSAGES/org.gnome.Characters.mo
share/locale/fur/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/gd/LC_MESSAGES/org.gnome.Characters.mo
share/locale/gl/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/gu/LC_MESSAGES/org.gnome.Characters.mo
share/locale/he/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/hr/LC_MESSAGES/org.gnome.Characters.mo
share/locale/hu/LC_MESSAGES/org.gnome.Characters.mo
share/locale/id/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/is/LC_MESSAGES/org.gnome.Characters.mo
share/locale/it/LC_MESSAGES/org.gnome.Characters.mo
share/locale/ja/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/kk/LC_MESSAGES/org.gnome.Characters.mo
share/locale/ko/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/ln/LC_MESSAGES/org.gnome.Characters.mo
share/locale/lt/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/lv/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/ml/LC_MESSAGES/org.gnome.Characters.mo
share/locale/nb/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/ne/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/nl/LC_MESSAGES/org.gnome.Characters.mo
share/locale/oc/LC_MESSAGES/org.gnome.Characters.mo
share/locale/pa/LC_MESSAGES/org.gnome.Characters.mo
share/locale/pl/LC_MESSAGES/org.gnome.Characters.mo
share/locale/pt/LC_MESSAGES/org.gnome.Characters.mo
share/locale/pt_BR/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/ro/LC_MESSAGES/org.gnome.Characters.mo
share/locale/ru/LC_MESSAGES/org.gnome.Characters.mo
share/locale/sk/LC_MESSAGES/org.gnome.Characters.mo
share/locale/sl/LC_MESSAGES/org.gnome.Characters.mo
share/locale/sr/LC_MESSAGES/org.gnome.Characters.mo
share/locale/sr@latin/LC_MESSAGES/org.gnome.Characters.mo
share/locale/sv/LC_MESSAGES/org.gnome.Characters.mo
+share/locale/tg/LC_MESSAGES/org.gnome.Characters.mo
share/locale/tr/LC_MESSAGES/org.gnome.Characters.mo
share/locale/uk/LC_MESSAGES/org.gnome.Characters.mo
share/locale/zh_CN/LC_MESSAGES/org.gnome.Characters.mo
share/locale/zh_TW/LC_MESSAGES/org.gnome.Characters.mo
+share/metainfo/org.gnome.Characters.appdata.xml
share/org.gnome.Characters/gir-1.0/Gc-1.0.gir
share/org.gnome.Characters/org.gnome.Characters
share/org.gnome.Characters/org.gnome.Characters.BackgroundService
diff --git a/deskutils/gnome-clocks/Makefile b/deskutils/gnome-clocks/Makefile
index 1103e5e2c01d..4690144c0fda 100644
--- a/deskutils/gnome-clocks/Makefile
+++ b/deskutils/gnome-clocks/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-clocks
-PORTVERSION= 3.24.0
+PORTVERSION= 3.28.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Clocks for GNOME 3
@@ -23,11 +23,12 @@ LIB_DEPENDS= libgeoclue-2.so:net/geoclue \
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
+USES= gettext gnome localbase meson pkgconfig python:3.4+,build \
+ shebangfix tar:xz
USE_LDCONFIG= yes
USE_GNOME= cairo gnomedesktop3 gsound
-GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
+SHEBANG_FILES= build-aux/post-install.py
GLIB_SCHEMAS= org.gnome.clocks.gschema.xml
diff --git a/deskutils/gnome-clocks/distinfo b/deskutils/gnome-clocks/distinfo
index 9ec281bcc7db..1b2c7445aee2 100644
--- a/deskutils/gnome-clocks/distinfo
+++ b/deskutils/gnome-clocks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496671468
-SHA256 (gnome3/gnome-clocks-3.24.0.tar.xz) = 9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36
-SIZE (gnome3/gnome-clocks-3.24.0.tar.xz) = 954576
+TIMESTAMP = 1526113093
+SHA256 (gnome/gnome-clocks-3.28.0.tar.xz) = d48e0bd0479b575adfc7beaa7cd9088258ee27142ab6305915a92cc8761aa7b5
+SIZE (gnome/gnome-clocks-3.28.0.tar.xz) = 798492
diff --git a/deskutils/gnome-clocks/pkg-plist b/deskutils/gnome-clocks/pkg-plist
index 2a43c3725253..a71a1b90b6f4 100644
--- a/deskutils/gnome-clocks/pkg-plist
+++ b/deskutils/gnome-clocks/pkg-plist
@@ -1,5 +1,4 @@
bin/gnome-clocks
-share/appdata/org.gnome.clocks.appdata.xml
share/applications/org.gnome.clocks.desktop
share/dbus-1/services/org.gnome.clocks.service
%%DATADIR%%/images/day.png
@@ -125,18 +124,6 @@ share/help/gl/gnome-clocks/timer.page
share/help/gl/gnome-clocks/world-add.page
share/help/gl/gnome-clocks/world-check.page
share/help/gl/gnome-clocks/world-remove.page
-share/help/ko/gnome-clocks/alarm-add.page
-share/help/ko/gnome-clocks/alarm-edit.page
-share/help/ko/gnome-clocks/alarm-remove.page
-share/help/ko/gnome-clocks/alarm-snooze-stop.page
-share/help/ko/gnome-clocks/figures/gnome-clocks.png
-share/help/ko/gnome-clocks/index.page
-share/help/ko/gnome-clocks/legal.xml
-share/help/ko/gnome-clocks/stopwatch.page
-share/help/ko/gnome-clocks/timer.page
-share/help/ko/gnome-clocks/world-add.page
-share/help/ko/gnome-clocks/world-check.page
-share/help/ko/gnome-clocks/world-remove.page
share/help/hu/gnome-clocks/alarm-add.page
share/help/hu/gnome-clocks/alarm-edit.page
share/help/hu/gnome-clocks/alarm-remove.page
@@ -161,6 +148,18 @@ share/help/id/gnome-clocks/timer.page
share/help/id/gnome-clocks/world-add.page
share/help/id/gnome-clocks/world-check.page
share/help/id/gnome-clocks/world-remove.page
+share/help/ko/gnome-clocks/alarm-add.page
+share/help/ko/gnome-clocks/alarm-edit.page
+share/help/ko/gnome-clocks/alarm-remove.page
+share/help/ko/gnome-clocks/alarm-snooze-stop.page
+share/help/ko/gnome-clocks/figures/gnome-clocks.png
+share/help/ko/gnome-clocks/index.page
+share/help/ko/gnome-clocks/legal.xml
+share/help/ko/gnome-clocks/stopwatch.page
+share/help/ko/gnome-clocks/timer.page
+share/help/ko/gnome-clocks/world-add.page
+share/help/ko/gnome-clocks/world-check.page
+share/help/ko/gnome-clocks/world-remove.page
share/help/nl/gnome-clocks/alarm-add.page
share/help/nl/gnome-clocks/alarm-edit.page
share/help/nl/gnome-clocks/alarm-remove.page
@@ -173,6 +172,18 @@ share/help/nl/gnome-clocks/timer.page
share/help/nl/gnome-clocks/world-add.page
share/help/nl/gnome-clocks/world-check.page
share/help/nl/gnome-clocks/world-remove.page
+share/help/pl/gnome-clocks/alarm-add.page
+share/help/pl/gnome-clocks/alarm-edit.page
+share/help/pl/gnome-clocks/alarm-remove.page
+share/help/pl/gnome-clocks/alarm-snooze-stop.page
+share/help/pl/gnome-clocks/figures/gnome-clocks.png
+share/help/pl/gnome-clocks/index.page
+share/help/pl/gnome-clocks/legal.xml
+share/help/pl/gnome-clocks/stopwatch.page
+share/help/pl/gnome-clocks/timer.page
+share/help/pl/gnome-clocks/world-add.page
+share/help/pl/gnome-clocks/world-check.page
+share/help/pl/gnome-clocks/world-remove.page
share/help/pt_BR/gnome-clocks/alarm-add.page
share/help/pt_BR/gnome-clocks/alarm-edit.page
share/help/pt_BR/gnome-clocks/alarm-remove.page
@@ -244,6 +255,7 @@ share/locale/gl/LC_MESSAGES/gnome-clocks.mo
share/locale/gu/LC_MESSAGES/gnome-clocks.mo
share/locale/he/LC_MESSAGES/gnome-clocks.mo
share/locale/hi/LC_MESSAGES/gnome-clocks.mo
+share/locale/hr/LC_MESSAGES/gnome-clocks.mo
share/locale/hu/LC_MESSAGES/gnome-clocks.mo
share/locale/id/LC_MESSAGES/gnome-clocks.mo
share/locale/is/LC_MESSAGES/gnome-clocks.mo
@@ -283,3 +295,4 @@ share/locale/vi/LC_MESSAGES/gnome-clocks.mo
share/locale/zh_CN/LC_MESSAGES/gnome-clocks.mo
share/locale/zh_HK/LC_MESSAGES/gnome-clocks.mo
share/locale/zh_TW/LC_MESSAGES/gnome-clocks.mo
+share/metainfo/org.gnome.clocks.appdata.xml
diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index 864076ee971c..fac95ae0193d 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -2,14 +2,16 @@
# $FreeBSD$
PORTNAME= gnome-contacts
-PORTVERSION= 3.18.0
-PORTREVISION= 6
+PORTVERSION= 3.28.2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Contacts manager for gnome
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= vala>=0.14.0:lang/vala
LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
@@ -31,22 +33,18 @@ LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain \
PORTSCOUT= limitw:1,even
-USE_XORG= x11 xcb xcomposite xdamage xext xfixes xi xrandr
-USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 glib20 gnomedesktop3 \
- gtk30 intlhack introspection:build
USE_GL= egl
-USES= gettext gmake gnome pathfix perl5 pkgconfig sqlite tar:xz
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-MAKE_ENV= XDG_CACHE_HOME=${WRKDIR}
+USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 gnomedesktop3 gtk30 \
+ intlhack introspection:build
+USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
+USES= gettext gnome localbase meson perl5 pkgconfig \
+ python:3.4+,build shebangfix sqlite tar:xz
+SHEBANG_FILES= meson_post_install.py
-GLIB_SCHEMAS= org.gnome.Contacts.enums.xml \
- org.gnome.Contacts.gschema.xml
+GLIB_SCHEMAS= org.gnome.Contacts.gschema.xml
OPTIONS_SUB= yes
-OPTIONS_DEFINE= MANPAGES NLS
+OPTIONS_DEFINE= MANPAGES
OPTIONS_DEFAULT=MANPAGES
OPTIONS_DEFINE_i386= CHEESE
@@ -54,21 +52,13 @@ OPTIONS_DEFINE_amd64= CHEESE
OPTIONS_DEFAULT_i386= CHEESE
OPTIONS_DEFAULT_amd64= CHEESE
-MANPAGES_CONFIGURE_ENABLE= man-pages
+MANPAGES_MESON_TRUE= with-manpage
MANPAGES_USE= GNOME=libxslt:build
MANPAGES_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \
docbook-xsl>=0:textproc/docbook-xsl
-NLS_CONFIGURE_ENABLE= nls
-NLS_USES= gettext
-
CHEESE_DESC= Cheese webcam support
-CHEESE_CONFIGURE_WITH= cheese
+CHEESE_MESON_YES= with-cheese
CHEESE_LIB_DEPENDS= libcheese-gtk.so:multimedia/cheese
-post-patch:
- # touch vala sources to force regen c sources to honor cheese setting
- ${TOUCH} ${WRKSRC}/src/main.vala \
- ${WRKSRC}/src/contacts-avatar-dialog.vala
-
.include <bsd.port.mk>
diff --git a/deskutils/gnome-contacts/distinfo b/deskutils/gnome-contacts/distinfo
index 0b487b065969..4a3af387d738 100644
--- a/deskutils/gnome-contacts/distinfo
+++ b/deskutils/gnome-contacts/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome-contacts-3.18.0.tar.xz) = c81ad739a1f554e4c89979564565e32ceaf1d2cc6c93a6a75d929d7d1fe8e287
-SIZE (gnome-contacts-3.18.0.tar.xz) = 784616
+TIMESTAMP = 1525958162
+SHA256 (gnome-contacts-3.28.2.tar.xz) = 1c65ceff37d06ff7114b0d335f6c26e0f6bf1eff40af9feba73ad87cdfae8fc6
+SIZE (gnome-contacts-3.28.2.tar.xz) = 365188
diff --git a/deskutils/gnome-contacts/files/patch-src_contacts-contact-editor.vala b/deskutils/gnome-contacts/files/patch-src_contacts-contact-editor.vala
deleted file mode 100644
index c67280951db9..000000000000
--- a/deskutils/gnome-contacts/files/patch-src_contacts-contact-editor.vala
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/contacts-contact-editor.vala.orig 2018-01-12 21:18:52 UTC
-+++ src/contacts-contact-editor.vala
-@@ -77,7 +77,7 @@ public class Contacts.ContactEditor : Gr
- }
-
- struct RowData {
-- AbstractFieldDetails<string> details;
-+ AbstractFieldDetails details;
- }
-
- struct Field {
diff --git a/deskutils/gnome-contacts/files/patch-src_contacts-contact-pane.vala b/deskutils/gnome-contacts/files/patch-src_contacts-contact-pane.vala
deleted file mode 100644
index ac29403550e6..000000000000
--- a/deskutils/gnome-contacts/files/patch-src_contacts-contact-pane.vala
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/contacts-contact-pane.vala.orig 2018-01-12 21:20:00 UTC
-+++ src/contacts-contact-pane.vala
-@@ -451,7 +451,6 @@ public class Contacts.ContactPane : Note
- DialogFlags.MODAL,
- MessageType.ERROR,
- ButtonsType.OK,
-- "%s",
- _("You need to enter some data"));
- dialog.show ();
- dialog.response.connect ( () => {
-@@ -463,7 +462,6 @@ public class Contacts.ContactPane : Note
- DialogFlags.MODAL,
- MessageType.ERROR,
- ButtonsType.OK,
-- "%s",
- _("No primary addressbook configured"));
- dialog.show ();
- dialog.response.connect ( () => {
-@@ -482,7 +480,6 @@ public class Contacts.ContactPane : Note
- DialogFlags.MODAL,
- MessageType.ERROR,
- ButtonsType.OK,
-- "%s",
- _("Unable to create new contacts: %s"), e.message);
- }
-
-@@ -493,7 +490,6 @@ public class Contacts.ContactPane : Note
- DialogFlags.MODAL,
- MessageType.ERROR,
- ButtonsType.OK,
-- "%s",
- _("Unable to find newly created contact"));
- }
-
diff --git a/deskutils/gnome-contacts/pkg-plist b/deskutils/gnome-contacts/pkg-plist
index 44d85bf42c49..09780053eccd 100644
--- a/deskutils/gnome-contacts/pkg-plist
+++ b/deskutils/gnome-contacts/pkg-plist
@@ -1,11 +1,16 @@
bin/gnome-contacts
libexec/gnome-contacts-search-provider
%%MANPAGES%%man/man1/gnome-contacts.1.gz
-share/appdata/org.gnome.Contacts.appdata.xml
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/16x16/apps/gnome-contacts.png
+share/icons/hicolor/22x22/apps/gnome-contacts.png
+share/icons/hicolor/32x32/apps/gnome-contacts.png
+share/icons/hicolor/48x48/apps/gnome-contacts.png
+share/icons/hicolor/512x512/apps/gnome-contacts.png
+share/icons/hicolor/symbolic/apps/gnome-contacts-symbolic.svg
share/locale/af/LC_MESSAGES/gnome-contacts.mo
share/locale/ar/LC_MESSAGES/gnome-contacts.mo
share/locale/as/LC_MESSAGES/gnome-contacts.mo
@@ -36,14 +41,15 @@ share/locale/gl/LC_MESSAGES/gnome-contacts.mo
share/locale/gu/LC_MESSAGES/gnome-contacts.mo
share/locale/he/LC_MESSAGES/gnome-contacts.mo
share/locale/hi/LC_MESSAGES/gnome-contacts.mo
+share/locale/hr/LC_MESSAGES/gnome-contacts.mo
share/locale/hu/LC_MESSAGES/gnome-contacts.mo
share/locale/id/LC_MESSAGES/gnome-contacts.mo
share/locale/is/LC_MESSAGES/gnome-contacts.mo
share/locale/it/LC_MESSAGES/gnome-contacts.mo
share/locale/ja/LC_MESSAGES/gnome-contacts.mo
-share/locale/ko/LC_MESSAGES/gnome-contacts.mo
share/locale/kk/LC_MESSAGES/gnome-contacts.mo
share/locale/kn/LC_MESSAGES/gnome-contacts.mo
+share/locale/ko/LC_MESSAGES/gnome-contacts.mo
share/locale/lt/LC_MESSAGES/gnome-contacts.mo
share/locale/lv/LC_MESSAGES/gnome-contacts.mo
share/locale/mk/LC_MESSAGES/gnome-contacts.mo
@@ -76,3 +82,4 @@ share/locale/vi/LC_MESSAGES/gnome-contacts.mo
share/locale/zh_CN/LC_MESSAGES/gnome-contacts.mo
share/locale/zh_HK/LC_MESSAGES/gnome-contacts.mo
share/locale/zh_TW/LC_MESSAGES/gnome-contacts.mo
+share/metainfo/org.gnome.Contacts.appdata.xml
diff --git a/deskutils/gnome-dictionary/Makefile b/deskutils/gnome-dictionary/Makefile
index 53e1bb238fcd..b1f40654edda 100644
--- a/deskutils/gnome-dictionary/Makefile
+++ b/deskutils/gnome-dictionary/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-dictionary
-PORTVERSION= 3.18.1
+PORTVERSION= 3.26.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -10,19 +10,20 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 3 dictionary lookup application
-BUILD_DEPENDS= gtkdoc-check:textproc/gtk-doc \
- itstool:textproc/itstool
+LICENSE=GPLv2 LGPL21
+LICENSE_COMB= multi
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.libs
+
+BUILD_DEPENDS= itstool:textproc/itstool \
+ docbook-xsl>=0:textproc/docbook-xsl
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME= intlhack introspection:build gtk30
+USES= gettext gnome localbase meson pkgconfig tar:xz
+USE_GNOME= cairo gtk30 introspection:build libxslt:build
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.dictionary.gschema.xml
diff --git a/deskutils/gnome-dictionary/distinfo b/deskutils/gnome-dictionary/distinfo
index b1968623175c..44424af6e652 100644
--- a/deskutils/gnome-dictionary/distinfo
+++ b/deskutils/gnome-dictionary/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-dictionary-3.18.1.tar.xz) = 92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc
-SIZE (gnome3/gnome-dictionary-3.18.1.tar.xz) = 864460
+TIMESTAMP = 1516390306
+SHA256 (gnome3/gnome-dictionary-3.26.1.tar.xz) = 16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300
+SIZE (gnome3/gnome-dictionary-3.26.1.tar.xz) = 662048
diff --git a/deskutils/gnome-dictionary/pkg-plist b/deskutils/gnome-dictionary/pkg-plist
index bfc4b71bdebc..f52f1f671329 100644
--- a/deskutils/gnome-dictionary/pkg-plist
+++ b/deskutils/gnome-dictionary/pkg-plist
@@ -1,23 +1,4 @@
bin/gnome-dictionary
-include/gdict-1.0/gdict/gdict-client-context.h
-include/gdict-1.0/gdict/gdict-context.h
-include/gdict-1.0/gdict/gdict-database-chooser-button.h
-include/gdict-1.0/gdict/gdict-database-chooser.h
-include/gdict-1.0/gdict/gdict-defbox.h
-include/gdict-1.0/gdict/gdict-enum-types.h
-include/gdict-1.0/gdict/gdict-source-chooser.h
-include/gdict-1.0/gdict/gdict-source-loader.h
-include/gdict-1.0/gdict/gdict-source.h
-include/gdict-1.0/gdict/gdict-speller.h
-include/gdict-1.0/gdict/gdict-strategy-chooser.h
-include/gdict-1.0/gdict/gdict-utils.h
-include/gdict-1.0/gdict/gdict-version.h
-include/gdict-1.0/gdict/gdict.h
-lib/girepository-1.0/Gdict-1.0.typelib
-lib/libgdict-1.0.so
-lib/libgdict-1.0.so.10
-lib/libgdict-1.0.so.10.0.0
-libdata/pkgconfig/gdict-1.0.pc
man/man1/gnome-dictionary.1.gz
share/appdata/org.gnome.Dictionary.appdata.xml
share/applications/org.gnome.Dictionary.desktop
@@ -25,42 +6,6 @@ share/dbus-1/services/org.gnome.Dictionary.service
share/gdict-1.0/sources/default.desktop
share/gdict-1.0/sources/spanish.desktop
share/gdict-1.0/sources/thai.desktop
-share/gir-1.0/Gdict-1.0.gir
-share/gtk-doc/html/gdict/GdictClientContext.html
-share/gtk-doc/html/gdict/GdictContext.html
-share/gtk-doc/html/gdict/GdictDatabaseChooser.html
-share/gtk-doc/html/gdict/GdictDefbox.html
-share/gtk-doc/html/gdict/GdictSource.html
-share/gtk-doc/html/gdict/GdictSourceChooser.html
-share/gtk-doc/html/gdict/GdictSourceLoader.html
-share/gtk-doc/html/gdict/GdictSpeller.html
-share/gtk-doc/html/gdict/GdictStrategyChooser.html
-share/gtk-doc/html/gdict/annotation-glossary.html
-share/gtk-doc/html/gdict/ch05.html
-share/gtk-doc/html/gdict/ch06.html
-share/gtk-doc/html/gdict/context-types.html
-share/gtk-doc/html/gdict/context.html
-share/gtk-doc/html/gdict/gdict-Gdict-Utilities.html
-share/gtk-doc/html/gdict/gdict-Gdict-Version-Checking.html
-share/gtk-doc/html/gdict/gdict-utils.html
-share/gtk-doc/html/gdict/gdict.devhelp2
-share/gtk-doc/html/gdict/gdict.html
-share/gtk-doc/html/gdict/gdictui.html
-share/gtk-doc/html/gdict/home.png
-share/gtk-doc/html/gdict/index.html
-share/gtk-doc/html/gdict/introduction.html
-share/gtk-doc/html/gdict/ix01.html
-share/gtk-doc/html/gdict/ix02.html
-share/gtk-doc/html/gdict/ix03.html
-share/gtk-doc/html/gdict/ix04.html
-share/gtk-doc/html/gdict/left-insensitive.png
-share/gtk-doc/html/gdict/left.png
-share/gtk-doc/html/gdict/right-insensitive.png
-share/gtk-doc/html/gdict/right.png
-share/gtk-doc/html/gdict/sources.html
-share/gtk-doc/html/gdict/style.css
-share/gtk-doc/html/gdict/up-insensitive.png
-share/gtk-doc/html/gdict/up.png
share/help/C/gnome-dictionary/definition.page
share/help/C/gnome-dictionary/dictionary-select.page
share/help/C/gnome-dictionary/figures/gnome-dictionary-icon.png
@@ -391,6 +336,28 @@ share/help/it/gnome-dictionary/sources-edit.page
share/help/it/gnome-dictionary/sources-select.page
share/help/it/gnome-dictionary/sources.page
share/help/it/gnome-dictionary/text-copy.page
+share/help/ko/gnome-dictionary/definition.page
+share/help/ko/gnome-dictionary/dictionary-select.page
+share/help/ko/gnome-dictionary/figures/gnome-dictionary-icon.png
+share/help/ko/gnome-dictionary/figures/gnome-dictionary.png
+share/help/ko/gnome-dictionary/find.page
+share/help/ko/gnome-dictionary/index.page
+share/help/ko/gnome-dictionary/introduction.page
+share/help/ko/gnome-dictionary/keyboard-shortcuts.page
+share/help/ko/gnome-dictionary/legal.xml
+share/help/ko/gnome-dictionary/pref.page
+share/help/ko/gnome-dictionary/print-font.page
+share/help/ko/gnome-dictionary/print.page
+share/help/ko/gnome-dictionary/prob-retrieving-definition.page
+share/help/ko/gnome-dictionary/save-definition.page
+share/help/ko/gnome-dictionary/similar-words.page
+share/help/ko/gnome-dictionary/source-add-local.page
+share/help/ko/gnome-dictionary/sources-default.page
+share/help/ko/gnome-dictionary/sources-delete.page
+share/help/ko/gnome-dictionary/sources-edit.page
+share/help/ko/gnome-dictionary/sources-select.page
+share/help/ko/gnome-dictionary/sources.page
+share/help/ko/gnome-dictionary/text-copy.page
share/help/oc/gnome-dictionary/definition.page
share/help/oc/gnome-dictionary/dictionary-select.page
share/help/oc/gnome-dictionary/figures/gnome-dictionary-icon.png
@@ -413,6 +380,28 @@ share/help/oc/gnome-dictionary/sources-edit.page
share/help/oc/gnome-dictionary/sources-select.page
share/help/oc/gnome-dictionary/sources.page
share/help/oc/gnome-dictionary/text-copy.page
+share/help/pl/gnome-dictionary/definition.page
+share/help/pl/gnome-dictionary/dictionary-select.page
+share/help/pl/gnome-dictionary/figures/gnome-dictionary-icon.png
+share/help/pl/gnome-dictionary/figures/gnome-dictionary.png
+share/help/pl/gnome-dictionary/find.page
+share/help/pl/gnome-dictionary/index.page
+share/help/pl/gnome-dictionary/introduction.page
+share/help/pl/gnome-dictionary/keyboard-shortcuts.page
+share/help/pl/gnome-dictionary/legal.xml
+share/help/pl/gnome-dictionary/pref.page
+share/help/pl/gnome-dictionary/print-font.page
+share/help/pl/gnome-dictionary/print.page
+share/help/pl/gnome-dictionary/prob-retrieving-definition.page
+share/help/pl/gnome-dictionary/save-definition.page
+share/help/pl/gnome-dictionary/similar-words.page
+share/help/pl/gnome-dictionary/source-add-local.page
+share/help/pl/gnome-dictionary/sources-default.page
+share/help/pl/gnome-dictionary/sources-delete.page
+share/help/pl/gnome-dictionary/sources-edit.page
+share/help/pl/gnome-dictionary/sources-select.page
+share/help/pl/gnome-dictionary/sources.page
+share/help/pl/gnome-dictionary/text-copy.page
share/help/pt_BR/gnome-dictionary/definition.page
share/help/pt_BR/gnome-dictionary/dictionary-select.page
share/help/pt_BR/gnome-dictionary/figures/gnome-dictionary-icon.png
@@ -579,6 +568,7 @@ share/locale/fi/LC_MESSAGES/gnome-dictionary.mo
share/locale/fr/LC_MESSAGES/gnome-dictionary.mo
share/locale/fur/LC_MESSAGES/gnome-dictionary.mo
share/locale/ga/LC_MESSAGES/gnome-dictionary.mo
+share/locale/gd/LC_MESSAGES/gnome-dictionary.mo
share/locale/gl/LC_MESSAGES/gnome-dictionary.mo
share/locale/gu/LC_MESSAGES/gnome-dictionary.mo
share/locale/he/LC_MESSAGES/gnome-dictionary.mo
@@ -586,6 +576,7 @@ share/locale/hi/LC_MESSAGES/gnome-dictionary.mo
share/locale/hr/LC_MESSAGES/gnome-dictionary.mo
share/locale/hu/LC_MESSAGES/gnome-dictionary.mo
share/locale/id/LC_MESSAGES/gnome-dictionary.mo
+share/locale/is/LC_MESSAGES/gnome-dictionary.mo
share/locale/it/LC_MESSAGES/gnome-dictionary.mo
share/locale/ja/LC_MESSAGES/gnome-dictionary.mo
share/locale/ka/LC_MESSAGES/gnome-dictionary.mo
diff --git a/deskutils/gnome-documents/Makefile b/deskutils/gnome-documents/Makefile
index 56f06d0014d9..e0e59c0ffd08 100644
--- a/deskutils/gnome-documents/Makefile
+++ b/deskutils/gnome-documents/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-documents
-PORTVERSION= 3.24.2
-PORTREVISION= 1
+PORTVERSION= 3.28.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -22,20 +21,20 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libgdata.so:devel/libgdata \
libgoa-1.0.so:net/gnome-online-accounts \
libgjs.so:lang/gjs \
- libtracker-sparql-1.0.so:sysutils/tracker \
- libgepub.so:textproc/libgepub \
+ libtracker-sparql-2.0.so:sysutils/tracker \
+ libgepub-0.6.so:textproc/libgepub \
libzapojit-0.0.so:net/libzapojit
-RUN_DEPENDS= gnome-online-miners>=0:net/gnome-online-miners
+RUN_DEPENDS= gnome-online-miners>=0:net/gnome-online-miners \
+ tracker-miners>=0:sysutils/tracker-miners
PORTSCOUT= limitw:1,even
-USES= compiler:c++11-lib gettext gmake gnome libtool localbase \
- pathfix pkgconfig tar:xz
-USE_GNOME= cairo gdkpixbuf2 gnomedesktop3 intltool introspection librsvg2
-GNU_CONFIGURE= yes
+USES= compiler:c++11-lib desktop-file-utils gettext gnome localbase \
+ meson pkgconfig python:3.6+,build tar:xz
+USE_GNOME= cairo gnomedesktop3 introspection libxslt:build
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-INSTALL_TARGET= install-strip
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.Documents.enums.xml \
org.gnome.books.gschema.xml \
diff --git a/deskutils/gnome-documents/distinfo b/deskutils/gnome-documents/distinfo
index 93e4e6e68466..0a7dd469b758 100644
--- a/deskutils/gnome-documents/distinfo
+++ b/deskutils/gnome-documents/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522104527
-SHA256 (gnome3/gnome-documents-3.24.2.tar.xz) = 513a7640967cf94a2233da5e38b3bdc6b71c89b84727dded8dc3f6ce13b35130
-SIZE (gnome3/gnome-documents-3.24.2.tar.xz) = 2314080
+TIMESTAMP = 1528490685
+SHA256 (gnome3/gnome-documents-3.28.1.tar.xz) = f50226f3c08dc7e2069d3365335fc1ab187b0939f04ab55e97aca7b70c111ac4
+SIZE (gnome3/gnome-documents-3.28.1.tar.xz) = 4800112
diff --git a/deskutils/gnome-documents/pkg-plist b/deskutils/gnome-documents/pkg-plist
index c3ba8b616563..66422f4a1af1 100644
--- a/deskutils/gnome-documents/pkg-plist
+++ b/deskutils/gnome-documents/pkg-plist
@@ -6,8 +6,6 @@ lib/gnome-documents/libgd.so
lib/gnome-documents/libgdprivate-1.0.so
man/man1/gnome-books.1.gz
man/man1/gnome-documents.1.gz
-share/appdata/org.gnome.Books.appdata.xml
-share/appdata/org.gnome.Documents.appdata.xml
share/applications/org.gnome.Books.desktop
share/applications/org.gnome.Documents.desktop
share/dbus-1/services/org.gnome.Books.service
@@ -351,6 +349,21 @@ share/help/pa/gnome-documents/search.page
share/help/pa/gnome-documents/view-add.page
share/help/pa/gnome-documents/view.page
share/help/pa/gnome-documents/viewgrid.page
+share/help/pl/gnome-documents/collections.page
+share/help/pl/gnome-documents/filter.page
+share/help/pl/gnome-documents/formats.page
+share/help/pl/gnome-documents/index.page
+share/help/pl/gnome-documents/info.page
+share/help/pl/gnome-documents/legal.xml
+share/help/pl/gnome-documents/media/go-down.png
+share/help/pl/gnome-documents/media/icon_gnome-documents.png
+share/help/pl/gnome-documents/print.page
+share/help/pl/gnome-documents/prob-no-show.page
+share/help/pl/gnome-documents/prob-previews.page
+share/help/pl/gnome-documents/search.page
+share/help/pl/gnome-documents/view-add.page
+share/help/pl/gnome-documents/view.page
+share/help/pl/gnome-documents/viewgrid.page
share/help/pt_BR/gnome-documents/collections.page
share/help/pt_BR/gnome-documents/filter.page
share/help/pt_BR/gnome-documents/formats.page
@@ -587,3 +600,5 @@ share/locale/xh/LC_MESSAGES/gnome-documents.mo
share/locale/zh_CN/LC_MESSAGES/gnome-documents.mo
share/locale/zh_HK/LC_MESSAGES/gnome-documents.mo
share/locale/zh_TW/LC_MESSAGES/gnome-documents.mo
+share/metainfo/org.gnome.Books.appdata.xml
+share/metainfo/org.gnome.Documents.appdata.xml
diff --git a/deskutils/gnome-font-viewer/Makefile b/deskutils/gnome-font-viewer/Makefile
index 40f5ad36f903..4cbde0fc1705 100644
--- a/deskutils/gnome-font-viewer/Makefile
+++ b/deskutils/gnome-font-viewer/Makefile
@@ -2,27 +2,27 @@
# $FreeBSD$
PORTNAME= gnome-font-viewer
-PORTVERSION= 3.16.2
+PORTVERSION= 3.28.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 3 font viewer utility
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= libfreetype.so:print/freetype2 \
- libfontconfig.so:x11-fonts/fontconfig
+ libfontconfig.so:x11-fonts/fontconfig \
+ libharfbuzz.so:print/harfbuzz
CONFLICTS= gnome-utils-2.[0-9]*
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake pathfix \
- pkgconfig tar:xz
+USES= desktop-file-utils gettext localbase meson pkgconfig tar:xz
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-USE_GNOME= intlhack gtk30 gnomedesktop3
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
+USE_GNOME= cairo gtk30 gnomedesktop3
.include <bsd.port.mk>
diff --git a/deskutils/gnome-font-viewer/distinfo b/deskutils/gnome-font-viewer/distinfo
index 20b6b79044df..6a787652876e 100644
--- a/deskutils/gnome-font-viewer/distinfo
+++ b/deskutils/gnome-font-viewer/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-font-viewer-3.16.2.tar.xz) = f5367417d926d1dbe175aceb8eb4d2733d723a237428f130edd4b4023c0dc1cf
-SIZE (gnome3/gnome-font-viewer-3.16.2.tar.xz) = 306488
+TIMESTAMP = 1526107485
+SHA256 (gnome/gnome-font-viewer-3.28.0.tar.xz) = a327109563405de531f729d2fa405b69a5b38d2d02626a2dfe6895229c10b79a
+SIZE (gnome/gnome-font-viewer-3.28.0.tar.xz) = 130968
diff --git a/deskutils/gnome-font-viewer/pkg-descr b/deskutils/gnome-font-viewer/pkg-descr
index a5ff06a9f39f..e962089721ba 100644
--- a/deskutils/gnome-font-viewer/pkg-descr
+++ b/deskutils/gnome-font-viewer/pkg-descr
@@ -1 +1,3 @@
GNOME 3.0 font viewer and thumbnailer utility.
+
+WWW: https://github.com/GNOME/gnome-font-viewer
diff --git a/deskutils/gnome-font-viewer/pkg-plist b/deskutils/gnome-font-viewer/pkg-plist
index c5424f629619..7c422ef3c090 100644
--- a/deskutils/gnome-font-viewer/pkg-plist
+++ b/deskutils/gnome-font-viewer/pkg-plist
@@ -1,6 +1,5 @@
bin/gnome-font-viewer
bin/gnome-thumbnail-font
-share/appdata/org.gnome.font-viewer.appdata.xml
share/applications/org.gnome.font-viewer.desktop
share/dbus-1/services/org.gnome.font-viewer.service
share/locale/af/LC_MESSAGES/gnome-font-viewer.mo
@@ -93,11 +92,12 @@ share/locale/th/LC_MESSAGES/gnome-font-viewer.mo
share/locale/tr/LC_MESSAGES/gnome-font-viewer.mo
share/locale/ug/LC_MESSAGES/gnome-font-viewer.mo
share/locale/uk/LC_MESSAGES/gnome-font-viewer.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-font-viewer.mo
share/locale/vi/LC_MESSAGES/gnome-font-viewer.mo
share/locale/wa/LC_MESSAGES/gnome-font-viewer.mo
share/locale/xh/LC_MESSAGES/gnome-font-viewer.mo
share/locale/zh_CN/LC_MESSAGES/gnome-font-viewer.mo
share/locale/zh_HK/LC_MESSAGES/gnome-font-viewer.mo
share/locale/zh_TW/LC_MESSAGES/gnome-font-viewer.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-font-viewer.mo
+share/metainfo/org.gnome.font-viewer.appdata.xml
share/thumbnailers/gnome-font-viewer.thumbnailer
diff --git a/deskutils/gnome-maps/Makefile b/deskutils/gnome-maps/Makefile
index 41dfcd93ba8b..110a8243ec11 100644
--- a/deskutils/gnome-maps/Makefile
+++ b/deskutils/gnome-maps/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-maps
-PORTVERSION= 3.24.3
-PORTREVISION= 1
+PORTVERSION= 3.28.2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Map application for GNOME 3
@@ -15,18 +14,19 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= geoclue>=0:net/geoclue
-LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain \
- libclutter-1.0.so:graphics/clutter \
+LIB_DEPENDS= libgeocode-glib.so:net/geocode-glib \
+ libgee-0.8.so:devel/libgee \
libcogl.so:graphics/cogl \
+ libclutter-1.0.so:graphics/clutter \
+ libchamplain-0.12.so:graphics/libchamplain \
+ libsoup-2.4.so:devel/libsoup \
+ librest-0.7.so:devel/librest \
+ libjson-glib-1.0.so:devel/json-glib \
libfolks.so:net-im/folks \
- libgee-0.8.so:devel/libgee \
- libgeocode-glib.so:net/geocode-glib \
libgfbgraph-0.2.so:net/gfbgraph \
libgjs.so:lang/gjs \
- libgoa-1.0.so:net/gnome-online-accounts \
- libjson-glib-1.0.so:devel/json-glib \
- librest-0.7.so:devel/librest \
- libsoup-2.4.so:devel/libsoup
+ libsoup-2.4.so:devel/libsoup \
+ librest-0.7.so:devel/librest
RUN_DEPENDS= geoclue>=0:net/geoclue
PORTSCOUT= limitw:1,even
@@ -35,8 +35,8 @@ USES= desktop-file-utils gettext gmake gnome libtool \
localbase pathfix pkgconfig tar:xz
USE_GNOME= cairo gtk30 intltool libxml2
USE_GL= egl
-USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
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 52f8a80b1b14..ec64864b1860 100644
--- a/deskutils/gnome-maps/distinfo
+++ b/deskutils/gnome-maps/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496085772
-SHA256 (gnome3/gnome-maps-3.24.3.tar.xz) = 5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6
-SIZE (gnome3/gnome-maps-3.24.3.tar.xz) = 1145872
+TIMESTAMP = 1525958477
+SHA256 (gnome/gnome-maps-3.28.2.tar.xz) = e787d92bb151314e5234156c2819f6f0c18ee9c7e00baa1fbdd284911402f1fb
+SIZE (gnome/gnome-maps-3.28.2.tar.xz) = 1195508
diff --git a/deskutils/gnome-maps/pkg-descr b/deskutils/gnome-maps/pkg-descr
index 0906f6776948..501a471ac7a3 100644
--- a/deskutils/gnome-maps/pkg-descr
+++ b/deskutils/gnome-maps/pkg-descr
@@ -1,3 +1,3 @@
-Maps is a map application for GNOME 3
+Map application based on OpenStreetMap map data for GNOME 3
-WWW: https://wiki.gnome.org/action/show/Apps/Maps
+WWW: https://wiki.gnome.org/Apps/Maps
diff --git a/deskutils/gnome-maps/pkg-plist b/deskutils/gnome-maps/pkg-plist
index 552414244f9e..d438356e111c 100644
--- a/deskutils/gnome-maps/pkg-plist
+++ b/deskutils/gnome-maps/pkg-plist
@@ -3,7 +3,6 @@ lib/gnome-maps/girepository-1.0/GnomeMaps-1.0.typelib
lib/gnome-maps/libgnome-maps.so
lib/gnome-maps/libgnome-maps.so.0
lib/gnome-maps/libgnome-maps.so.0.0.0
-share/appdata/org.gnome.Maps.appdata.xml
share/applications/org.gnome.Maps.desktop
share/dbus-1/services/org.gnome.Maps.service
share/gir-1.0/GnomeMaps-1.0.gir
@@ -82,6 +81,7 @@ share/locale/ga/LC_MESSAGES/gnome-maps.mo
share/locale/gd/LC_MESSAGES/gnome-maps.mo
share/locale/gl/LC_MESSAGES/gnome-maps.mo
share/locale/he/LC_MESSAGES/gnome-maps.mo
+share/locale/hi/LC_MESSAGES/gnome-maps.mo
share/locale/hr/LC_MESSAGES/gnome-maps.mo
share/locale/hu/LC_MESSAGES/gnome-maps.mo
share/locale/id/LC_MESSAGES/gnome-maps.mo
@@ -117,3 +117,4 @@ share/locale/vi/LC_MESSAGES/gnome-maps.mo
share/locale/zh_CN/LC_MESSAGES/gnome-maps.mo
share/locale/zh_HK/LC_MESSAGES/gnome-maps.mo
share/locale/zh_TW/LC_MESSAGES/gnome-maps.mo
+share/metainfo/org.gnome.Maps.appdata.xml
diff --git a/deskutils/gnome-photos/Makefile b/deskutils/gnome-photos/Makefile
index f4d2b9af8fda..db2113dc19c3 100644
--- a/deskutils/gnome-photos/Makefile
+++ b/deskutils/gnome-photos/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-photos
-PORTVERSION= 3.24.2
-PORTREVISION= 3
+PORTVERSION= 3.28.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -17,12 +16,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= geoclue>=0:net/geoclue \
itstool:textproc/itstool
LIB_DEPENDS= libexempi.so:textproc/exempi \
+ libfribidi.so:converters/fribidi \
libgfbgraph-0.2.so:net/gfbgraph \
libgegl-0.3.so:graphics/gegl3 \
libgrilo-0.3.so:net/grilo \
libexiv2.so:graphics/exiv2 \
libgexiv2.so:graphics/gexiv2 \
- libtracker-control-1.0.so:sysutils/tracker \
+ libtracker-control-2.0.so:sysutils/tracker \
libgeocode-glib.so:net/geocode-glib \
libgjs.so:lang/gjs \
libbabl-0.1.so:x11/babl \
@@ -30,6 +30,7 @@ LIB_DEPENDS= libexempi.so:textproc/exempi \
libsoup-2.4.so:devel/libsoup \
libjson-glib-1.0.so:devel/json-glib \
libgoa-1.0.so:net/gnome-online-accounts \
+ libdazzle-1.0.so:x11-toolkits/libdazzle \
libpng.so:graphics/png \
libgdata.so:devel/libgdata
RUN_DEPENDS= geoclue>=0:net/geoclue
@@ -38,7 +39,7 @@ PORTSCOUT= limitw:1,even
USES= compiler:c11 gettext gmake gnome jpeg libtool \
localbase pathfix pkgconfig tar:xz
-USE_GNOME= cairo gnomedesktop3 gtk30 intlhack libxml2
+USE_GNOME= cairo gnomedesktop3 gtk30 libxml2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/deskutils/gnome-photos/distinfo b/deskutils/gnome-photos/distinfo
index edb456dfd0e1..66fd7ea84d25 100644
--- a/deskutils/gnome-photos/distinfo
+++ b/deskutils/gnome-photos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494663618
-SHA256 (gnome3/gnome-photos-3.24.2.tar.xz) = 31ddc078ad2f6bc4bbfa2f71eb23377782750b9cb2ad2b0e6ff2a1971548cdf9
-SIZE (gnome3/gnome-photos-3.24.2.tar.xz) = 984372
+TIMESTAMP = 1525978749
+SHA256 (gnome3/gnome-photos-3.28.0.tar.xz) = 2160f0c6f43d6869894016ea8b7276d0da3c7f70c6c8049cff94bfcc8e0448d8
+SIZE (gnome3/gnome-photos-3.28.0.tar.xz) = 1137776
diff --git a/deskutils/gnome-photos/pkg-plist b/deskutils/gnome-photos/pkg-plist
index 712001221723..50fab45ebb55 100644
--- a/deskutils/gnome-photos/pkg-plist
+++ b/deskutils/gnome-photos/pkg-plist
@@ -1,14 +1,7 @@
bin/gnome-photos
libexec/gnome-photos-thumbnailer
-share/appdata/org.gnome.Photos.appdata.xml
share/applications/org.gnome.Photos.desktop
share/dbus-1/services/org.gnome.Photos.service
-%%DOCSDIR%%/ARTISTS
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
share/gnome-shell/search-providers/org.gnome.Photos.search-provider.ini
share/help/C/gnome-photos/favorites-set.page
share/help/C/gnome-photos/favorites.page
@@ -82,6 +75,15 @@ share/help/fr/gnome-photos/view-album.page
share/help/fr/gnome-photos/view-favorites.page
share/help/fr/gnome-photos/view-photos.page
share/help/fr/gnome-photos/view.page
+share/help/fur/gnome-photos/favorites-set.page
+share/help/fur/gnome-photos/favorites.page
+share/help/fur/gnome-photos/index.page
+share/help/fur/gnome-photos/legal.xml
+share/help/fur/gnome-photos/media/logo1.png
+share/help/fur/gnome-photos/view-album.page
+share/help/fur/gnome-photos/view-favorites.page
+share/help/fur/gnome-photos/view-photos.page
+share/help/fur/gnome-photos/view.page
share/help/gl/gnome-photos/favorites-set.page
share/help/gl/gnome-photos/favorites.page
share/help/gl/gnome-photos/index.page
@@ -109,6 +111,15 @@ share/help/ko/gnome-photos/view-album.page
share/help/ko/gnome-photos/view-favorites.page
share/help/ko/gnome-photos/view-photos.page
share/help/ko/gnome-photos/view.page
+share/help/pl/gnome-photos/favorites-set.page
+share/help/pl/gnome-photos/favorites.page
+share/help/pl/gnome-photos/index.page
+share/help/pl/gnome-photos/legal.xml
+share/help/pl/gnome-photos/media/logo1.png
+share/help/pl/gnome-photos/view-album.page
+share/help/pl/gnome-photos/view-favorites.page
+share/help/pl/gnome-photos/view-photos.page
+share/help/pl/gnome-photos/view.page
share/help/pt_BR/gnome-photos/favorites-set.page
share/help/pt_BR/gnome-photos/favorites.page
share/help/pt_BR/gnome-photos/index.page
@@ -204,3 +215,4 @@ share/locale/vi/LC_MESSAGES/gnome-photos.mo
share/locale/zh_CN/LC_MESSAGES/gnome-photos.mo
share/locale/zh_HK/LC_MESSAGES/gnome-photos.mo
share/locale/zh_TW/LC_MESSAGES/gnome-photos.mo
+share/metainfo/org.gnome.Photos.appdata.xml
diff --git a/deskutils/gnome-screenshot/Makefile b/deskutils/gnome-screenshot/Makefile
index dfcca6ef2d5a..7ef95cc8d63f 100644
--- a/deskutils/gnome-screenshot/Makefile
+++ b/deskutils/gnome-screenshot/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-screenshot
-PORTVERSION= 3.22.0
+PORTVERSION= 3.26.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -13,20 +13,22 @@ COMMENT= GNOME 3 utility for making picutures of your screen
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra
+BUILD_DEPENDS= appstream-builder:devel/appstream-glib
+LIB_DEPENDS= libcanberra.so:audio/libcanberra \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3
CONFLICTS= gnome-utils-2.[0-9]*
PORTSCOUT= limitw:1,even
-USES= gettext-tools gmake gnome localbase pathfix pkgconfig tar:xz
-USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack
+USES= gettext gnome localbase meson pkgconfig python:3.4+,build \
+ shebangfix tar:xz
+USE_GNOME= cairo gdkpixbuf2 gtk30
USE_XORG= x11 xext
-GNU_CONFIGURE= yes
+SHEBANG_FILES= build-aux/postinstall.py
GLIB_SCHEMAS= org.gnome.gnome-screenshot.gschema.xml
-OPTIONS_DEFINE= INTEL_FIX NLS
+OPTIONS_DEFINE= INTEL_FIX
OPTIONS_SUB= yes
# Workaround garbled screenshot when 3D hardware acceleration is enabled
@@ -34,7 +36,4 @@ OPTIONS_SUB= yes
INTEL_FIX_DESC= Don't try to use the gnome-shell interface
INTEL_FIX_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-intel
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_OFF= --disable-nls
-
.include <bsd.port.mk>
diff --git a/deskutils/gnome-screenshot/distinfo b/deskutils/gnome-screenshot/distinfo
index b7398986b2d8..63074636dd68 100644
--- a/deskutils/gnome-screenshot/distinfo
+++ b/deskutils/gnome-screenshot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529110023
-SHA256 (gnome3/gnome-screenshot-3.22.0.tar.xz) = 8a05f14b3c7c6cb42f9848ad0332034c7fe5c34a69742910203588fd60b00230
-SIZE (gnome3/gnome-screenshot-3.22.0.tar.xz) = 258888
+TIMESTAMP = 1516298251
+SHA256 (gnome3/gnome-screenshot-3.26.0.tar.xz) = 1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb
+SIZE (gnome3/gnome-screenshot-3.26.0.tar.xz) = 227432
diff --git a/deskutils/gnome-screenshot/files/patch-src_meson.build b/deskutils/gnome-screenshot/files/patch-src_meson.build
new file mode 100644
index 000000000000..3b9bceedf767
--- /dev/null
+++ b/deskutils/gnome-screenshot/files/patch-src_meson.build
@@ -0,0 +1,11 @@
+--- src/meson.build.orig 2018-01-18 18:06:07 UTC
++++ src/meson.build
+@@ -57,7 +57,7 @@ install_data('org.gnome.gnome-screenshot.gschema.xml',
+ install_dir: gnome_screenshot_schemadir)
+
+ install_data('gnome-screenshot.1',
+- install_dir: join_paths(gnome_screenshot_datadir, 'man', 'man1'))
++ install_dir: join_paths(gnome_screenshot_prefix, 'man', 'man1'))
+
+ install_data('gnome-screenshot.convert',
+ install_dir: join_paths(gnome_screenshot_datadir, 'GConf', 'gsettings'))
diff --git a/deskutils/gnome-screenshot/pkg-plist b/deskutils/gnome-screenshot/pkg-plist
index becb28758c06..a58d1dbc3078 100644
--- a/deskutils/gnome-screenshot/pkg-plist
+++ b/deskutils/gnome-screenshot/pkg-plist
@@ -1,102 +1,102 @@
bin/gnome-screenshot
man/man1/gnome-screenshot.1.gz
share/GConf/gsettings/gnome-screenshot.convert
-share/appdata/org.gnome.Screenshot.appdata.xml
share/applications/org.gnome.Screenshot.desktop
share/dbus-1/services/org.gnome.Screenshot.service
-%%NLS%%share/locale/af/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/am/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/an/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/as/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ast/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/az/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/be/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/be@latin/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/bn/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/bn_IN/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/br/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ca@valencia/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/crh/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/cy/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/da/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/dz/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/el/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/en@shaw/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/en_CA/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/et/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/fa/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/fur/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/gd/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/gu/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/he/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/hi/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/id/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/is/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/km/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/kn/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ku/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/mai/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/mg/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ml/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/mn/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/mr/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ne/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/oc/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/or/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ps/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/si/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/sr@latin/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/te/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/tg/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/th/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/wa/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/xh/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/zh_HK/LC_MESSAGES/gnome-screenshot.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnome-screenshot.mo
+share/locale/af/LC_MESSAGES/gnome-screenshot.mo
+share/locale/am/LC_MESSAGES/gnome-screenshot.mo
+share/locale/an/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ar/LC_MESSAGES/gnome-screenshot.mo
+share/locale/as/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ast/LC_MESSAGES/gnome-screenshot.mo
+share/locale/az/LC_MESSAGES/gnome-screenshot.mo
+share/locale/be/LC_MESSAGES/gnome-screenshot.mo
+share/locale/be@latin/LC_MESSAGES/gnome-screenshot.mo
+share/locale/bg/LC_MESSAGES/gnome-screenshot.mo
+share/locale/bn/LC_MESSAGES/gnome-screenshot.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-screenshot.mo
+share/locale/br/LC_MESSAGES/gnome-screenshot.mo
+share/locale/bs/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ca/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-screenshot.mo
+share/locale/crh/LC_MESSAGES/gnome-screenshot.mo
+share/locale/cs/LC_MESSAGES/gnome-screenshot.mo
+share/locale/cy/LC_MESSAGES/gnome-screenshot.mo
+share/locale/da/LC_MESSAGES/gnome-screenshot.mo
+share/locale/de/LC_MESSAGES/gnome-screenshot.mo
+share/locale/dz/LC_MESSAGES/gnome-screenshot.mo
+share/locale/el/LC_MESSAGES/gnome-screenshot.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-screenshot.mo
+share/locale/en_CA/LC_MESSAGES/gnome-screenshot.mo
+share/locale/en_GB/LC_MESSAGES/gnome-screenshot.mo
+share/locale/eo/LC_MESSAGES/gnome-screenshot.mo
+share/locale/es/LC_MESSAGES/gnome-screenshot.mo
+share/locale/et/LC_MESSAGES/gnome-screenshot.mo
+share/locale/eu/LC_MESSAGES/gnome-screenshot.mo
+share/locale/fa/LC_MESSAGES/gnome-screenshot.mo
+share/locale/fi/LC_MESSAGES/gnome-screenshot.mo
+share/locale/fr/LC_MESSAGES/gnome-screenshot.mo
+share/locale/fur/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ga/LC_MESSAGES/gnome-screenshot.mo
+share/locale/gd/LC_MESSAGES/gnome-screenshot.mo
+share/locale/gl/LC_MESSAGES/gnome-screenshot.mo
+share/locale/gu/LC_MESSAGES/gnome-screenshot.mo
+share/locale/he/LC_MESSAGES/gnome-screenshot.mo
+share/locale/hi/LC_MESSAGES/gnome-screenshot.mo
+share/locale/hr/LC_MESSAGES/gnome-screenshot.mo
+share/locale/hu/LC_MESSAGES/gnome-screenshot.mo
+share/locale/id/LC_MESSAGES/gnome-screenshot.mo
+share/locale/is/LC_MESSAGES/gnome-screenshot.mo
+share/locale/it/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ja/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ka/LC_MESSAGES/gnome-screenshot.mo
+share/locale/kk/LC_MESSAGES/gnome-screenshot.mo
+share/locale/km/LC_MESSAGES/gnome-screenshot.mo
+share/locale/kn/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ko/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ku/LC_MESSAGES/gnome-screenshot.mo
+share/locale/lt/LC_MESSAGES/gnome-screenshot.mo
+share/locale/lv/LC_MESSAGES/gnome-screenshot.mo
+share/locale/mai/LC_MESSAGES/gnome-screenshot.mo
+share/locale/mg/LC_MESSAGES/gnome-screenshot.mo
+share/locale/mk/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ml/LC_MESSAGES/gnome-screenshot.mo
+share/locale/mn/LC_MESSAGES/gnome-screenshot.mo
+share/locale/mr/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ms/LC_MESSAGES/gnome-screenshot.mo
+share/locale/nb/LC_MESSAGES/gnome-screenshot.mo
+share/locale/nds/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ne/LC_MESSAGES/gnome-screenshot.mo
+share/locale/nl/LC_MESSAGES/gnome-screenshot.mo
+share/locale/nn/LC_MESSAGES/gnome-screenshot.mo
+share/locale/oc/LC_MESSAGES/gnome-screenshot.mo
+share/locale/or/LC_MESSAGES/gnome-screenshot.mo
+share/locale/pa/LC_MESSAGES/gnome-screenshot.mo
+share/locale/pl/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ps/LC_MESSAGES/gnome-screenshot.mo
+share/locale/pt/LC_MESSAGES/gnome-screenshot.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ro/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ru/LC_MESSAGES/gnome-screenshot.mo
+share/locale/rw/LC_MESSAGES/gnome-screenshot.mo
+share/locale/si/LC_MESSAGES/gnome-screenshot.mo
+share/locale/sk/LC_MESSAGES/gnome-screenshot.mo
+share/locale/sl/LC_MESSAGES/gnome-screenshot.mo
+share/locale/sq/LC_MESSAGES/gnome-screenshot.mo
+share/locale/sr/LC_MESSAGES/gnome-screenshot.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-screenshot.mo
+share/locale/sv/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ta/LC_MESSAGES/gnome-screenshot.mo
+share/locale/te/LC_MESSAGES/gnome-screenshot.mo
+share/locale/tg/LC_MESSAGES/gnome-screenshot.mo
+share/locale/th/LC_MESSAGES/gnome-screenshot.mo
+share/locale/tr/LC_MESSAGES/gnome-screenshot.mo
+share/locale/ug/LC_MESSAGES/gnome-screenshot.mo
+share/locale/uk/LC_MESSAGES/gnome-screenshot.mo
+share/locale/vi/LC_MESSAGES/gnome-screenshot.mo
+share/locale/wa/LC_MESSAGES/gnome-screenshot.mo
+share/locale/xh/LC_MESSAGES/gnome-screenshot.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-screenshot.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-screenshot.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-screenshot.mo
+share/metainfo/org.gnome.Screenshot.metainfo.xml
diff --git a/deskutils/gnome-shell-extension-audio-output-switcher/Makefile b/deskutils/gnome-shell-extension-audio-output-switcher/Makefile
index c8c31553eeb8..e67552940d80 100644
--- a/deskutils/gnome-shell-extension-audio-output-switcher/Makefile
+++ b/deskutils/gnome-shell-extension-audio-output-switcher/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-audio-output-switcher
-PORTVERSION= 0.0.0.20140520
-PORTREVISION= 4
+PORTVERSION= 0.0.0.20171022
CATEGORIES= deskutils gnome
DIST_SUBDIR= gnome3
@@ -15,22 +14,20 @@ BUILD_DEPENDS= gnome-shell>=0:x11/gnome-shell \
RUN_DEPENDS= gnome-shell>=0:x11/gnome-shell \
gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
-USES= gettext gmake gnome pkgconfig
+USES= gettext gmake gnome localbase pkgconfig
USE_GNOME= glib20
USE_GITHUB= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-GH_ACCOUNT= anduchs
-GH_TAGNAME= 2bec66d
+GH_ACCOUNT= adaxi
GH_PROJECT= audio-output-switcher
+GH_TAGNAME= 89e6e29
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
NO_BUILD= yes
post-patch:
- @${REINPLACE_CMD} -e 's|3.12"|3.12","3.14","3.16", "3.18"|g' \
+ @${REINPLACE_CMD} -e 's|"3.26"|"3.26", "3.28"|g' \
${WRKSRC}/metadata.json
do-install:
diff --git a/deskutils/gnome-shell-extension-audio-output-switcher/distinfo b/deskutils/gnome-shell-extension-audio-output-switcher/distinfo
index f16388295b6f..2ffc143968ef 100644
--- a/deskutils/gnome-shell-extension-audio-output-switcher/distinfo
+++ b/deskutils/gnome-shell-extension-audio-output-switcher/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/anduchs-audio-output-switcher-0.0.0.20140520-2bec66d_GH0.tar.gz) = c74cf0deb50c0eddf1d3ecd26f2cf2d45543fad56120bc7d5c306bf9bb402f0c
-SIZE (gnome3/anduchs-audio-output-switcher-0.0.0.20140520-2bec66d_GH0.tar.gz) = 1767
+TIMESTAMP = 1526412508
+SHA256 (gnome3/adaxi-audio-output-switcher-0.0.0.20171022-89e6e29_GH0.tar.gz) = 84736ff40e658c21d2d1d1b384dd39ffbbfb654775f46be9dc51325a4499c3ef
+SIZE (gnome3/adaxi-audio-output-switcher-0.0.0.20171022-89e6e29_GH0.tar.gz) = 4253
diff --git a/deskutils/gnome-shell-extension-audio-output-switcher/pkg-plist b/deskutils/gnome-shell-extension-audio-output-switcher/pkg-plist
index 1da43045b684..08e3fc4c0e6d 100644
--- a/deskutils/gnome-shell-extension-audio-output-switcher/pkg-plist
+++ b/deskutils/gnome-shell-extension-audio-output-switcher/pkg-plist
@@ -1,3 +1,7 @@
-share/gnome-shell/extensions/audio-output-switcher@anduchs/README
+share/gnome-shell/extensions/audio-output-switcher@anduchs/README.md
share/gnome-shell/extensions/audio-output-switcher@anduchs/extension.js
share/gnome-shell/extensions/audio-output-switcher@anduchs/metadata.json
+share/gnome-shell/extensions/audio-output-switcher@anduchs/metadata.json.bak
+share/gnome-shell/extensions/audio-output-switcher@anduchs/schemas/gschemas.compiled
+share/gnome-shell/extensions/audio-output-switcher@anduchs/schemas/org.gnome.shell.extensions.audio-output-switcher.gschema.xml
+share/gnome-shell/extensions/audio-output-switcher@anduchs/utils.js
diff --git a/deskutils/gnome-shell-extension-coverflow/Makefile b/deskutils/gnome-shell-extension-coverflow/Makefile
index 2b418c12db80..d82fa72e3705 100644
--- a/deskutils/gnome-shell-extension-coverflow/Makefile
+++ b/deskutils/gnome-shell-extension-coverflow/Makefile
@@ -2,34 +2,39 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-coverflow
-PORTVERSION= 0.0.0.20151013
-PORTREVISION= 1
+PORTVERSION= 0.0.0.20180110
CATEGORIES= deskutils gnome
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Lets you Alt-Tab windows in a cover-flow manner
+LICENSE= GPLv3+
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= gnome-shell>=0:x11/gnome-shell \
gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
RUN_DEPENDS= gnome-shell>=0:x11/gnome-shell \
gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
-USES= gettext gmake gnome pkgconfig
+USES= gettext gmake gnome localbase pkgconfig
USE_GNOME= glib20
USE_GITHUB= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+
GLIB_SCHEMAS= org.gnome.shell.extensions.coverflowalttab.gschema.xml
GH_ACCOUNT= dmo60
-GH_TAGNAME= 86483f1
+GH_TAGNAME= 991e743
GH_PROJECT= CoverflowAltTab
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
NO_BUILD= yes
+post-patch:
+ @${REINPLACE_CMD} -e 's|"3.26"|"3.26","3.28"|g' \
+ ${WRKSRC}/CoverflowAltTab@dmo60.de/metadata.json
+
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
@${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/
diff --git a/deskutils/gnome-shell-extension-coverflow/distinfo b/deskutils/gnome-shell-extension-coverflow/distinfo
index 70803872cabc..2a79802fa70d 100644
--- a/deskutils/gnome-shell-extension-coverflow/distinfo
+++ b/deskutils/gnome-shell-extension-coverflow/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/dmo60-CoverflowAltTab-0.0.0.20151013-86483f1_GH0.tar.gz) = 3e26f5907a8deddb9775a1a44a01e9cffd2d982d43435d984dc7ce4bac731980
-SIZE (gnome3/dmo60-CoverflowAltTab-0.0.0.20151013-86483f1_GH0.tar.gz) = 342989
+TIMESTAMP = 1516658045
+SHA256 (gnome3/dmo60-CoverflowAltTab-0.0.0.20180110-991e743_GH0.tar.gz) = 74574d1f414fa2688f65298efa6db8b9366de57dc6397a12d1aae76d99c618eb
+SIZE (gnome3/dmo60-CoverflowAltTab-0.0.0.20180110-991e743_GH0.tar.gz) = 363155
diff --git a/deskutils/gnome-shell-extension-coverflow/pkg-plist b/deskutils/gnome-shell-extension-coverflow/pkg-plist
index 9dcdcc840104..7f1b44cfc595 100644
--- a/deskutils/gnome-shell-extension-coverflow/pkg-plist
+++ b/deskutils/gnome-shell-extension-coverflow/pkg-plist
@@ -8,10 +8,14 @@ share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/cs/LC_MESSAGES/cove
share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/cs/LC_MESSAGES/coverflow.po
share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/de/LC_MESSAGES/coverflow.mo
share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/de/LC_MESSAGES/coverflow.po
+share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/fr/LC_MESSAGES/coverflow.mo
+share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/fr/LC_MESSAGES/coverflow.po
share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/it/LC_MESSAGES/coverflow.mo
share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/it/LC_MESSAGES/coverflow.po
-share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/pt_BR/LC_MESSAGES/pt_BR.mo
-share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/pt_BR/LC_MESSAGES/pt_BR.po
+share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/pt_BR/LC_MESSAGES/coverflow.mo
+share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/pt_BR/LC_MESSAGES/coverflow.po
+share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/zh_CN/LC_MESSAGES/coverflow.mo
+share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/locale/zh_CN/LC_MESSAGES/coverflow.po
share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/manager.js
share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/metadata.json
share/gnome-shell/extensions/CoverflowAltTab@dmo60.de/platform.js
diff --git a/deskutils/gnome-shell-extension-dashtodock/Makefile b/deskutils/gnome-shell-extension-dashtodock/Makefile
index 2ac74434b53a..ae15abd7455d 100644
--- a/deskutils/gnome-shell-extension-dashtodock/Makefile
+++ b/deskutils/gnome-shell-extension-dashtodock/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-dashtodock
-PORTVERSION= 0.0.0.20151112
-PORTREVISION= 1
+PORTVERSION= 0.0.0.20180510
CATEGORIES= deskutils gnome
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Convert the dash into a dock
@@ -15,16 +14,15 @@ BUILD_DEPENDS= gnome-shell>=0:x11/gnome-shell \
RUN_DEPENDS= gnome-shell>=0:x11/gnome-shell \
gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
-USES= gettext gmake gnome pkgconfig
+USES= gettext gmake gnome localbase pkgconfig
USE_GNOME= glib20
USE_GITHUB= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+
GLIB_SCHEMAS= org.gnome.shell.extensions.dash-to-dock.gschema.xml
GH_ACCOUNT= micheleg
GH_PROJECT= dash-to-dock
-GH_TAGNAME= d058574
+GH_TAGNAME= 5e38a58
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
diff --git a/deskutils/gnome-shell-extension-dashtodock/distinfo b/deskutils/gnome-shell-extension-dashtodock/distinfo
index 33a022fcca94..4580ce86b2b8 100644
--- a/deskutils/gnome-shell-extension-dashtodock/distinfo
+++ b/deskutils/gnome-shell-extension-dashtodock/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/micheleg-dash-to-dock-0.0.0.20151112-d058574_GH0.tar.gz) = 5d91ecc420876369bba9cf56b3dc5d5cce0148be5e9a05ae1512970aa809d667
-SIZE (gnome3/micheleg-dash-to-dock-0.0.0.20151112-d058574_GH0.tar.gz) = 232914
+TIMESTAMP = 1526412972
+SHA256 (gnome/micheleg-dash-to-dock-0.0.0.20180510-5e38a58_GH0.tar.gz) = aa8fa7034c3e7e61352794f2a3936894fa48b261d6231167d54a09eb7ecdcaf5
+SIZE (gnome/micheleg-dash-to-dock-0.0.0.20180510-5e38a58_GH0.tar.gz) = 303472
diff --git a/deskutils/gnome-shell-extension-dashtodock/pkg-plist b/deskutils/gnome-shell-extension-dashtodock/pkg-plist
index 4189cafdee33..0795f67c246e 100644
--- a/deskutils/gnome-shell-extension-dashtodock/pkg-plist
+++ b/deskutils/gnome-shell-extension-dashtodock/pkg-plist
@@ -3,21 +3,32 @@ share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/COPYING
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/Makefile
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/README.md
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/Settings.ui
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/appIconIndicators.js
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/appIcons.js
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/convenience.js
-share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/dockedDash.js
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/dash.js
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/docking.js
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/extension.js
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/intellihide.js
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/launcherAPI.js
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/media/glossy.svg
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/media/highlight_stacked_bg.svg
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/media/highlight_stacked_bg_h.svg
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/media/logo.svg
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/media/screenshot.jpg
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/metadata.json
-share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/myDash.js
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/ar.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/cs.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/de.po
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/el.po
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/es.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/fr.po
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/gl.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/hu.po
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/id.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/it.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/ja.po
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/nb.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/nl.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/pl.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/pt.po
@@ -26,7 +37,14 @@ share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/ru.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/sk.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/sr.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/sr@latin.po
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/sv.po
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/tr.po
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/uk_UA.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/zh_CN.po
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/po/zh_TW.po
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/prefs.js
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/schemas/org.gnome.shell.extensions.dash-to-dock.gschema.xml
share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/stylesheet.css
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/theming.js
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/utils.js
+share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/windowPreview.js
diff --git a/deskutils/gnome-shell-extension-hidetopbar/Makefile b/deskutils/gnome-shell-extension-hidetopbar/Makefile
index e8b75610c628..3fd58f3ca5d3 100644
--- a/deskutils/gnome-shell-extension-hidetopbar/Makefile
+++ b/deskutils/gnome-shell-extension-hidetopbar/Makefile
@@ -2,14 +2,15 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-hidetopbar
-PORTVERSION= 0.0.0.20151025
-PORTREVISION= 1
+PORTVERSION= 0.0.0.20180511
CATEGORIES= deskutils gnome
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Hide the topbar except in overview mode
+LICENSE= GPLv2
+
BUILD_DEPENDS= gnome-shell>=0:x11/gnome-shell \
gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
RUN_DEPENDS= gnome-shell>=0:x11/gnome-shell \
@@ -18,13 +19,11 @@ RUN_DEPENDS= gnome-shell>=0:x11/gnome-shell \
USES= gettext gmake gnome pkgconfig
USE_GNOME= glib20
USE_GITHUB= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.shell.extensions.hidetopbar.gschema.xml
GH_ACCOUNT= mlutfy
GH_PROJECT= hidetopbar
-GH_TAGNAME= 2a899bf
+GH_TAGNAME= 7977769
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
diff --git a/deskutils/gnome-shell-extension-hidetopbar/distinfo b/deskutils/gnome-shell-extension-hidetopbar/distinfo
index 236c0aa0f0b7..63b5af9ac04c 100644
--- a/deskutils/gnome-shell-extension-hidetopbar/distinfo
+++ b/deskutils/gnome-shell-extension-hidetopbar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/mlutfy-hidetopbar-0.0.0.20151025-2a899bf_GH0.tar.gz) = fab702b4ee6a824fb95d22f91c5f7d0a5846c6041bfa91a99d602622e9cdda40
-SIZE (gnome3/mlutfy-hidetopbar-0.0.0.20151025-2a899bf_GH0.tar.gz) = 14232
+TIMESTAMP = 1526413761
+SHA256 (gnome/mlutfy-hidetopbar-0.0.0.20180511-7977769_GH0.tar.gz) = 0d582fcf2d52ca9867efc9e396ca13cceffb6d1976d37e67e7217af552bf58d6
+SIZE (gnome/mlutfy-hidetopbar-0.0.0.20180511-7977769_GH0.tar.gz) = 17790
diff --git a/deskutils/gnome-shell-extension-hidetopbar/pkg-plist b/deskutils/gnome-shell-extension-hidetopbar/pkg-plist
index 7fa26d35f713..48ba700f88cc 100644
--- a/deskutils/gnome-shell-extension-hidetopbar/pkg-plist
+++ b/deskutils/gnome-shell-extension-hidetopbar/pkg-plist
@@ -1,15 +1,22 @@
+share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/.gitignore
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/Makefile
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/README.md
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/convenience.js
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/extension.js
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/intellihide.js
+share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/ca/LC_MESSAGES/hidetopbar.mo
+share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/ca/LC_MESSAGES/hidetopbar.po
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/de/LC_MESSAGES/hidetopbar.mo
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/de/LC_MESSAGES/hidetopbar.po
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/fr/LC_MESSAGES/hidetopbar.mo
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/fr/LC_MESSAGES/hidetopbar.po
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/hidetopbar.pot
+share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/pl/LC_MESSAGES/hidetopbar.mo
+share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/pl/LC_MESSAGES/hidetopbar.po
+share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/pt_BR/LC_MESSAGES/pt_BR.mo
+share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/pt_BR/LC_MESSAGES/pt_BR.po
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/zh_CN/LC_MESSAGES/hidetopbar.mo
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/locale/zh_CN/LC_MESSAGES/hidetopbar.po
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/metadata.json
+share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/panelVisibilityManager.js
share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/prefs.js
-share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/topPanel.js
diff --git a/deskutils/gnome-shell-extension-lockkeys/Makefile b/deskutils/gnome-shell-extension-lockkeys/Makefile
index db05cd576b2a..c1c1399eb650 100644
--- a/deskutils/gnome-shell-extension-lockkeys/Makefile
+++ b/deskutils/gnome-shell-extension-lockkeys/Makefile
@@ -2,28 +2,29 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-lockkeys
-PORTVERSION= 0.0.0.20151017
-PORTREVISION= 1
+PORTVERSION= 0.0.0.20180511
CATEGORIES= deskutils gnome
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome-shell Numlock and Capslock indicator
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/lockkeys@vaina.lt/LICENSE
+
BUILD_DEPENDS= gnome-shell>=0:x11/gnome-shell \
gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
RUN_DEPENDS= gnome-shell>=0:x11/gnome-shell \
gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
-USES= gettext gmake gnome pkgconfig
+USES= gettext gmake gnome localbase pkgconfig
USE_GNOME= glib20
USE_GITHUB= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+
GLIB_SCHEMAS= org.gnome.shell.extensions.lockkeys.gschema.xml
GH_ACCOUNT= kazysmaster
-GH_TAGNAME= 222289e
+GH_TAGNAME= 0bf0917
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
diff --git a/deskutils/gnome-shell-extension-lockkeys/distinfo b/deskutils/gnome-shell-extension-lockkeys/distinfo
index 1ea34411e6ec..027b734f2061 100644
--- a/deskutils/gnome-shell-extension-lockkeys/distinfo
+++ b/deskutils/gnome-shell-extension-lockkeys/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/kazysmaster-gnome-shell-extension-lockkeys-0.0.0.20151017-222289e_GH0.tar.gz) = b34bc9b7b638d5319081d1ccfaee8192063b583a3dab8e032d098568e15aba14
-SIZE (gnome3/kazysmaster-gnome-shell-extension-lockkeys-0.0.0.20151017-222289e_GH0.tar.gz) = 40711
+TIMESTAMP = 1526414956
+SHA256 (gnome/kazysmaster-gnome-shell-extension-lockkeys-0.0.0.20180511-0bf0917_GH0.tar.gz) = c5b0016a8cc5a2af7ffa74cb541163a10ad36310fcecf3513403dba577f6cb98
+SIZE (gnome/kazysmaster-gnome-shell-extension-lockkeys-0.0.0.20180511-0bf0917_GH0.tar.gz) = 42140
diff --git a/deskutils/gnome-shell-extension-lockkeys/pkg-plist b/deskutils/gnome-shell-extension-lockkeys/pkg-plist
index ee100a3f3bd0..cc59e2b44eba 100644
--- a/deskutils/gnome-shell-extension-lockkeys/pkg-plist
+++ b/deskutils/gnome-shell-extension-lockkeys/pkg-plist
@@ -4,9 +4,11 @@ share/gnome-shell/extensions/lockkeys@vaina.lt/icons/capslock-disabled-symbolic.
share/gnome-shell/extensions/lockkeys@vaina.lt/icons/capslock-enabled-symbolic.svg
share/gnome-shell/extensions/lockkeys@vaina.lt/icons/numlock-disabled-symbolic.svg
share/gnome-shell/extensions/lockkeys@vaina.lt/icons/numlock-enabled-symbolic.svg
+share/gnome-shell/extensions/lockkeys@vaina.lt/locale/cs/LC_MESSAGES/lockkeys.mo
share/gnome-shell/extensions/lockkeys@vaina.lt/locale/de/LC_MESSAGES/lockkeys.mo
share/gnome-shell/extensions/lockkeys@vaina.lt/locale/es/LC_MESSAGES/lockkeys.mo
share/gnome-shell/extensions/lockkeys@vaina.lt/locale/fr/LC_MESSAGES/lockkeys.mo
+share/gnome-shell/extensions/lockkeys@vaina.lt/locale/gr/LC_MESSAGES/lockkeys.mo
share/gnome-shell/extensions/lockkeys@vaina.lt/locale/lt/LC_MESSAGES/lockkeys.mo
share/gnome-shell/extensions/lockkeys@vaina.lt/locale/pl/LC_MESSAGES/lockkeys.mo
share/gnome-shell/extensions/lockkeys@vaina.lt/locale/sv/LC_MESSAGES/lockkeys.mo
diff --git a/deskutils/gnome-shell-extension-mediaplayer/Makefile b/deskutils/gnome-shell-extension-mediaplayer/Makefile
index f475228874f4..8aef658263e5 100644
--- a/deskutils/gnome-shell-extension-mediaplayer/Makefile
+++ b/deskutils/gnome-shell-extension-mediaplayer/Makefile
@@ -2,31 +2,36 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-mediaplayer
-PORTVERSION= 0.0.0.20151118
+PORTVERSION= 0.0.0.20180316
CATEGORIES= deskutils gnome
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= MPRIS2 extension for the GNOME3 shell
-BUILD_DEPENDS= gnome-autogen.sh:devel/gnome-common \
- gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+BUILD_DEPENDS= gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
RUN_DEPENDS= gnome-shell>=0:x11/gnome-shell \
gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
-USES= autoreconf gettext gmake gnome libtool pkgconfig
+USES= gettext gnome meson pkgconfig python:3.4+,build
USE_GNOME= glib20 intltool
-USE_GITHUB= yes
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+
+BINARY_ALIAS= python3=${PYTHON_VERSION}
+
GLIB_SCHEMAS= org.gnome.shell.extensions.mediaplayer.gschema.xml
-GH_ACCOUNT= eonpatapon
+USE_GITHUB= yes
+GH_ACCOUNT= JasonLG1979
GH_PROJECT= gnome-shell-extensions-mediaplayer
-GH_TAGNAME= ffabc47
+GH_TAGNAME= 9653b7d
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
+post-install:
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
+ @${MV} "${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/mediaplayer@patapon.info/schemas/org.gnome.shell.extensions.mediaplayer.gschema.xml" \
+ ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
+ @${RMDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/mediaplayer@patapon.info/schemas
+
.include <bsd.port.mk>
diff --git a/deskutils/gnome-shell-extension-mediaplayer/distinfo b/deskutils/gnome-shell-extension-mediaplayer/distinfo
index 385aa819381d..0505ddc847a2 100644
--- a/deskutils/gnome-shell-extension-mediaplayer/distinfo
+++ b/deskutils/gnome-shell-extension-mediaplayer/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/eonpatapon-gnome-shell-extensions-mediaplayer-0.0.0.20151118-ffabc47_GH0.tar.gz) = 5aa2bafb907f4bacf2dd07af2d9b7b1679d97a10e6791322d7af35dfcc1d77ae
-SIZE (gnome3/eonpatapon-gnome-shell-extensions-mediaplayer-0.0.0.20151118-ffabc47_GH0.tar.gz) = 182804
+TIMESTAMP = 1527932722
+SHA256 (gnome3/JasonLG1979-gnome-shell-extensions-mediaplayer-0.0.0.20180316-9653b7d_GH0.tar.gz) = db6b2b299799f03b69874931d0ad6e007f22d5fab013fb598fdc3ad487adc95d
+SIZE (gnome3/JasonLG1979-gnome-shell-extensions-mediaplayer-0.0.0.20180316-9653b7d_GH0.tar.gz) = 246978
diff --git a/deskutils/gnome-shell-extension-mediaplayer/pkg-plist b/deskutils/gnome-shell-extension-mediaplayer/pkg-plist
index 9b3479c859d0..bb9a9fc7917e 100644
--- a/deskutils/gnome-shell-extension-mediaplayer/pkg-plist
+++ b/deskutils/gnome-shell-extension-mediaplayer/pkg-plist
@@ -3,12 +3,14 @@ share/gnome-shell/extensions/mediaplayer@patapon.info/extension.js
share/gnome-shell/extensions/mediaplayer@patapon.info/lib.js
share/gnome-shell/extensions/mediaplayer@patapon.info/manager.js
share/gnome-shell/extensions/mediaplayer@patapon.info/metadata.json
+share/gnome-shell/extensions/mediaplayer@patapon.info/mpi-symbolic.svg
share/gnome-shell/extensions/mediaplayer@patapon.info/panel.js
share/gnome-shell/extensions/mediaplayer@patapon.info/player.js
share/gnome-shell/extensions/mediaplayer@patapon.info/prefs.js
share/gnome-shell/extensions/mediaplayer@patapon.info/settings.js
share/gnome-shell/extensions/mediaplayer@patapon.info/stylesheet.css
share/gnome-shell/extensions/mediaplayer@patapon.info/ui.js
+share/gnome-shell/extensions/mediaplayer@patapon.info/util.js
share/gnome-shell/extensions/mediaplayer@patapon.info/widget.js
share/locale/de/LC_MESSAGES/gnome-shell-extensions-mediaplayer.mo
share/locale/es/LC_MESSAGES/gnome-shell-extensions-mediaplayer.mo
@@ -17,6 +19,7 @@ share/locale/gl/LC_MESSAGES/gnome-shell-extensions-mediaplayer.mo
share/locale/he/LC_MESSAGES/gnome-shell-extensions-mediaplayer.mo
share/locale/it/LC_MESSAGES/gnome-shell-extensions-mediaplayer.mo
share/locale/lt/LC_MESSAGES/gnome-shell-extensions-mediaplayer.mo
+share/locale/nb_NO/LC_MESSAGES/gnome-shell-extensions-mediaplayer.mo
share/locale/nl/LC_MESSAGES/gnome-shell-extensions-mediaplayer.mo
share/locale/pl/LC_MESSAGES/gnome-shell-extensions-mediaplayer.mo
share/locale/pt_BR/LC_MESSAGES/gnome-shell-extensions-mediaplayer.mo
diff --git a/deskutils/gnome-shell-extension-openweather/Makefile b/deskutils/gnome-shell-extension-openweather/Makefile
index ccab51c6d4b1..0abd1a4cca18 100644
--- a/deskutils/gnome-shell-extension-openweather/Makefile
+++ b/deskutils/gnome-shell-extension-openweather/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-openweather
-PORTVERSION= 0.0.0.20151114
+PORTVERSION= 0.0.0.20171126
CATEGORIES= deskutils gnome
DIST_SUBDIR= gnome3
@@ -19,12 +19,10 @@ USE_GNOME= glib20 intltool
USE_GITHUB= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.shell.extensions.openweather.gschema.xml
GH_ACCOUNT= jenslody
-GH_TAGNAME= 6337eb2
+GH_TAGNAME= 851d680
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
diff --git a/deskutils/gnome-shell-extension-openweather/distinfo b/deskutils/gnome-shell-extension-openweather/distinfo
index cda0e567ac84..7876d3f1ef15 100644
--- a/deskutils/gnome-shell-extension-openweather/distinfo
+++ b/deskutils/gnome-shell-extension-openweather/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/jenslody-gnome-shell-extension-openweather-0.0.0.20151114-6337eb2_GH0.tar.gz) = b9eb606445743706f203465c9f37e13d12bb96d66b5d6490bd66c13fdd935d03
-SIZE (gnome3/jenslody-gnome-shell-extension-openweather-0.0.0.20151114-6337eb2_GH0.tar.gz) = 515672
+TIMESTAMP = 1526893534
+SHA256 (gnome3/jenslody-gnome-shell-extension-openweather-0.0.0.20171126-851d680_GH0.tar.gz) = cd83c72d4603558de1c29f71e1d477de12c18d1953a69f1f9498cf090759f834
+SIZE (gnome3/jenslody-gnome-shell-extension-openweather-0.0.0.20171126-851d680_GH0.tar.gz) = 542257
diff --git a/deskutils/gnome-shell-extension-openweather/pkg-plist b/deskutils/gnome-shell-extension-openweather/pkg-plist
index b0d087fe1232..d4b39b2322fc 100644
--- a/deskutils/gnome-shell-extension-openweather/pkg-plist
+++ b/deskutils/gnome-shell-extension-openweather/pkg-plist
@@ -1,12 +1,13 @@
share/gnome-shell/extensions/openweather-extension@jenslody.de/OpenWeather.png
share/gnome-shell/extensions/openweather-extension@jenslody.de/convenience.js
+share/gnome-shell/extensions/openweather-extension@jenslody.de/darksky_net.js
share/gnome-shell/extensions/openweather-extension@jenslody.de/extension.js
-share/gnome-shell/extensions/openweather-extension@jenslody.de/forecast_io.js
share/gnome-shell/extensions/openweather-extension@jenslody.de/metadata.json
share/gnome-shell/extensions/openweather-extension@jenslody.de/openweathermap_org.js
share/gnome-shell/extensions/openweather-extension@jenslody.de/prefs.js
share/gnome-shell/extensions/openweather-extension@jenslody.de/stylesheet.css
share/gnome-shell/extensions/openweather-extension@jenslody.de/weather-settings.ui
+share/locale/ar/LC_MESSAGES/gnome-shell-extension-openweather.mo
share/locale/bg/LC_MESSAGES/gnome-shell-extension-openweather.mo
share/locale/ca/LC_MESSAGES/gnome-shell-extension-openweather.mo
share/locale/cs/LC_MESSAGES/gnome-shell-extension-openweather.mo
@@ -14,6 +15,7 @@ share/locale/da/LC_MESSAGES/gnome-shell-extension-openweather.mo
share/locale/de/LC_MESSAGES/gnome-shell-extension-openweather.mo
share/locale/el/LC_MESSAGES/gnome-shell-extension-openweather.mo
share/locale/es/LC_MESSAGES/gnome-shell-extension-openweather.mo
+share/locale/eu/LC_MESSAGES/gnome-shell-extension-openweather.mo
share/locale/fi/LC_MESSAGES/gnome-shell-extension-openweather.mo
share/locale/fr/LC_MESSAGES/gnome-shell-extension-openweather.mo
share/locale/he/LC_MESSAGES/gnome-shell-extension-openweather.mo
diff --git a/deskutils/gnome-shell-extension-overlay-icons/Makefile b/deskutils/gnome-shell-extension-overlay-icons/Makefile
deleted file mode 100644
index 8b774f729977..000000000000
--- a/deskutils/gnome-shell-extension-overlay-icons/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
-# $FreeBSD$
-
-PORTNAME= gnome-shell-extension-overlay-icons
-PORTVERSION= 0.0.0.20151015
-PORTREVISION= 1
-CATEGORIES= deskutils gnome
-DIST_SUBDIR= gnome3
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Show application icons on the windows overview
-
-BUILD_DEPENDS= gnome-shell>=0:x11/gnome-shell \
- gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
-RUN_DEPENDS= gnome-shell>=0:x11/gnome-shell \
- gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
-
-USES= gettext gmake gnome pkgconfig
-USE_GNOME= glib20
-USE_GITHUB= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-GLIB_SCHEMAS= org.gnome.shell.extensions.windowoverlay-icons.gschema.xml
-
-GH_ACCOUNT= sustmi
-GH_PROJECT= gnome-shell-extensions-sustmi
-GH_TAGNAME= e8200b3
-
-PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
-
-NO_BUILD= yes
-
-do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/
- cd ${WRKSRC} && ${INSTALL_DATA} ${WRKSRC}/windowoverlay-icons/schemas/org.gnome.shell.extensions.windowoverlay-icons.gschema.xml \
- ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
- @${RM} -r ${WRKSRC}/windowoverlay-icons/schemas/
- cd ${WRKSRC}/windowoverlay-icons && ${COPYTREE_SHARE} . \
- ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz
-
-.include <bsd.port.mk>
diff --git a/deskutils/gnome-shell-extension-overlay-icons/distinfo b/deskutils/gnome-shell-extension-overlay-icons/distinfo
deleted file mode 100644
index 93b56aa1f9f7..000000000000
--- a/deskutils/gnome-shell-extension-overlay-icons/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome3/sustmi-gnome-shell-extensions-sustmi-0.0.0.20151015-e8200b3_GH0.tar.gz) = 85d6207e423df02b17aa54c2546bfda07c1ad1fd1133c94a76b90e49ef61fbac
-SIZE (gnome3/sustmi-gnome-shell-extensions-sustmi-0.0.0.20151015-e8200b3_GH0.tar.gz) = 22367
diff --git a/deskutils/gnome-shell-extension-overlay-icons/pkg-plist b/deskutils/gnome-shell-extension-overlay-icons/pkg-plist
deleted file mode 100644
index 79ba018a6340..000000000000
--- a/deskutils/gnome-shell-extension-overlay-icons/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/convenience.js
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/extension.js
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/locale/cs/LC_MESSAGES/windowoverlay-icons.mo
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/locale/de/LC_MESSAGES/windowoverlay-icons.mo
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/locale/en/LC_MESSAGES/windowoverlay-icons.mo
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/locale/ja/LC_MESSAGES/windowoverlay-icons.mo
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/locale/pt_BR/LC_MESSAGES/windowoverlay-icons.mo
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/metadata.json
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/po/build_locales.sh
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/po/cs.po
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/po/de.po
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/po/en.po
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/po/ja.po
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/po/pt_BR.po
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/po/windowoverlay-icons.pot
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/prefs.js
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/prefs.xml
-share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz/stylesheet.css
diff --git a/deskutils/gnome-shell-extension-panel-osd/Makefile b/deskutils/gnome-shell-extension-panel-osd/Makefile
index 32072bd7306a..217e675038c6 100644
--- a/deskutils/gnome-shell-extension-panel-osd/Makefile
+++ b/deskutils/gnome-shell-extension-panel-osd/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-panel-osd
-PORTVERSION= 0.0.0.20151111
+PORTVERSION= 0.0.0.20171023
CATEGORIES= deskutils gnome
DIST_SUBDIR= gnome3
@@ -18,13 +18,15 @@ USE_GNOME= glib20 intltool
USE_GITHUB= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.shell.extensions.panel-osd.gschema.xml
GH_ACCOUNT= jenslody
-GH_TAGNAME= 61c1bd4
+GH_TAGNAME= 43d5f29
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
+post-patch:
+ @${REINPLACE_CMD} -e 's|"3.26"|"3.26", "3.28"|g' \
+ ${WRKSRC}/data/metadata.json.in
+
.include <bsd.port.mk>
diff --git a/deskutils/gnome-shell-extension-panel-osd/distinfo b/deskutils/gnome-shell-extension-panel-osd/distinfo
index 011c2b2da4e3..55904948b927 100644
--- a/deskutils/gnome-shell-extension-panel-osd/distinfo
+++ b/deskutils/gnome-shell-extension-panel-osd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/jenslody-gnome-shell-extension-panel-osd-0.0.0.20151111-61c1bd4_GH0.tar.gz) = 6b8bc2dfef44b6a7056345806d0a55c8cbc5b5db35afbb4ab864a1249a7f89e5
-SIZE (gnome3/jenslody-gnome-shell-extension-panel-osd-0.0.0.20151111-61c1bd4_GH0.tar.gz) = 207690
+TIMESTAMP = 1526896229
+SHA256 (gnome3/jenslody-gnome-shell-extension-panel-osd-0.0.0.20171023-43d5f29_GH0.tar.gz) = e432f5f6855db7bc97e2ee73cf1bac30c62822d816de81e26dd062641f818a19
+SIZE (gnome3/jenslody-gnome-shell-extension-panel-osd-0.0.0.20171023-43d5f29_GH0.tar.gz) = 212356
diff --git a/deskutils/gnome-shell-extension-panel-osd/pkg-plist b/deskutils/gnome-shell-extension-panel-osd/pkg-plist
index 29461b987ccc..44ff8d1829da 100644
--- a/deskutils/gnome-shell-extension-panel-osd/pkg-plist
+++ b/deskutils/gnome-shell-extension-panel-osd/pkg-plist
@@ -4,5 +4,8 @@ share/gnome-shell/extensions/panel-osd@berend.de.schouwer.gmail.com/metadata.jso
share/gnome-shell/extensions/panel-osd@berend.de.schouwer.gmail.com/panel-osd-settings.ui
share/gnome-shell/extensions/panel-osd@berend.de.schouwer.gmail.com/prefs.js
share/locale/de/LC_MESSAGES/gnome-shell-extension-panel-osd.mo
+share/locale/es/LC_MESSAGES/gnome-shell-extension-panel-osd.mo
+share/locale/pl/LC_MESSAGES/gnome-shell-extension-panel-osd.mo
share/locale/pt_BR/LC_MESSAGES/gnome-shell-extension-panel-osd.mo
+share/locale/ru/LC_MESSAGES/gnome-shell-extension-panel-osd.mo
share/locale/zh_CN/LC_MESSAGES/gnome-shell-extension-panel-osd.mo
diff --git a/deskutils/gnome-shell-extension-recent-items/Makefile b/deskutils/gnome-shell-extension-recent-items/Makefile
index bfabe4bc7b87..15f7f3a5594b 100644
--- a/deskutils/gnome-shell-extension-recent-items/Makefile
+++ b/deskutils/gnome-shell-extension-recent-items/Makefile
@@ -2,28 +2,34 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-recent-items
-PORTVERSION= 13
+PORTVERSION= 15
CATEGORIES= deskutils gnome
-MASTER_SITES= http://www.bananenfisch.net/code/
-DISTNAME= RecentItems-${PORTVERSION}
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Recent items extensions for the GNOME3 shell
-WRKSRC= ${WRKDIR}/RecentItems@bananenfisch.net
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GNOME= glib20
USE_LDCONFIG= yes
+USE_GITHUB= yes
+GH_ACCOUNT= bananenfisch
+GH_PROJECT= RecentItems
+
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
NO_BUILD= yes
+post-patch:
+ @${REINPLACE_CMD} -e 's|"3.22"|"3.22","3.24","3.26","3.28"|g' \
+ ${WRKSRC}/metadata.json
+
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/RecentItems@bananenfisch.net
cd ${WRKSRC} && ${COPYTREE_SHARE} . \
${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/RecentItems@bananenfisch.net
- @chmod +r ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/RecentItems@bananenfisch.net/metadata.json
.include <bsd.port.mk>
diff --git a/deskutils/gnome-shell-extension-recent-items/distinfo b/deskutils/gnome-shell-extension-recent-items/distinfo
index 50a970fe4db3..5a9908ae0f53 100644
--- a/deskutils/gnome-shell-extension-recent-items/distinfo
+++ b/deskutils/gnome-shell-extension-recent-items/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/RecentItems-13.tar.gz) = 5392dd1b033704fcaae137e478a0192bebaf4cccb8935175b21479ba7946038e
-SIZE (gnome3/RecentItems-13.tar.gz) = 2311
+TIMESTAMP = 1526896676
+SHA256 (gnome3/bananenfisch-RecentItems-15_GH0.tar.gz) = f8f6e973d6f464dedc29ce2ab47973af6812239ca3cb67c27b46c6fa2c89970a
+SIZE (gnome3/bananenfisch-RecentItems-15_GH0.tar.gz) = 14811
diff --git a/deskutils/gnome-shell-extension-recent-items/pkg-plist b/deskutils/gnome-shell-extension-recent-items/pkg-plist
index 18b3c6fbe3fe..8a3120162041 100644
--- a/deskutils/gnome-shell-extension-recent-items/pkg-plist
+++ b/deskutils/gnome-shell-extension-recent-items/pkg-plist
@@ -1,2 +1,5 @@
+share/gnome-shell/extensions/RecentItems@bananenfisch.net/LICENSE
+share/gnome-shell/extensions/RecentItems@bananenfisch.net/README.md
share/gnome-shell/extensions/RecentItems@bananenfisch.net/extension.js
share/gnome-shell/extensions/RecentItems@bananenfisch.net/metadata.json
+share/gnome-shell/extensions/RecentItems@bananenfisch.net/metadata.json.bak
diff --git a/deskutils/gnome-shell-extension-trash/Makefile b/deskutils/gnome-shell-extension-trash/Makefile
index baf1cbaf4ff7..7a17cd8b0baf 100644
--- a/deskutils/gnome-shell-extension-trash/Makefile
+++ b/deskutils/gnome-shell-extension-trash/Makefile
@@ -2,14 +2,16 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-trash
-PORTVERSION= 0.0.0.20150923
-PORTREVISION= 1
+PORTVERSION= 0.0.0.20171125
CATEGORIES= deskutils gnome
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome-shell trash indicator
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= gnome-shell>=0:x11/gnome-shell \
gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
RUN_DEPENDS= gnome-shell>=0:x11/gnome-shell \
@@ -23,14 +25,14 @@ LDFLAGS+= -L${LOCALBASE}/lib
GH_ACCOUNT= bertoldia
GH_PROJECT= gnome-shell-trash-extension
-GH_TAGNAME= 56f18ae
+GH_TAGNAME= ad5cc74
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
NO_BUILD= yes
post-patch:
- @${REINPLACE_CMD} -e 's|"3.16"|"3.18", "3.16"|g' \
+ @${REINPLACE_CMD} -e 's|"3.26",|"3.28","3.26",|g' \
${WRKSRC}/metadata.json
do-install:
diff --git a/deskutils/gnome-shell-extension-trash/distinfo b/deskutils/gnome-shell-extension-trash/distinfo
index 83215225ca28..fbfe3a980154 100644
--- a/deskutils/gnome-shell-extension-trash/distinfo
+++ b/deskutils/gnome-shell-extension-trash/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/bertoldia-gnome-shell-trash-extension-0.0.0.20150923-56f18ae_GH0.tar.gz) = fd36fea8c71907c40a369599499f70b7cedd7e0e1b8e61a80e10a21af64f199b
-SIZE (gnome3/bertoldia-gnome-shell-trash-extension-0.0.0.20150923-56f18ae_GH0.tar.gz) = 4775
+TIMESTAMP = 1526896983
+SHA256 (gnome3/bertoldia-gnome-shell-trash-extension-0.0.0.20171125-ad5cc74_GH0.tar.gz) = ca7ab7f4a9c9c0788ca7a410de3d15a791b9803dac72cf4dcdd9df62b42ef5de
+SIZE (gnome3/bertoldia-gnome-shell-trash-extension-0.0.0.20171125-ad5cc74_GH0.tar.gz) = 16900
diff --git a/deskutils/gnome-shell-extension-trash/pkg-plist b/deskutils/gnome-shell-extension-trash/pkg-plist
index 6244cd9f5bc5..0e9bf2e254be 100644
--- a/deskutils/gnome-shell-extension-trash/pkg-plist
+++ b/deskutils/gnome-shell-extension-trash/pkg-plist
@@ -1,4 +1,6 @@
-share/gnome-shell/extensions/gnome-shell-trash-extension/README
+share/gnome-shell/extensions/gnome-shell-trash-extension/LICENSE
+share/gnome-shell/extensions/gnome-shell-trash-extension/Makefile
+share/gnome-shell/extensions/gnome-shell-trash-extension/README.md
share/gnome-shell/extensions/gnome-shell-trash-extension/extension.js
share/gnome-shell/extensions/gnome-shell-trash-extension/locale/de/LC_MESSAGES/gnome-shell-trash-extension.mo
share/gnome-shell/extensions/gnome-shell-trash-extension/locale/fr/LC_MESSAGES/gnome-shell-trash-extension.mo
diff --git a/deskutils/gnome-shell-extension-weather/Makefile b/deskutils/gnome-shell-extension-weather/Makefile
index 7d42eb9fe865..43db49905e8b 100644
--- a/deskutils/gnome-shell-extension-weather/Makefile
+++ b/deskutils/gnome-shell-extension-weather/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-shell-extension-weather
-PORTVERSION= 0.0.0.20151011
+PORTVERSION= 0.0.0.20180411
CATEGORIES= deskutils gnome
DIST_SUBDIR= gnome3
@@ -16,11 +16,9 @@ USE_GNOME= glib20 intlhack
USE_GITHUB= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GH_ACCOUNT= Neroth
-GH_TAGNAME= 5c44f2f
+GH_TAGNAME= ea2d56a
PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
diff --git a/deskutils/gnome-shell-extension-weather/distinfo b/deskutils/gnome-shell-extension-weather/distinfo
index f48d1bc56f03..88616697fee7 100644
--- a/deskutils/gnome-shell-extension-weather/distinfo
+++ b/deskutils/gnome-shell-extension-weather/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/Neroth-gnome-shell-extension-weather-0.0.0.20151011-5c44f2f_GH0.tar.gz) = aa14e01780909cf790455a628be7d18746a36680edc4ce91d7465d22cfedd493
-SIZE (gnome3/Neroth-gnome-shell-extension-weather-0.0.0.20151011-5c44f2f_GH0.tar.gz) = 290721
+TIMESTAMP = 1526897170
+SHA256 (gnome3/Neroth-gnome-shell-extension-weather-0.0.0.20180411-ea2d56a_GH0.tar.gz) = cd6d4187406b925136d855026eb8789bc898d14ca72464ec9369231f2096f298
+SIZE (gnome3/Neroth-gnome-shell-extension-weather-0.0.0.20180411-ea2d56a_GH0.tar.gz) = 291512
diff --git a/deskutils/gnome-shell-extension-windowoverlay-icons/Makefile b/deskutils/gnome-shell-extension-windowoverlay-icons/Makefile
new file mode 100644
index 000000000000..cbf9cf347ce4
--- /dev/null
+++ b/deskutils/gnome-shell-extension-windowoverlay-icons/Makefile
@@ -0,0 +1,53 @@
+# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
+# $FreeBSD$
+
+PORTNAME= gnome-shell-extension-windowoverlay-icons
+PORTVERSION= 0.0.0.20171103
+CATEGORIES= deskutils gnome
+DIST_SUBDIR= gnome3
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Show application icons on the windows overview
+
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= gnome-shell>=0:x11/gnome-shell \
+ gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS= gnome-shell>=0:x11/gnome-shell \
+ gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+
+USES= gettext gmake gnome pkgconfig
+USE_GNOME= glib20
+USE_GITHUB= yes
+GLIB_SCHEMAS= org.gnome.shell.extensions.windowoverlay-icons.gschema.xml
+
+GH_ACCOUNT= sustmi
+GH_PROJECT= gnome-shell-extension-windowoverlay-icons
+GH_TAGNAME= ad7366d
+
+PKGMESSAGE= ../gnome-shell-extra-extensions/pkg-message.slaves
+
+FILES= README.md convenience.js \
+ extension.js metadata.json \
+ prefs.js prefs.xml \
+ stylesheet.css
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|"3.26"|"3.26","3.28"|g' \
+ ${WRKSRC}/metadata.json
+
+do-install:
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com
+ cd ${WRKSRC} && ${INSTALL_DATA} ${WRKSRC}/schemas/org.gnome.shell.extensions.windowoverlay-icons.gschema.xml \
+ ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
+.for file in ${FILES}
+ ${INSTALL_DATA} ${WRKSRC}/${file} \
+ ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com/
+.endfor
+ cd ${WRKSRC}/locale && ${COPYTREE_SHARE} . \
+ ${STAGEDIR}${PREFIX}/share/locale/
+ @${RM} ${STAGEDIR}${PREFIX}/share/locale/.gitkeep
+
+.include <bsd.port.mk>
diff --git a/deskutils/gnome-shell-extension-windowoverlay-icons/distinfo b/deskutils/gnome-shell-extension-windowoverlay-icons/distinfo
new file mode 100644
index 000000000000..3c42ae930fd0
--- /dev/null
+++ b/deskutils/gnome-shell-extension-windowoverlay-icons/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1526894102
+SHA256 (gnome3/sustmi-gnome-shell-extension-windowoverlay-icons-0.0.0.20171103-ad7366d_GH0.tar.gz) = 49e9f7fe030a7c756beb7e505629a49da0125526c0cbf567c4535a525f1dfd06
+SIZE (gnome3/sustmi-gnome-shell-extension-windowoverlay-icons-0.0.0.20171103-ad7366d_GH0.tar.gz) = 20539
diff --git a/deskutils/gnome-shell-extension-overlay-icons/pkg-descr b/deskutils/gnome-shell-extension-windowoverlay-icons/pkg-descr
index a86f535de0af..a86f535de0af 100644
--- a/deskutils/gnome-shell-extension-overlay-icons/pkg-descr
+++ b/deskutils/gnome-shell-extension-windowoverlay-icons/pkg-descr
diff --git a/deskutils/gnome-shell-extension-windowoverlay-icons/pkg-plist b/deskutils/gnome-shell-extension-windowoverlay-icons/pkg-plist
new file mode 100644
index 000000000000..e4e72f087150
--- /dev/null
+++ b/deskutils/gnome-shell-extension-windowoverlay-icons/pkg-plist
@@ -0,0 +1,14 @@
+share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com/README.md
+share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com/convenience.js
+share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com/extension.js
+share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com/metadata.json
+share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com/prefs.js
+share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com/prefs.xml
+share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com/stylesheet.css
+share/locale/cs/LC_MESSAGES/windowoverlay-icons.mo
+share/locale/de/LC_MESSAGES/windowoverlay-icons.mo
+share/locale/en/LC_MESSAGES/windowoverlay-icons.mo
+share/locale/fr/LC_MESSAGES/windowoverlay-icons.mo
+share/locale/it/LC_MESSAGES/windowoverlay-icons.mo
+share/locale/ja/LC_MESSAGES/windowoverlay-icons.mo
+share/locale/pt_BR/LC_MESSAGES/windowoverlay-icons.mo
diff --git a/deskutils/gnome-shell-extra-extensions/Makefile b/deskutils/gnome-shell-extra-extensions/Makefile
index 7adc9f334258..4f063a7907c4 100644
--- a/deskutils/gnome-shell-extra-extensions/Makefile
+++ b/deskutils/gnome-shell-extra-extensions/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-shell-extra-extensions
-PORTVERSION= 3.18.0
+PORTVERSION= 3.28
CATEGORIES= deskutils gnome
MAINTAINER= gnome@FreeBSD.org
@@ -15,7 +15,7 @@ RUN_DEPENDS= gnome-shell-extension-weather>=0:deskutils/gnome-shell-extension-we
gnome-shell-extension-panel-osd>=0:deskutils/gnome-shell-extension-panel-osd \
gnome-shell-extension-mediaplayer>=0:deskutils/gnome-shell-extension-mediaplayer \
gnome-shell-extension-coverflow>=0:deskutils/gnome-shell-extension-coverflow \
- gnome-shell-extension-overlay-icons>=0:deskutils/gnome-shell-extension-overlay-icons \
+ gnome-shell-extension-windowoverlay-icons>=0:deskutils/gnome-shell-extension-windowoverlay-icons \
gnome-shell-extension-hidetopbar>=0:deskutils/gnome-shell-extension-hidetopbar \
gnome-shell-extension-lockkeys>=0:deskutils/gnome-shell-extension-lockkeys \
gnome-shell-extension-trash>=0:deskutils/gnome-shell-extension-trash \
diff --git a/deskutils/gnome-sound-recorder/Makefile b/deskutils/gnome-sound-recorder/Makefile
index f04f9171ef9a..70adb0b53788 100644
--- a/deskutils/gnome-sound-recorder/Makefile
+++ b/deskutils/gnome-sound-recorder/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-sound-recorder
-PORTVERSION= 3.18.2
+PORTVERSION= 3.28.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -14,13 +14,13 @@ LIB_DEPENDS= libgjs.so:lang/gjs
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool pathfix pkgconfig python:3.4+ tar:xz
-USE_GNOME= gnomedesktop3 gtk30 intlhack introspection:build
+USES= gettext gmake gnome libtool localbase pathfix \
+ pkgconfig python:3.4+ tar:xz
+USE_GNOME= gtk30 intlhack introspection
+USE_GSTREAMER1= flac ogg pulse
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.gnome-sound-recorder.gschema.xml
.include <bsd.port.mk>
diff --git a/deskutils/gnome-sound-recorder/distinfo b/deskutils/gnome-sound-recorder/distinfo
index 4cd4b862043b..e908abc93575 100644
--- a/deskutils/gnome-sound-recorder/distinfo
+++ b/deskutils/gnome-sound-recorder/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-sound-recorder-3.18.2.tar.xz) = 6f008f81ae760cee297a6a3c8e8b9418005c06897bff973a1e845a4f8c3e202b
-SIZE (gnome3/gnome-sound-recorder-3.18.2.tar.xz) = 453944
+TIMESTAMP = 1525978108
+SHA256 (gnome3/gnome-sound-recorder-3.28.1.tar.xz) = 1e4b67c6fae4ca084ab432a50818d39a3d5a430eb2995b86523ce40d83cc1a78
+SIZE (gnome3/gnome-sound-recorder-3.28.1.tar.xz) = 458764
diff --git a/deskutils/gnome-sound-recorder/pkg-plist b/deskutils/gnome-sound-recorder/pkg-plist
index c7cd608dc0e0..f76000419370 100644
--- a/deskutils/gnome-sound-recorder/pkg-plist
+++ b/deskutils/gnome-sound-recorder/pkg-plist
@@ -1,23 +1,20 @@
bin/gnome-sound-recorder
-share/appdata/org.gnome.SoundRecorder.appdata.xml
share/applications/org.gnome.SoundRecorder.desktop
%%DATADIR%%/application.css
%%DATADIR%%/org.gnome.SoundRecorder
%%DATADIR%%/org.gnome.SoundRecorder.src.gresource
-share/icons/HighContrast/16x16/apps/gnome-sound-recorder.png
-share/icons/HighContrast/22x22/apps/gnome-sound-recorder.png
-share/icons/HighContrast/24x24/apps/gnome-sound-recorder.png
-share/icons/HighContrast/256x256/apps/gnome-sound-recorder.png
-share/icons/HighContrast/32x32/apps/gnome-sound-recorder.png
-share/icons/HighContrast/48x48/apps/gnome-sound-recorder.png
share/icons/hicolor/16x16/apps/gnome-sound-recorder.png
share/icons/hicolor/22x22/apps/gnome-sound-recorder.png
share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
share/icons/hicolor/256x256/apps/gnome-sound-recorder.png
share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
+share/icons/hicolor/symbolic/apps/gnome-sound-recorder-symbolic.svg
+share/locale/af/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/an/LC_MESSAGES/gnome-sound-recorder.mo
+share/locale/ar/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/as/LC_MESSAGES/gnome-sound-recorder.mo
+share/locale/be/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/bs/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/ca/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-sound-recorder.mo
@@ -25,6 +22,7 @@ share/locale/cs/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/da/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/de/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/el/LC_MESSAGES/gnome-sound-recorder.mo
+share/locale/en_GB/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/eo/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/es/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/eu/LC_MESSAGES/gnome-sound-recorder.mo
@@ -34,6 +32,7 @@ share/locale/fr/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/fur/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/gl/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/he/LC_MESSAGES/gnome-sound-recorder.mo
+share/locale/hr/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/hu/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/id/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/it/LC_MESSAGES/gnome-sound-recorder.mo
@@ -42,6 +41,7 @@ share/locale/kk/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/ko/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/lt/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/lv/LC_MESSAGES/gnome-sound-recorder.mo
+share/locale/ml/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/nb/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/ne/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/nl/LC_MESSAGES/gnome-sound-recorder.mo
@@ -65,3 +65,4 @@ share/locale/vi/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/zh_CN/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/zh_HK/LC_MESSAGES/gnome-sound-recorder.mo
share/locale/zh_TW/LC_MESSAGES/gnome-sound-recorder.mo
+share/metainfo/org.gnome.SoundRecorder.appdata.xml
diff --git a/deskutils/gnome-todo/Makefile b/deskutils/gnome-todo/Makefile
index 9f8520fc33c0..8794c037a4e1 100644
--- a/deskutils/gnome-todo/Makefile
+++ b/deskutils/gnome-todo/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-todo
-PORTVERSION= 3.18.1
-PORTREVISION= 10
+PORTVERSION= 3.28.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,17 +10,28 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Small application to manage your personal tasks
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= appstream-util:devel/appstream-glib
+LIB_DEPENDS= libpeas-1.0.so:devel/libpeas \
+ libgoa-1.0.so:net/gnome-online-accounts \
+ libsecret-1.so:security/libsecret \
+ libsoup-2.4.so:devel/libsoup \
+ libical.so:devel/libical
+
PORTSCOUT= limitw:1,even
-USES= compiler:c11 gettext gmake gnome libtool \
- pathfix pkgconfig tar:xz
-USE_GNOME= evolutiondataserver3 gnomedesktop3 gtk30 intlhack
+USES= compiler:c11 gettext gnome localbase meson pkgconfig \
+ python:3.4+,build shebangfix tar:xz
+USE_GNOME= cairo evolutiondataserver3 gnomedesktop3 gtk30 introspection
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+SHEBANG_FILES= meson_post_install.py
-GLIB_SCHEMAS= org.gnome.todo.gschema.xml
+GLIB_SCHEMAS= org.gnome.todo.background.gschema.xml \
+ org.gnome.todo.enums.xml \
+ org.gnome.todo.gschema.xml \
+ org.gnome.todo.txt.gschema.xml
.include <bsd.port.mk>
diff --git a/deskutils/gnome-todo/distinfo b/deskutils/gnome-todo/distinfo
index c79476c91eda..a0450801a744 100644
--- a/deskutils/gnome-todo/distinfo
+++ b/deskutils/gnome-todo/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-todo-3.18.1.tar.xz) = 7da17c39f46accb897b8af159f6accabc4e2afa4503d8d36138b5937cf5bcc51
-SIZE (gnome3/gnome-todo-3.18.1.tar.xz) = 610892
+TIMESTAMP = 1526105432
+SHA256 (gnome3/gnome-todo-3.28.1.tar.xz) = c7571fc040d8901dd0e528282ef0655687f23f29d304057c72548ab3e2c2cf23
+SIZE (gnome3/gnome-todo-3.28.1.tar.xz) = 751448
diff --git a/deskutils/gnome-todo/pkg-descr b/deskutils/gnome-todo/pkg-descr
index 8c88be2a03af..e93cddd720bb 100644
--- a/deskutils/gnome-todo/pkg-descr
+++ b/deskutils/gnome-todo/pkg-descr
@@ -2,4 +2,4 @@ GNOME To Do is a small application to manage your personal tasks. It
uses GNOME technologies, and so it has complete integration with the
GNOME desktop environment.
-WWW: https://download.gnome.org/sources/gnome-todo
+WWW: https://wiki.gnome.org/Apps/Todo
diff --git a/deskutils/gnome-todo/pkg-plist b/deskutils/gnome-todo/pkg-plist
index f61861ef5a93..dbdeeae26c35 100644
--- a/deskutils/gnome-todo/pkg-plist
+++ b/deskutils/gnome-todo/pkg-plist
@@ -1,22 +1,49 @@
bin/gnome-todo
-share/appdata/org.gnome.Todo.appdata.xml
+include/gnome-todo/gnome-todo.h
+include/gnome-todo/gtd-activatable.h
+include/gnome-todo/gtd-enums.h
+include/gnome-todo/gtd-manager.h
+include/gnome-todo/gtd-notification.h
+include/gnome-todo/gtd-object.h
+include/gnome-todo/gtd-panel.h
+include/gnome-todo/gtd-provider.h
+include/gnome-todo/gtd-task-list-view.h
+include/gnome-todo/gtd-task-list.h
+include/gnome-todo/gtd-task.h
+include/gnome-todo/gtd-timer.h
+include/gnome-todo/gtd-types.h
+include/gnome-todo/gtd-utils.h
+include/gnome-todo/gtd-window.h
+lib/girepository-1.0/Gtd-1.0.typelib
+lib/gnome-todo/plugins/score/score.plugin
+lib/gnome-todo/plugins/score/score/__init__.py
+lib/gnome-todo/plugins/unscheduled-panel/unscheduled-panel.plugin
+lib/gnome-todo/plugins/unscheduled-panel/unscheduled-panel/__init__.py
+libdata/pkgconfig/gnome-todo.pc
share/applications/org.gnome.Todo.desktop
share/dbus-1/services/org.gnome.Todo.service
-share/icons/hicolor/16x16/apps/gnome-todo.png
-share/icons/hicolor/22x22/apps/gnome-todo.png
-share/icons/hicolor/256x256/apps/gnome-todo.png
-share/icons/hicolor/32x32/apps/gnome-todo.png
-share/icons/hicolor/48x48/apps/gnome-todo.png
-share/icons/hicolor/512x512/apps/gnome-todo.png
-share/icons/hicolor/symbolic/apps/gnome-todo-symbolic.svg
+share/gir-1.0/Gtd-1.0.gir
+%%DATADIR%%/org.gnome.Todo.Autostart.desktop
+share/icons/hicolor/16x16/apps/org.gnome.Todo.png
+share/icons/hicolor/22x22/apps/org.gnome.Todo.png
+share/icons/hicolor/256x256/apps/org.gnome.Todo.png
+share/icons/hicolor/32x32/apps/org.gnome.Todo.png
+share/icons/hicolor/48x48/apps/org.gnome.Todo.png
+share/icons/hicolor/512x512/apps/org.gnome.Todo.png
+share/icons/hicolor/symbolic/apps/org.gnome.Todo-symbolic.svg
+share/locale/af/LC_MESSAGES/gnome-todo.mo
share/locale/ar/LC_MESSAGES/gnome-todo.mo
+share/locale/be/LC_MESSAGES/gnome-todo.mo
share/locale/ca/LC_MESSAGES/gnome-todo.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-todo.mo
share/locale/cs/LC_MESSAGES/gnome-todo.mo
share/locale/da/LC_MESSAGES/gnome-todo.mo
share/locale/de/LC_MESSAGES/gnome-todo.mo
share/locale/el/LC_MESSAGES/gnome-todo.mo
+share/locale/en_GB/LC_MESSAGES/gnome-todo.mo
share/locale/eo/LC_MESSAGES/gnome-todo.mo
share/locale/es/LC_MESSAGES/gnome-todo.mo
+share/locale/et/LC_MESSAGES/gnome-todo.mo
share/locale/eu/LC_MESSAGES/gnome-todo.mo
share/locale/fa/LC_MESSAGES/gnome-todo.mo
share/locale/fi/LC_MESSAGES/gnome-todo.mo
@@ -24,22 +51,34 @@ share/locale/fr/LC_MESSAGES/gnome-todo.mo
share/locale/fur/LC_MESSAGES/gnome-todo.mo
share/locale/gl/LC_MESSAGES/gnome-todo.mo
share/locale/he/LC_MESSAGES/gnome-todo.mo
+share/locale/hr/LC_MESSAGES/gnome-todo.mo
share/locale/hu/LC_MESSAGES/gnome-todo.mo
share/locale/id/LC_MESSAGES/gnome-todo.mo
+share/locale/is/LC_MESSAGES/gnome-todo.mo
share/locale/it/LC_MESSAGES/gnome-todo.mo
+share/locale/ja/LC_MESSAGES/gnome-todo.mo
share/locale/kk/LC_MESSAGES/gnome-todo.mo
share/locale/ko/LC_MESSAGES/gnome-todo.mo
share/locale/lt/LC_MESSAGES/gnome-todo.mo
+share/locale/lv/LC_MESSAGES/gnome-todo.mo
share/locale/nb/LC_MESSAGES/gnome-todo.mo
+share/locale/ne/LC_MESSAGES/gnome-todo.mo
+share/locale/nl/LC_MESSAGES/gnome-todo.mo
+share/locale/oc/LC_MESSAGES/gnome-todo.mo
share/locale/pa/LC_MESSAGES/gnome-todo.mo
share/locale/pl/LC_MESSAGES/gnome-todo.mo
share/locale/pt/LC_MESSAGES/gnome-todo.mo
share/locale/pt_BR/LC_MESSAGES/gnome-todo.mo
+share/locale/ro/LC_MESSAGES/gnome-todo.mo
+share/locale/ru/LC_MESSAGES/gnome-todo.mo
share/locale/sk/LC_MESSAGES/gnome-todo.mo
share/locale/sl/LC_MESSAGES/gnome-todo.mo
share/locale/sr/LC_MESSAGES/gnome-todo.mo
share/locale/sr@latin/LC_MESSAGES/gnome-todo.mo
share/locale/sv/LC_MESSAGES/gnome-todo.mo
share/locale/tr/LC_MESSAGES/gnome-todo.mo
+share/locale/uk/LC_MESSAGES/gnome-todo.mo
share/locale/vi/LC_MESSAGES/gnome-todo.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-todo.mo
share/locale/zh_TW/LC_MESSAGES/gnome-todo.mo
+share/metainfo/org.gnome.Todo.appdata.xml
diff --git a/deskutils/gnome-tweak-tool/Makefile b/deskutils/gnome-tweak-tool/Makefile
deleted file mode 100644
index 7fc2b751bb00..000000000000
--- a/deskutils/gnome-tweak-tool/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Jeremy Messenger <mezz@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= gnome-tweak-tool
-PORTVERSION= 3.18.1
-PORTREVISION= 2
-CATEGORIES= deskutils gnome
-MASTER_SITES= GNOME
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Allows to tweak some hidden settings in GTK3 / GNOME3
-
-BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
-RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
-
-PORTSCOUT= limitw:1,even
-
-USES= gettext gmake gnome pathfix pkgconfig python:2.7 \
- shebangfix tar:xz
-USE_GNOME= gtk30 pygobject3 intlhack
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-SHEBANG_FILES= gnome-tweak-tool
-
-.include <bsd.port.mk>
diff --git a/deskutils/gnome-tweak-tool/distinfo b/deskutils/gnome-tweak-tool/distinfo
deleted file mode 100644
index f605cbccfebc..000000000000
--- a/deskutils/gnome-tweak-tool/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome-tweak-tool-3.18.1.tar.xz) = 5c2c1103237648413c2d63a941e06b7057d6b102276b5968517753075de29430
-SIZE (gnome-tweak-tool-3.18.1.tar.xz) = 252716
diff --git a/deskutils/gnome-tweak-tool/pkg-plist b/deskutils/gnome-tweak-tool/pkg-plist
deleted file mode 100644
index e1f1a9b22737..000000000000
--- a/deskutils/gnome-tweak-tool/pkg-plist
+++ /dev/null
@@ -1,139 +0,0 @@
-bin/gnome-tweak-tool
-%%PYTHON_SITELIBDIR%%/gtweak/__init__.py
-%%PYTHON_SITELIBDIR%%/gtweak/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/app.py
-%%PYTHON_SITELIBDIR%%/gtweak/app.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/app.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/defs.py
-%%PYTHON_SITELIBDIR%%/gtweak/defs.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/defs.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/egowrapper.py
-%%PYTHON_SITELIBDIR%%/gtweak/egowrapper.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/egowrapper.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/gsettings.py
-%%PYTHON_SITELIBDIR%%/gtweak/gsettings.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/gsettings.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/gshellwrapper.py
-%%PYTHON_SITELIBDIR%%/gtweak/gshellwrapper.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/gshellwrapper.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/gtksettings.py
-%%PYTHON_SITELIBDIR%%/gtweak/gtksettings.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/gtksettings.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/mainwindow.py
-%%PYTHON_SITELIBDIR%%/gtweak/mainwindow.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/mainwindow.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweakmodel.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweakmodel.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweakmodel.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__init__.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_desktop.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_desktop.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_desktop.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_font.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_font.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_font.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_interface.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_interface.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_interface.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_keymouse.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_keymouse.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_keymouse.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_shell.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_shell.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_shell.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_shell_extensions.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_shell_extensions.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_shell_extensions.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_startup.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_startup.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_startup.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_test.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_test.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_test.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_windows.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_windows.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_windows.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_xkb.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_xkb.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_xkb.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_wacom.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_wacom.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_wacom.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/tweakview.py
-%%PYTHON_SITELIBDIR%%/gtweak/tweakview.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/tweakview.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/utils.py
-%%PYTHON_SITELIBDIR%%/gtweak/utils.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/utils.pyo
-%%PYTHON_SITELIBDIR%%/gtweak/widgets.py
-%%PYTHON_SITELIBDIR%%/gtweak/widgets.pyc
-%%PYTHON_SITELIBDIR%%/gtweak/widgets.pyo
-libexec/gnome-tweak-tool-lid-inhibitor
-share/appdata/gnome-tweak-tool.appdata.xml
-share/applications/gnome-tweak-tool.desktop
-%%DATADIR%%/shell.css
-%%DATADIR%%/shell.ui
-share/icons/hicolor/16x16/apps/gnome-tweak-tool.png
-share/icons/hicolor/22x22/apps/gnome-tweak-tool.png
-share/icons/hicolor/24x24/apps/gnome-tweak-tool.png
-share/icons/hicolor/256x256/apps/gnome-tweak-tool.png
-share/icons/hicolor/32x32/apps/gnome-tweak-tool.png
-share/icons/hicolor/48x48/apps/gnome-tweak-tool.png
-share/icons/hicolor/scalable/apps/gnome-tweak-tool-symbolic.svg
-share/locale/ar/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/as/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/bg/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/bs/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/ca/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/cs/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/da/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/de/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/el/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/en_GB/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/eo/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/es/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/eu/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/fa/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/fi/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/fr/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/gl/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/he/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/hu/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/id/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/is/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/it/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/ja/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/kk/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/ko/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/ky/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/lt/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/lv/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/my/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/nb/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/ne/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/nl/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/oc/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/pa/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/pl/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/pt/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/ro/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/ru/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/sk/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/sl/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/sr/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/sv/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/te/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/tg/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/th/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/tr/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/uk/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/vi/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-tweak-tool.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-tweak-tool.mo
diff --git a/deskutils/gnome-tweaks/Makefile b/deskutils/gnome-tweaks/Makefile
new file mode 100644
index 000000000000..33abe8dacf5d
--- /dev/null
+++ b/deskutils/gnome-tweaks/Makefile
@@ -0,0 +1,40 @@
+# Created by: Jeremy Messenger <mezz@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= gnome-tweaks
+PORTVERSION= 3.28.1
+CATEGORIES= deskutils gnome
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Allows to tweak some hidden settings in GNOME3
+
+LICENSE= GPLv3
+
+BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+ gnome-shell>=3.28:x11/gnome-shell
+
+PORTSCOUT= limitw:1,even
+
+NO_ARCH= yes
+USES= gettext gnome localbase meson pkgconfig \
+ python:3.4+ shebangfix tar:xz
+USE_GNOME= gtk30 pygobject3 nautilus3
+INSTALLS_ICONS= yes
+SHEBANG_FILES= gnome-tweaks \
+ gnome-tweak-tool-lid-inhibitor \
+ meson-postinstall.py
+
+# generates .py[co] files for installed modules
+# if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted
+# with these files when module is imported from root user
+post-install:
+ @${FIND} ${STAGEDIR}${PREFIX} -name \*.pyc -delete
+ (cd ${STAGEDIR}${PREFIX} && \
+ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} && \
+ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
+
+.include <bsd.port.mk>
diff --git a/deskutils/gnome-tweaks/distinfo b/deskutils/gnome-tweaks/distinfo
new file mode 100644
index 000000000000..e7ca3e4ca37a
--- /dev/null
+++ b/deskutils/gnome-tweaks/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525510524
+SHA256 (gnome-tweaks-3.28.1.tar.xz) = d719af9376db6109b6d5d3d1ba7fbbb18668945d7b3703131ae42b0872f3bddc
+SIZE (gnome-tweaks-3.28.1.tar.xz) = 268476
diff --git a/deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__startup.py b/deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__startup.py
new file mode 100644
index 000000000000..8e6f662bd102
--- /dev/null
+++ b/deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__startup.py
@@ -0,0 +1,14 @@
+FreeBSD ps(1) does not have "cmd" display format like in linuxes, but
+"args" is equivalent.
+
+--- gtweak/tweaks/tweak_group_startup.py.orig 2015-10-26 16:48:16 UTC
++++ gtweak/tweaks/tweak_group_startup.py
+@@ -334,7 +334,7 @@ class AutostartListBoxTweakGroup(ListBox
+ exes = []
+ cmd = subprocess.Popen([
+ 'ps','-e','-w','-w','-U',
+- str(os.getuid()),'-o','cmd'],
++ str(os.getuid()),'-o','args'],
+ stdout=subprocess.PIPE)
+ out = cmd.communicate()[0]
+ for l in out.split('\n'):
diff --git a/deskutils/gnome-tweak-tool/pkg-descr b/deskutils/gnome-tweaks/pkg-descr
index ac23369a21a8..ac23369a21a8 100644
--- a/deskutils/gnome-tweak-tool/pkg-descr
+++ b/deskutils/gnome-tweaks/pkg-descr
diff --git a/deskutils/gnome-tweaks/pkg-plist b/deskutils/gnome-tweaks/pkg-plist
new file mode 100644
index 000000000000..31f8e6862716
--- /dev/null
+++ b/deskutils/gnome-tweaks/pkg-plist
@@ -0,0 +1,149 @@
+bin/gnome-tweaks
+%%PYTHON_SITELIBDIR%%/gtweak/__init__.py
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/app.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/app.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/defs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/defs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/egowrapper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/egowrapper.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/gsettings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/gsettings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/gshellwrapper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/gshellwrapper.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/gtksettings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/gtksettings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/tweakmodel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/tweakmodel.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/tweakview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/tweakview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/app.py
+%%PYTHON_SITELIBDIR%%/gtweak/defs.py
+%%PYTHON_SITELIBDIR%%/gtweak/egowrapper.py
+%%PYTHON_SITELIBDIR%%/gtweak/gsettings.py
+%%PYTHON_SITELIBDIR%%/gtweak/gshellwrapper.py
+%%PYTHON_SITELIBDIR%%/gtweak/gtksettings.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweakmodel.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__init__.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_appearance.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_appearance.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_desktop.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_desktop.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_font.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_font.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_keymouse.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_keymouse.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_power.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_power.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_shell_extensions.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_shell_extensions.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_sound.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_sound.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_startup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_startup.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_test.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_test.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_top_bar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_top_bar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_windows.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_windows.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_workspaces.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_workspaces.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_xkb.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_group_xkb.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_wacom.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/__pycache__/tweak_wacom.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_appearance.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_desktop.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_font.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_keymouse.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_power.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_shell_extensions.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_sound.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_startup.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_test.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_top_bar.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_windows.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_workspaces.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_group_xkb.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweaks/tweak_wacom.py
+%%PYTHON_SITELIBDIR%%/gtweak/tweakview.py
+%%PYTHON_SITELIBDIR%%/gtweak/utils.py
+%%PYTHON_SITELIBDIR%%/gtweak/widgets.py
+libexec/gnome-tweak-tool-lid-inhibitor
+share/applications/org.gnome.tweaks.desktop
+%%DATADIR%%/shell.css
+%%DATADIR%%/shell.ui
+share/icons/hicolor/16x16/apps/org.gnome.tweaks.png
+share/icons/hicolor/22x22/apps/org.gnome.tweaks.png
+share/icons/hicolor/24x24/apps/org.gnome.tweaks.png
+share/icons/hicolor/256x256/apps/org.gnome.tweaks.png
+share/icons/hicolor/32x32/apps/org.gnome.tweaks.png
+share/icons/hicolor/48x48/apps/org.gnome.tweaks.png
+share/icons/hicolor/scalable/apps/org.gnome.tweaks-symbolic.svg
+share/locale/af/LC_MESSAGES/gnome-tweaks.mo
+share/locale/ar/LC_MESSAGES/gnome-tweaks.mo
+share/locale/as/LC_MESSAGES/gnome-tweaks.mo
+share/locale/bg/LC_MESSAGES/gnome-tweaks.mo
+share/locale/bs/LC_MESSAGES/gnome-tweaks.mo
+share/locale/ca/LC_MESSAGES/gnome-tweaks.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-tweaks.mo
+share/locale/cs/LC_MESSAGES/gnome-tweaks.mo
+share/locale/da/LC_MESSAGES/gnome-tweaks.mo
+share/locale/de/LC_MESSAGES/gnome-tweaks.mo
+share/locale/el/LC_MESSAGES/gnome-tweaks.mo
+share/locale/en_GB/LC_MESSAGES/gnome-tweaks.mo
+share/locale/eo/LC_MESSAGES/gnome-tweaks.mo
+share/locale/es/LC_MESSAGES/gnome-tweaks.mo
+share/locale/eu/LC_MESSAGES/gnome-tweaks.mo
+share/locale/fa/LC_MESSAGES/gnome-tweaks.mo
+share/locale/fi/LC_MESSAGES/gnome-tweaks.mo
+share/locale/fr/LC_MESSAGES/gnome-tweaks.mo
+share/locale/fur/LC_MESSAGES/gnome-tweaks.mo
+share/locale/gl/LC_MESSAGES/gnome-tweaks.mo
+share/locale/he/LC_MESSAGES/gnome-tweaks.mo
+share/locale/hr/LC_MESSAGES/gnome-tweaks.mo
+share/locale/hu/LC_MESSAGES/gnome-tweaks.mo
+share/locale/id/LC_MESSAGES/gnome-tweaks.mo
+share/locale/is/LC_MESSAGES/gnome-tweaks.mo
+share/locale/it/LC_MESSAGES/gnome-tweaks.mo
+share/locale/ja/LC_MESSAGES/gnome-tweaks.mo
+share/locale/kk/LC_MESSAGES/gnome-tweaks.mo
+share/locale/ko/LC_MESSAGES/gnome-tweaks.mo
+share/locale/ky/LC_MESSAGES/gnome-tweaks.mo
+share/locale/lt/LC_MESSAGES/gnome-tweaks.mo
+share/locale/lv/LC_MESSAGES/gnome-tweaks.mo
+share/locale/ml/LC_MESSAGES/gnome-tweaks.mo
+share/locale/my/LC_MESSAGES/gnome-tweaks.mo
+share/locale/nb/LC_MESSAGES/gnome-tweaks.mo
+share/locale/ne/LC_MESSAGES/gnome-tweaks.mo
+share/locale/nl/LC_MESSAGES/gnome-tweaks.mo
+share/locale/oc/LC_MESSAGES/gnome-tweaks.mo
+share/locale/pa/LC_MESSAGES/gnome-tweaks.mo
+share/locale/pl/LC_MESSAGES/gnome-tweaks.mo
+share/locale/pt/LC_MESSAGES/gnome-tweaks.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-tweaks.mo
+share/locale/ro/LC_MESSAGES/gnome-tweaks.mo
+share/locale/ru/LC_MESSAGES/gnome-tweaks.mo
+share/locale/sk/LC_MESSAGES/gnome-tweaks.mo
+share/locale/sl/LC_MESSAGES/gnome-tweaks.mo
+share/locale/sr/LC_MESSAGES/gnome-tweaks.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-tweaks.mo
+share/locale/sv/LC_MESSAGES/gnome-tweaks.mo
+share/locale/te/LC_MESSAGES/gnome-tweaks.mo
+share/locale/tg/LC_MESSAGES/gnome-tweaks.mo
+share/locale/th/LC_MESSAGES/gnome-tweaks.mo
+share/locale/tr/LC_MESSAGES/gnome-tweaks.mo
+share/locale/uk/LC_MESSAGES/gnome-tweaks.mo
+share/locale/vi/LC_MESSAGES/gnome-tweaks.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-tweaks.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-tweaks.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-tweaks.mo
+share/metainfo/org.gnome.tweaks.appdata.xml
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 826d573916c7..8b2d2e002275 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-utils
-PORTVERSION= 3.18.0
+PORTVERSION= 3.26
PORTEPOCH= 1
CATEGORIES= deskutils gnome
@@ -20,6 +20,7 @@ RUN_DEPENDS= baobab>=3.0:deskutils/baobab \
gnome-system-log>=3.0:deskutils/gnome-system-log \
gnome-font-viewer>=3.0:deskutils/gnome-font-viewer \
gnome-system-monitor>=3.0:sysutils/gnome-system-monitor \
+ gnome-calendar>=3.0:deskutils/gnome-calendar \
gnome-photos>=3.0:deskutils/gnome-photos \
gnome-clocks>=3.0:deskutils/gnome-clocks \
gnome-maps>=3.0:deskutils/gnome-maps \
diff --git a/deskutils/gnome-weather/Makefile b/deskutils/gnome-weather/Makefile
index c937cceb0537..61ebdecc363f 100644
--- a/deskutils/gnome-weather/Makefile
+++ b/deskutils/gnome-weather/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-weather
-PORTVERSION= 3.24.0
+PORTVERSION= 3.26.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/deskutils/gnome-weather/distinfo b/deskutils/gnome-weather/distinfo
index fa60caa51c1b..ebb1175220eb 100644
--- a/deskutils/gnome-weather/distinfo
+++ b/deskutils/gnome-weather/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496670405
-SHA256 (gnome3/gnome-weather-3.24.0.tar.xz) = e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574
-SIZE (gnome3/gnome-weather-3.24.0.tar.xz) = 5358924
+TIMESTAMP = 1516302309
+SHA256 (gnome3/gnome-weather-3.26.0.tar.xz) = 965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78
+SIZE (gnome3/gnome-weather-3.26.0.tar.xz) = 5362056
diff --git a/deskutils/gnome-weather/pkg-plist b/deskutils/gnome-weather/pkg-plist
index 7ed98febb965..f9769ba68379 100644
--- a/deskutils/gnome-weather/pkg-plist
+++ b/deskutils/gnome-weather/pkg-plist
@@ -35,6 +35,7 @@ share/locale/ga/LC_MESSAGES/org.gnome.Weather.mo
share/locale/gd/LC_MESSAGES/org.gnome.Weather.mo
share/locale/gl/LC_MESSAGES/org.gnome.Weather.mo
share/locale/he/LC_MESSAGES/org.gnome.Weather.mo
+share/locale/hr/LC_MESSAGES/org.gnome.Weather.mo
share/locale/hu/LC_MESSAGES/org.gnome.Weather.mo
share/locale/id/LC_MESSAGES/org.gnome.Weather.mo
share/locale/is/LC_MESSAGES/org.gnome.Weather.mo
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 04f5061fe84f..d167aaa1fa18 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnote
-PORTVERSION= 3.18.1
-PORTREVISION= 11
+PORTVERSION= 3.28.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
@@ -14,30 +13,27 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libpcre.so:devel/pcre \
- libgtkspell3-3.so:textproc/gtkspell3 \
- libboost_filesystem.so:devel/boost-libs \
+LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 \
+ libenchant.so:textproc/enchant \
libsecret-1.so:security/libsecret \
libuuid.so:misc/e2fsprogs-libuuid
PORTSCOUT= limitw:1,even
-USE_GNOME= gtk30 gtkmm30 intltool libxml2 libxslt
+USE_GNOME= gtkmm30 intltool libxml2 libxslt
+USE_XORG= x11
USES= desktop-file-utils compiler:c++11-lib gettext gmake \
- gnome libtool pathfix pkgconfig tar:xz
+ gnome libtool localbase pathfix pkgconfig tar:xz
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --with-dbus-service-dir=${PREFIX}/share/dbus-1/services
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.gnote.gschema.xml
DOCS= AUTHORS ChangeLog NEWS README TODO
-PLIST_SUB+= VERSION=${PORTVERSION}
+PLIST_SUB+= VERSION=${PORTVERSION} SVER=${PORTVERSION:R}
OPTIONS_DEFINE= DOCS
diff --git a/deskutils/gnote/distinfo b/deskutils/gnote/distinfo
index b7645fdc9603..f5171427616d 100644
--- a/deskutils/gnote/distinfo
+++ b/deskutils/gnote/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnote-3.18.1.tar.xz) = 5da4ec9e7852b09af1067311fc6ee18a2c64384f4f5943b71ac37665144be58d
-SIZE (gnote-3.18.1.tar.xz) = 3310004
+TIMESTAMP = 1525980004
+SHA256 (gnote-3.28.0.tar.xz) = a50d3986c6cc04c7c8215dfed938910611e2d7499f00bfe4f42050ed56a7b783
+SIZE (gnote-3.28.0.tar.xz) = 4002520
diff --git a/deskutils/gnote/files/patch-src_actionmanager.cpp b/deskutils/gnote/files/patch-src_actionmanager.cpp
deleted file mode 100644
index a5bb75b44cec..000000000000
--- a/deskutils/gnote/files/patch-src_actionmanager.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/actionmanager.cpp.orig 2015-11-28 15:45:18 UTC
-+++ src/actionmanager.cpp
-@@ -177,17 +177,17 @@ namespace gnote {
-
- int pos = 0;
- Glib::RefPtr<Gio::Menu> section = make_app_menu_section(APP_ACTION_NEW);
-- if(section != 0) {
-+ if(section) {
- menu->insert_section(pos++, section);
- }
-
- section = make_app_menu_section(APP_ACTION_MANAGE);
-- if(section != 0) {
-+ if(section) {
- menu->insert_section(pos++, section);
- }
-
- section = make_app_menu_section(APP_ACTION_LAST);
-- if(section != 0) {
-+ if(section) {
- menu->insert_section(pos++, section);
- }
-
diff --git a/deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteaddin.cpp b/deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteaddin.cpp
deleted file mode 100644
index 5cab2e9aad92..000000000000
--- a/deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteaddin.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/addins/exporttogtg/exporttogtgnoteaddin.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/addins/exporttogtg/exporttogtgnoteaddin.cpp
-@@ -79,10 +79,10 @@ void ExportToGTGNoteAddin::on_note_opene
- void ExportToGTGNoteAddin::export_button_clicked()
- {
- try {
-- if (s_gtg_interface == 0) {
-+ if (!s_gtg_interface) {
- Glib::RefPtr<Gio::DBus::NodeInfo> node_info = Gio::DBus::NodeInfo::create_for_xml(GTG_INTERFACE);
- s_gtg_interface = node_info->lookup_interface("org.gnome.GTG");
-- if(s_gtg_interface == 0) {
-+ if(!s_gtg_interface) {
- ERR_OUT(_("GTG XML loaded, but interface not found"));
- return;
- }
-@@ -96,7 +96,7 @@ void ExportToGTGNoteAddin::export_button
- try {
- Glib::RefPtr<Gio::DBus::Proxy> proxy = Gio::DBus::Proxy::create_for_bus_sync(
- Gio::DBus::BUS_TYPE_SESSION, "org.gnome.GTG", "/org/gnome/GTG", "org.gnome.GTG", s_gtg_interface);
-- if(proxy == 0) {
-+ if(!proxy) {
- ERR_OUT(_("Failed to create D-Bus proxy for GTG"));
- return;
- }
diff --git a/deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin.cpp b/deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin.cpp
deleted file mode 100644
index e127b77cf3e3..000000000000
--- a/deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/addins/printnotes/printnotesnoteaddin.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/addins/printnotes/printnotesnoteaddin.cpp
-@@ -277,7 +277,7 @@ namespace printnotes {
- }
-
- gnote::DepthNoteTag::Ptr depth = get_buffer()->find_depth_tag(p_start);
-- if(depth != 0) {
-+ if(depth) {
- indentation += ((int) (dpiX / 3)) * depth->get_depth();
- }
- layout->set_width(pango_units_from_double((int)context->get_width() -
diff --git a/deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicationaddin.cpp b/deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicationaddin.cpp
deleted file mode 100644
index 7a273ebc5c5f..000000000000
--- a/deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicationaddin.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/addins/statistics/statisticsapplicationaddin.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/addins/statistics/statisticsapplicationaddin.cpp
-@@ -44,7 +44,7 @@ void StatisticsApplicationAddin::initial
- {
- if(!m_initialized) {
- m_initialized = true;
-- if(m_action == 0) {
-+ if(!m_action) {
- m_action = Gtk::Action::create();
- m_action->set_name("ShowStatistics");
- m_action->set_label(_("Show Statistics"));
diff --git a/deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp b/deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp
deleted file mode 100644
index b2ac324589ea..000000000000
--- a/deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/addins/todo/todonoteaddin.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/addins/todo/todonoteaddin.cpp
-@@ -42,7 +42,7 @@ TodoModule::TodoModule()
- void Todo::initialize()
- {
- FOREACH(const std::string & s, s_todo_patterns) {
-- if(get_note()->get_tag_table()->lookup(s) == 0) {
-+ if(!get_note()->get_tag_table()->lookup(s)) {
- Glib::RefPtr<Gtk::TextTag> tag = Gtk::TextTag::create(s);
- tag->property_foreground() = "#0080f0";
- tag->property_weight() = PANGO_WEIGHT_BOLD;
diff --git a/deskutils/gnote/files/patch-src_dbus_searchprovider.cpp b/deskutils/gnote/files/patch-src_dbus_searchprovider.cpp
deleted file mode 100644
index 9490bbb4fc52..000000000000
--- a/deskutils/gnote/files/patch-src_dbus_searchprovider.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dbus/searchprovider.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/dbus/searchprovider.cpp
-@@ -228,7 +228,7 @@ Glib::VariantContainerBase SearchProvide
-
- gchar *SearchProvider::get_icon()
- {
-- if(m_note_icon == 0) {
-+ if(!m_note_icon) {
- Gtk::IconInfo info = gnote::IconManager::obj().lookup_icon(gnote::IconManager::NOTE, 48);
- m_note_icon = Gio::Icon::create(info.get_filename());
- }
diff --git a/deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp b/deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp
deleted file mode 100644
index 1f92a07af12b..000000000000
--- a/deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gnome_keyring/ring.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/gnome_keyring/ring.cpp
-@@ -20,6 +20,7 @@
-
-
- #include <cstring>
-+#include <cstdlib>
-
- #include "keyringexception.hpp"
- #include "ring.hpp"
diff --git a/deskutils/gnote/files/patch-src_note.hpp b/deskutils/gnote/files/patch-src_note.hpp
deleted file mode 100644
index 08d1409aa09d..000000000000
--- a/deskutils/gnote/files/patch-src_note.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/note.hpp.orig 2015-11-28 15:44:34 UTC
-+++ src/note.hpp
-@@ -124,7 +124,7 @@ public:
- const Glib::RefPtr<NoteTagTable> & get_tag_table();
- bool has_buffer() const
- {
-- return m_buffer;
-+ return (bool)m_buffer;
- }
- const Glib::RefPtr<NoteBuffer> & get_buffer();
- bool has_window() const
-@@ -139,7 +139,7 @@ public:
- bool is_special() const;
- bool is_loaded() const
- {
-- return (m_buffer);
-+ return (bool)m_buffer;
- }
- bool is_opened() const
- {
diff --git a/deskutils/gnote/files/patch-src_notebuffer.cpp b/deskutils/gnote/files/patch-src_notebuffer.cpp
deleted file mode 100644
index 61eb4224c566..000000000000
--- a/deskutils/gnote/files/patch-src_notebuffer.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/notebuffer.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/notebuffer.cpp
-@@ -248,7 +248,7 @@ namespace gnote {
-
- Glib::RefPtr<Gtk::TextTag> depth = find_depth_tag(iter);
-
-- return depth;
-+ return (bool)depth;
- }
-
-
-@@ -1341,7 +1341,7 @@ namespace gnote {
- if (iter.get_line() < buffer->get_line_count() - 1) {
- Gtk::TextIter next_line = buffer->get_iter_at_line(iter.get_line()+1);
- next_line_has_depth =
-- NoteBuffer::Ptr::cast_static(buffer)->find_depth_tag (next_line);
-+ (bool)NoteBuffer::Ptr::cast_static(buffer)->find_depth_tag (next_line);
- }
-
- bool at_empty_line = iter.ends_line () && iter.starts_line ();
-@@ -1576,7 +1576,7 @@ namespace gnote {
- NoteBuffer::Ptr note_buffer = NoteBuffer::Ptr::cast_dynamic(buffer);
- // Do not insert bullet if it's already there
- // this happens when using double identation in bullet list
-- if(note_buffer->find_depth_tag(apply_start) == 0) {
-+ if(!note_buffer->find_depth_tag(apply_start)) {
- note_buffer->insert_bullet (apply_start, depth_tag->get_depth(), depth_tag->get_direction());
- buffer->remove_all_tags (apply_start, apply_start);
- offset += 2;
diff --git a/deskutils/gnote/files/patch-src_notetag.cpp b/deskutils/gnote/files/patch-src_notetag.cpp
deleted file mode 100644
index ef2d67e5dc16..000000000000
--- a/deskutils/gnote/files/patch-src_notetag.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/notetag.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/notetag.cpp
-@@ -523,7 +523,7 @@ namespace gnote {
-
- bool NoteTagTable::tag_has_depth(const Glib::RefPtr<Gtk::TextBuffer::Tag> & tag)
- {
-- return DepthNoteTag::Ptr::cast_dynamic(tag);
-+ return (bool)DepthNoteTag::Ptr::cast_dynamic(tag);
- }
-
-
diff --git a/deskutils/gnote/files/patch-src_notewindow.cpp b/deskutils/gnote/files/patch-src_notewindow.cpp
deleted file mode 100644
index c71c799611d1..000000000000
--- a/deskutils/gnote/files/patch-src_notewindow.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/notewindow.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/notewindow.cpp
-@@ -186,7 +186,7 @@ namespace gnote {
- return;
- }
- remove_accel_group(*parent);
-- if(parent->get_window() != 0
-+ if(parent->get_window()
- && (parent->get_window()->get_state() & Gdk::WINDOW_STATE_MAXIMIZED) == 0) {
- int cur_width, cur_height;
- parent->get_size(cur_width, cur_height);
-@@ -316,7 +316,7 @@ namespace gnote {
- }
- m_widget_actions[order] = action;
- m_signal_actions_changed();
-- if(Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action) == 0) {
-+ if(!Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action)) {
- action->set_sensitive(m_enabled);
- }
- }
-@@ -619,7 +619,7 @@ namespace gnote {
- m_global_keys->enabled(m_enabled);
- FOREACH(const Glib::RefPtr<Gtk::Action> & action, get_widget_actions()) {
- // A list includes empty actions to mark separators, non-modifying actions are always enabled
-- if(action != 0 && Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action) == 0) {
-+ if(action && !Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action)) {
- action->set_sensitive(enable);
- }
- }
diff --git a/deskutils/gnote/files/patch-src_remotecontrolproxy.cpp b/deskutils/gnote/files/patch-src_remotecontrolproxy.cpp
deleted file mode 100644
index 6a1989f12946..000000000000
--- a/deskutils/gnote/files/patch-src_remotecontrolproxy.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/remotecontrolproxy.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/remotecontrolproxy.cpp
-@@ -35,7 +35,7 @@ namespace {
- void load_interface_from_file(const char *filename, const char *interface_name,
- Glib::RefPtr<Gio::DBus::InterfaceInfo> & interface)
- {
-- if(interface != 0) {
-+ if(interface) {
- return;
- }
- std::ifstream fin(filename);
diff --git a/deskutils/gnote/files/patch-src_searchnoteswidget.cpp b/deskutils/gnote/files/patch-src_searchnoteswidget.cpp
deleted file mode 100644
index 91b9910a45f4..000000000000
--- a/deskutils/gnote/files/patch-src_searchnoteswidget.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/searchnoteswidget.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/searchnoteswidget.cpp
-@@ -1520,7 +1520,7 @@ void SearchNotesWidget::parse_sorting_se
- void SearchNotesWidget::on_rename_notebook()
- {
- Glib::RefPtr<Gtk::TreeSelection> selection = m_notebooksTree->get_selection();
-- if(selection == 0) {
-+ if(!selection) {
- return;
- }
- std::vector<Gtk::TreeModel::Path> selected_row = selection->get_selected_rows();
diff --git a/deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp b/deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp
deleted file mode 100644
index e1ea88bc9b81..000000000000
--- a/deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/synchronization/gnotesyncclient.cpp.orig 2015-11-28 15:44:34 UTC
-+++ src/synchronization/gnotesyncclient.cpp
-@@ -54,7 +54,7 @@ namespace sync {
- {
- m_local_manifest_file_path = Glib::build_filename(IGnote::conf_dir(), LOCAL_MANIFEST_FILE_NAME);
- Glib::RefPtr<Gio::File> manifest = Gio::File::create_for_path(m_local_manifest_file_path);
-- if(manifest != 0) {
-+ if(manifest) {
- m_file_watcher = manifest->monitor_file();
- m_file_watcher->signal_changed()
- .connect(sigc::mem_fun(*this, &GnoteSyncClient::on_changed));
diff --git a/deskutils/gnote/pkg-descr b/deskutils/gnote/pkg-descr
index a8c0d6c70124..2b228014fd3f 100644
--- a/deskutils/gnote/pkg-descr
+++ b/deskutils/gnote/pkg-descr
@@ -3,4 +3,4 @@ Gnote is a port of Tomboy to C++.
It is the same note taking application, including most of the add-ins (more
are to come). Synchronization support is being worked on.
-WWW: https://wiki.gnome.org/Gnote
+WWW: https://wiki.gnome.org/Apps/Gnote
diff --git a/deskutils/gnote/pkg-plist b/deskutils/gnote/pkg-plist
index 48dbbe61b11e..b4afded358ca 100644
--- a/deskutils/gnote/pkg-plist
+++ b/deskutils/gnote/pkg-plist
@@ -1,49 +1,48 @@
bin/gnote
lib/gnote/addins/%%VERSION%%/backlinks.desktop
-lib/gnote/addins/%%VERSION%%/backlinks.so
lib/gnote/addins/%%VERSION%%/bugzilla.desktop
-lib/gnote/addins/%%VERSION%%/bugzilla.so
lib/gnote/addins/%%VERSION%%/exporttogtg.desktop
-lib/gnote/addins/%%VERSION%%/exporttogtg.so
lib/gnote/addins/%%VERSION%%/exporttohtml.desktop
-lib/gnote/addins/%%VERSION%%/exporttohtml.so
lib/gnote/addins/%%VERSION%%/filesystemsyncservice.desktop
-lib/gnote/addins/%%VERSION%%/filesystemsyncservice.so
lib/gnote/addins/%%VERSION%%/fixedwidth.desktop
-lib/gnote/addins/%%VERSION%%/fixedwidth.so
lib/gnote/addins/%%VERSION%%/inserttimestamp.desktop
-lib/gnote/addins/%%VERSION%%/inserttimestamp.so
+lib/gnote/addins/%%VERSION%%/libbacklinks.so
+lib/gnote/addins/%%VERSION%%/libbugzilla.so
+lib/gnote/addins/%%VERSION%%/libexporttogtg.so
+lib/gnote/addins/%%VERSION%%/libexporttohtml.so
+lib/gnote/addins/%%VERSION%%/libfilesystemsyncservice.so
+lib/gnote/addins/%%VERSION%%/libfixedwidth.so
+lib/gnote/addins/%%VERSION%%/libinserttimestamp.so
+lib/gnote/addins/%%VERSION%%/libnotedirectorywatcher.so
+lib/gnote/addins/%%VERSION%%/libnoteoftheday.so
+lib/gnote/addins/%%VERSION%%/libprintnotes.so
+lib/gnote/addins/%%VERSION%%/libreadonly.so
+lib/gnote/addins/%%VERSION%%/libreplacetitle.so
+lib/gnote/addins/%%VERSION%%/libspecialnotes.so
+lib/gnote/addins/%%VERSION%%/libstatistics.so
+lib/gnote/addins/%%VERSION%%/libstickynoteimport.so
+lib/gnote/addins/%%VERSION%%/libtableofcontents.so
+lib/gnote/addins/%%VERSION%%/libtodo.so
+lib/gnote/addins/%%VERSION%%/libtomboyimport.so
+lib/gnote/addins/%%VERSION%%/libunderline.so
+lib/gnote/addins/%%VERSION%%/libwebdavsyncservice.so
lib/gnote/addins/%%VERSION%%/notedirectorywatcher.desktop
-lib/gnote/addins/%%VERSION%%/notedirectorywatcher.so
lib/gnote/addins/%%VERSION%%/noteoftheday.desktop
-lib/gnote/addins/%%VERSION%%/noteoftheday.so
lib/gnote/addins/%%VERSION%%/printnotes.desktop
-lib/gnote/addins/%%VERSION%%/printnotes.so
lib/gnote/addins/%%VERSION%%/readonly.desktop
-lib/gnote/addins/%%VERSION%%/readonly.so
lib/gnote/addins/%%VERSION%%/replacetitle.desktop
-lib/gnote/addins/%%VERSION%%/replacetitle.so
lib/gnote/addins/%%VERSION%%/specialnotes.desktop
-lib/gnote/addins/%%VERSION%%/specialnotes.so
lib/gnote/addins/%%VERSION%%/statistics.desktop
-lib/gnote/addins/%%VERSION%%/statistics.so
lib/gnote/addins/%%VERSION%%/stickynoteimport.desktop
-lib/gnote/addins/%%VERSION%%/stickynoteimport.so
lib/gnote/addins/%%VERSION%%/tableofcontents.desktop
-lib/gnote/addins/%%VERSION%%/tableofcontents.so
lib/gnote/addins/%%VERSION%%/todo.desktop
-lib/gnote/addins/%%VERSION%%/todo.so
lib/gnote/addins/%%VERSION%%/tomboyimport.desktop
-lib/gnote/addins/%%VERSION%%/tomboyimport.so
lib/gnote/addins/%%VERSION%%/underline.desktop
-lib/gnote/addins/%%VERSION%%/underline.so
lib/gnote/addins/%%VERSION%%/webdavsyncservice.desktop
-lib/gnote/addins/%%VERSION%%/webdavsyncservice.so
-lib/libgnote-3.18.so.0
-lib/libgnote-3.18.so.0.0.1
+lib/libgnote-%%SVER%%.so.0
+lib/libgnote-%%SVER%%.so.0.0.0
lib/libgnote.so
man/man1/gnote.1.gz
-share/appdata/gnote.appdata.xml
share/applications/gnote.desktop
share/dbus-1/services/org.gnome.Gnote.service
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -79,6 +78,7 @@ share/gnome-shell/search-providers/gnote-search-provider.ini
%%DATADIR%%/icons/hicolor/48x48/actions/notebook-new.png
%%DATADIR%%/icons/hicolor/scalable/actions/notebook-new.svg
%%DATADIR%%/shell-search-provider-dbus-interfaces.xml
+%%DATADIR%%/shortcuts-gnote.ui
share/help/C/gnote/figures/add-notebook-search.png
share/help/C/gnote/figures/add-to-notebook.png
share/help/C/gnote/figures/delete-notebook.png
@@ -762,3 +762,4 @@ share/locale/uk/LC_MESSAGES/gnote.mo
share/locale/zh_CN/LC_MESSAGES/gnote.mo
share/locale/zh_HK/LC_MESSAGES/gnote.mo
share/locale/zh_TW/LC_MESSAGES/gnote.mo
+share/metainfo/gnote.appdata.xml
diff --git a/deskutils/kdepimlibs-kde4/Makefile b/deskutils/kdepimlibs-kde4/Makefile
index 7c478828bc89..9af304cbb212 100644
--- a/deskutils/kdepimlibs-kde4/Makefile
+++ b/deskutils/kdepimlibs-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kdepimlibs
PORTVERSION= ${KDE4_KDEPIM_VERSION}
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
diff --git a/deskutils/kdepimlibs-kde4/files/patch-libical-3.0 b/deskutils/kdepimlibs-kde4/files/patch-libical-3.0
new file mode 100644
index 000000000000..3e9108e0e16d
--- /dev/null
+++ b/deskutils/kdepimlibs-kde4/files/patch-libical-3.0
@@ -0,0 +1,190 @@
+Fix the build with libical (aquired from fedora)
+
+diff -up kdepimlibs-4.14.10/kcalcore/icalformat_p.cpp.libical-3.0 kdepimlibs-4.14.10/kcalcore/icalformat_p.cpp
+--- kcalcore/icalformat_p.cpp.libical-3.0 2017-11-12 14:10:59.070922105 +0100
++++ kcalcore/icalformat_p.cpp 2017-11-12 14:11:16.499921863 +0100
+@@ -2301,7 +2301,6 @@ icaltimetype ICalFormatImpl::writeICalDa
+ t.second = 0;
+
+ t.is_date = 1;
+- t.is_utc = 0;
+ t.zone = 0;
+
+ return t;
+@@ -2322,8 +2321,7 @@ icaltimetype ICalFormatImpl::writeICalDa
+ t.minute = datetime.time().minute();
+ t.second = datetime.time().second();
+ }
+- t.zone = 0; // zone is NOT set
+- t.is_utc = datetime.isUtc() ? 1 : 0;
++ t.zone = datetime.isUtc() ? icaltimezone_get_utc_timezone() : 0; // zone is NOT set
+
+ // _dumpIcaltime( t );
+
+@@ -2398,7 +2396,7 @@ icalproperty *ICalFormatImpl::writeICalD
+ }
+
+ KTimeZone ktz;
+- if (!t.is_utc) {
++ if (!icaltime_is_utc( t )) {
+ ktz = dt.timeZone();
+ }
+
+@@ -2431,7 +2429,7 @@ KDateTime ICalFormatImpl::readICalDateTi
+ // _dumpIcaltime( t );
+
+ KDateTime::Spec timeSpec;
+- if (t.is_utc || t.zone == icaltimezone_get_utc_timezone()) {
++ if (icaltime_is_utc( t ) || t.zone == icaltimezone_get_utc_timezone()) {
+ timeSpec = KDateTime::UTC; // the time zone is UTC
+ utc = false; // no need to convert to UTC
+ } else {
+diff -up kdepimlibs-4.14.10/kcalcore/icaltimezones.cpp.libical-3.0 kdepimlibs-4.14.10/kcalcore/icaltimezones.cpp
+--- kcalcore/icaltimezones.cpp.libical-3.0 2017-11-12 14:11:03.603922042 +0100
++++ kcalcore/icaltimezones.cpp 2017-11-12 14:11:15.029921884 +0100
+@@ -54,7 +54,7 @@ static QDateTime toQDateTime(const icalt
+ {
+ return QDateTime(QDate(t.year, t.month, t.day),
+ QTime(t.hour, t.minute, t.second),
+- (t.is_utc ? Qt::UTC : Qt::LocalTime));
++ (icaltime_is_utc( t ) ? Qt::UTC : Qt::LocalTime));
+ }
+
+ // Maximum date for time zone data.
+@@ -81,7 +81,6 @@ static icaltimetype writeLocalICalDateTi
+ t.second = local.time().second();
+ t.is_date = 0;
+ t.zone = 0;
+- t.is_utc = 0;
+ return t;
+ }
+
+@@ -886,7 +885,7 @@ ICalTimeZone ICalTimeZoneSource::parse(i
+ case ICAL_LASTMODIFIED_PROPERTY:
+ {
+ const icaltimetype t = icalproperty_get_lastmodified(p);
+- if (t.is_utc) {
++ if (icaltime_is_utc( t )) {
+ data->d->lastModified = toQDateTime(t);
+ } else {
+ kDebug() << "LAST-MODIFIED not UTC";
+@@ -1259,7 +1258,7 @@ QList<QDateTime> ICalTimeZoneSourcePriva
+ // Convert DTSTART to QDateTime, and from local time to UTC
+ const QDateTime localStart = toQDateTime(dtstart); // local time
+ dtstart.second -= prevOffset;
+- dtstart.is_utc = 1;
++ dtstart.zone = icaltimezone_get_utc_timezone();
+ const QDateTime utcStart = toQDateTime(icaltime_normalize(dtstart)); // UTC
+
+ transitions += utcStart;
+@@ -1286,13 +1285,13 @@ QList<QDateTime> ICalTimeZoneSourcePriva
+ t.minute = dtstart.minute;
+ t.second = dtstart.second;
+ t.is_date = 0;
+- t.is_utc = 0; // dtstart is in local time
++ t.zone = 0; // dtstart is in local time
+ }
+ // RFC2445 states that RDATE must be in local time,
+ // but we support UTC as well to be safe.
+- if (!t.is_utc) {
++ if (!icaltime_is_utc( t )) {
+ t.second -= prevOffset; // convert to UTC
+- t.is_utc = 1;
++ t.zone = icaltimezone_get_utc_timezone();
+ t = icaltime_normalize(t);
+ }
+ transitions += toQDateTime(t);
+diff -up kdepimlibs-4.14.10/kcal/icalformat_p.cpp.libical-3.0 kdepimlibs-4.14.10/kcal/icalformat_p.cpp
+--- kcal/icalformat_p.cpp.libical-3.0 2017-11-12 14:10:50.692922220 +0100
++++ kcal/icalformat_p.cpp 2017-11-12 14:11:08.915921968 +0100
+@@ -2087,7 +2087,6 @@ icaltimetype ICalFormatImpl::writeICalDa
+ t.second = 0;
+
+ t.is_date = 1;
+- t.is_utc = 0;
+ t.zone = 0;
+
+ return t;
+@@ -2106,8 +2105,7 @@ icaltimetype ICalFormatImpl::writeICalDa
+ t.second = datetime.time().second();
+
+ t.is_date = 0;
+- t.zone = 0; // zone is NOT set
+- t.is_utc = datetime.isUtc() ? 1 : 0;
++ t.zone = datetime.isUtc() ? icaltimezone_get_utc_timezone() : 0;
+
+ // _dumpIcaltime( t );
+
+@@ -2174,7 +2172,7 @@ icalproperty *ICalFormatImpl::writeICalD
+ }
+
+ KTimeZone ktz;
+- if ( !t.is_utc ) {
++ if ( !icaltime_is_utc( t ) ) {
+ ktz = dt.timeZone();
+ }
+
+@@ -2207,7 +2205,7 @@ KDateTime ICalFormatImpl::readICalDateTi
+ // _dumpIcaltime( t );
+
+ KDateTime::Spec timeSpec;
+- if ( t.is_utc || t.zone == icaltimezone_get_utc_timezone() ) {
++ if ( icaltime_is_utc( t ) || t.zone == icaltimezone_get_utc_timezone() ) {
+ timeSpec = KDateTime::UTC; // the time zone is UTC
+ utc = false; // no need to convert to UTC
+ } else {
+diff -up kdepimlibs-4.14.10/kcal/icaltimezones.cpp.libical-3.0 kdepimlibs-4.14.10/kcal/icaltimezones.cpp
+--- kcal/icaltimezones.cpp.libical-3.0 2017-11-12 14:10:54.277922171 +0100
++++ kcal/icaltimezones.cpp 2017-11-12 14:11:13.407921906 +0100
+@@ -50,7 +50,7 @@ static QDateTime toQDateTime( const ical
+ {
+ return QDateTime( QDate( t.year, t.month, t.day ),
+ QTime( t.hour, t.minute, t.second ),
+- ( t.is_utc ? Qt::UTC : Qt::LocalTime ) );
++ ( icaltime_is_utc( t ) ? Qt::UTC : Qt::LocalTime ) );
+ }
+
+ // Maximum date for time zone data.
+@@ -77,7 +77,6 @@ static icaltimetype writeLocalICalDateTi
+ t.second = local.time().second();
+ t.is_date = 0;
+ t.zone = 0;
+- t.is_utc = 0;
+ return t;
+ }
+
+@@ -787,7 +786,7 @@ ICalTimeZone ICalTimeZoneSource::parse(
+ case ICAL_LASTMODIFIED_PROPERTY:
+ {
+ icaltimetype t = icalproperty_get_lastmodified(p);
+- if ( t.is_utc ) {
++ if ( icaltime_is_utc( t ) ) {
+ data->d->lastModified = toQDateTime( t );
+ } else {
+ kDebug() << "LAST-MODIFIED not UTC";
+@@ -972,7 +971,7 @@ QList<QDateTime> ICalTimeZoneSourcePriva
+ // Convert DTSTART to QDateTime, and from local time to UTC
+ QDateTime localStart = toQDateTime( dtstart ); // local time
+ dtstart.second -= prevOffset;
+- dtstart.is_utc = 1;
++ dtstart.zone = icaltimezone_get_utc_timezone();
+ QDateTime utcStart = toQDateTime( icaltime_normalize( dtstart ) ); // UTC
+
+ transitions += utcStart;
+@@ -999,13 +998,13 @@ QList<QDateTime> ICalTimeZoneSourcePriva
+ t.minute = dtstart.minute;
+ t.second = dtstart.second;
+ t.is_date = 0;
+- t.is_utc = 0; // dtstart is in local time
++ t.zone = 0; // dtstart is in local time
+ }
+ // RFC2445 states that RDATE must be in local time,
+ // but we support UTC as well to be safe.
+- if ( !t.is_utc ) {
++ if ( !icaltime_is_utc( t ) ) {
+ t.second -= prevOffset; // convert to UTC
+- t.is_utc = 1;
++ t.zone = icaltimezone_get_utc_timezone();
+ t = icaltime_normalize( t );
+ }
+ transitions += toQDateTime( t );
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index d24531c283c3..d896d44eaf6c 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nautilus-sendto
-PORTVERSION= 3.8.2
+PORTVERSION= 3.8.3
CATEGORIES= deskutils
MASTER_SITES= GNOME
@@ -10,11 +10,10 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Convenience application to send a file via email
USE_GNOME= intlhack introspection:build
-USES= gettext gmake pathfix pkgconfig tar:xz
+USES= gettext gmake localbase pathfix pkgconfig tar:xz
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include -Wno-error=format-nonliteral
-LIBS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -Wno-error=format-nonliteral
.include <bsd.port.mk>
diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo
index 8f87d3011501..973de15aa062 100644
--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@@ -1,2 +1,3 @@
-SHA256 (nautilus-sendto-3.8.2.tar.xz) = 932811e781457b1dbf7b396e930d588f433b9ba756b10bde9f03f6d71d54bdc5
-SIZE (nautilus-sendto-3.8.2.tar.xz) = 343032
+TIMESTAMP = 1538308362
+SHA256 (nautilus-sendto-3.8.3.tar.xz) = 7ba1c37280e232b06d8e5097c584fab2e05f2b2eb2c5e9c7be8a765af063830c
+SIZE (nautilus-sendto-3.8.3.tar.xz) = 377928
diff --git a/deskutils/nautilus-sendto/pkg-descr b/deskutils/nautilus-sendto/pkg-descr
index 511fa8b9e125..b3f09f23d0bd 100644
--- a/deskutils/nautilus-sendto/pkg-descr
+++ b/deskutils/nautilus-sendto/pkg-descr
@@ -5,4 +5,4 @@ zipped up before being attached.
The application is intented to integrate with nautilus and is
written for the GNOME graphical desktop.
-WWW: https://github.com/GNOME/nautilus-sendto
+WWW: https://www.gnome.org/
diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist
index 7bf8c66dc60c..668ddd990425 100644
--- a/deskutils/nautilus-sendto/pkg-plist
+++ b/deskutils/nautilus-sendto/pkg-plist
@@ -11,6 +11,7 @@ share/locale/bg/LC_MESSAGES/nautilus-sendto.mo
share/locale/bn/LC_MESSAGES/nautilus-sendto.mo
share/locale/bn_IN/LC_MESSAGES/nautilus-sendto.mo
share/locale/br/LC_MESSAGES/nautilus-sendto.mo
+share/locale/bs/LC_MESSAGES/nautilus-sendto.mo
share/locale/ca/LC_MESSAGES/nautilus-sendto.mo
share/locale/ca@valencia/LC_MESSAGES/nautilus-sendto.mo
share/locale/cs/LC_MESSAGES/nautilus-sendto.mo
@@ -37,6 +38,7 @@ share/locale/he/LC_MESSAGES/nautilus-sendto.mo
share/locale/hi/LC_MESSAGES/nautilus-sendto.mo
share/locale/hu/LC_MESSAGES/nautilus-sendto.mo
share/locale/id/LC_MESSAGES/nautilus-sendto.mo
+share/locale/is/LC_MESSAGES/nautilus-sendto.mo
share/locale/it/LC_MESSAGES/nautilus-sendto.mo
share/locale/ja/LC_MESSAGES/nautilus-sendto.mo
share/locale/ka/LC_MESSAGES/nautilus-sendto.mo
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 1435bd05d55f..af0b9247be24 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= notification-daemon
-PORTVERSION= 3.18.1
+PORTVERSION= 3.20.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
@@ -18,12 +18,11 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
PORTSCOUT= limitw:1,even
USE_GNOME= gnomeprefix gtk30
-USES= gettext gmake gnome pathfix pkgconfig tar:xz
+USES= gettext gmake gnome localbase pathfix \
+ pkgconfig tar:xz
USE_XORG= x11
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/deskutils/notification-daemon/distinfo b/deskutils/notification-daemon/distinfo
index 0e587ff3f4fd..136f52cc8c37 100644
--- a/deskutils/notification-daemon/distinfo
+++ b/deskutils/notification-daemon/distinfo
@@ -1,2 +1,3 @@
-SHA256 (notification-daemon-3.18.1.tar.xz) = 5c3c86d677884b648bff58985fd3f5eb67d1fc92b78161f1e2e1dc5be91f5d05
-SIZE (notification-daemon-3.18.1.tar.xz) = 327140
+TIMESTAMP = 1538308391
+SHA256 (notification-daemon-3.20.0.tar.xz) = dd13768f35fd8bba9c4920b0f8269f39270e5a3cfed1a34c3b940a492286ece5
+SIZE (notification-daemon-3.20.0.tar.xz) = 340752
diff --git a/deskutils/notification-daemon/pkg-plist b/deskutils/notification-daemon/pkg-plist
index d12a54156ed2..df7f87cbdf56 100644
--- a/deskutils/notification-daemon/pkg-plist
+++ b/deskutils/notification-daemon/pkg-plist
@@ -1,4 +1,3 @@
-etc/xdg/autostart/notification-daemon-autostart.desktop
libexec/notification-daemon
share/applications/notification-daemon.desktop
share/locale/af/LC_MESSAGES/notification-daemon.mo
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index cb6d855b12a5..8fa3656d34ba 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -3,7 +3,7 @@
PORTNAME= orage
PORTVERSION= 4.12.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/
DIST_SUBDIR= xfce4
diff --git a/deskutils/orage/files/patch-src_ical-code.c b/deskutils/orage/files/patch-src_ical-code.c
new file mode 100644
index 000000000000..88c043160166
--- /dev/null
+++ b/deskutils/orage/files/patch-src_ical-code.c
@@ -0,0 +1,79 @@
+Propposed patch from comment #3
+https://bugzilla.xfce.org/show_bug.cgi?id=13997
+
+From 58e4bb4d3b982876dec33d55003d591559439598 Mon Sep 17 00:00:00 2001
+From: Stefan Seyfried <seife+dev@b1-systems.com>
+Date: Sat, 3 Mar 2018 20:25:24 +0100
+Subject: [PATCH] fix build with libical version 3
+
+---
+ src/ical-code.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/ical-code.c b/src/ical-code.c
+index d5831404..c40042c3 100644
+--- src/ical-code.c
++++ src/ical-code.c
+@@ -2579,7 +2579,9 @@ static struct icaltimetype count_first_alarm_time(xfical_period per
+ * when counting alarm time. */
+ if (rel == ICAL_RELATED_START) {
+ per.stime.is_date = 0;
++#if ICAL_MAJOR_VERSION < 3
+ per.stime.is_utc = 1;
++#endif
+ per.stime.is_daylight = 0;
+ per.stime.zone = utc_icaltimezone;
+ per.stime.hour = 0;
+@@ -2588,7 +2590,9 @@ static struct icaltimetype count_first_alarm_time(xfical_period per
+ }
+ else {
+ per.etime.is_date = 0;
++#if ICAL_MAJOR_VERSION < 3
+ per.etime.is_utc = 1;
++#endif
+ per.etime.is_daylight = 0;
+ per.etime.zone = utc_icaltimezone;
+ per.etime.hour = 0;
+@@ -2613,7 +2617,9 @@ static struct icaltimetype count_next_alarm_time(struct icaltimetype start_time
+ /* HACK: convert to UTC time so that we can use time arithmetic
+ * when counting alarm time. */
+ start_time.is_date = 0;
++#if ICAL_MAJOR_VERSION < 3
+ start_time.is_utc = 1;
++#endif
+ start_time.is_daylight = 0;
+ start_time.zone = utc_icaltimezone;
+ start_time.hour = 0;
+@@ -2768,7 +2774,9 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c
+ */
+ if (icaltime_is_date(per.stime)) {
+ if (local_icaltimezone != utc_icaltimezone) {
++#if ICAL_MAJOR_VERSION < 3
+ next_alarm_time.is_utc = 0;
++#endif
+ next_alarm_time.is_daylight = 0;
+ next_alarm_time.zone = local_icaltimezone;
+ }
+@@ -2850,7 +2858,9 @@ orage_message(120, P_N "Alarm rec loop next_start:%s next_alarm:%s per.stime:%s"
+ */
+ if (icaltime_is_date(per.stime)) {
+ if (local_icaltimezone != utc_icaltimezone) {
++#if ICAL_MAJOR_VERSION < 3
+ next_alarm_time.is_utc = 0;
++#endif
+ next_alarm_time.is_daylight = 0;
+ next_alarm_time.zone = local_icaltimezone;
+ }
+@@ -2944,7 +2954,9 @@ orage_message(120, P_N "*****After loop Alarm %s %s", icaltime_as_ical_string(ne
+ */
+ if (icaltime_is_date(per.stime)) {
+ if (local_icaltimezone != utc_icaltimezone) {
++#if ICAL_MAJOR_VERSION < 3
+ next_alarm_time.is_utc = 0;
++#endif
+ next_alarm_time.is_daylight = 0;
+ next_alarm_time.zone = local_icaltimezone;
+ }
+--
+2.16.2
+
diff --git a/devel/Makefile b/devel/Makefile
index bde7a34d1707..54a9e3d5921e 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1270,6 +1270,7 @@
SUBDIR += json-glib
SUBDIR += jsoncpp
SUBDIR += jsonnet
+ SUBDIR += jsonrpc-glib
SUBDIR += judy
SUBDIR += jwasm
SUBDIR += k8048
@@ -1587,7 +1588,6 @@
SUBDIR += libsmraw
SUBDIR += libsoup
SUBDIR += libsoup-gnome
- SUBDIR += libsoup-reference
SUBDIR += libspark2012
SUBDIR += libspice-server
SUBDIR += libstatgrab
@@ -6244,6 +6244,7 @@
SUBDIR += tclvfs
SUBDIR += tclxml
SUBDIR += tdl
+ SUBDIR += template-glib
SUBDIR += terminality
SUBDIR += tevent
SUBDIR += tex-kpathsea
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index aca56a92c291..8e4627ff89a1 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= anjuta
-PORTVERSION= 3.18.2
-PORTREVISION= 6
+PORTVERSION= 3.28.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -14,6 +13,8 @@ COMMENT= Integrated Development Environment for C and C++
BUILD_DEPENDS= autogen:devel/autogen \
itstool:textproc/itstool
LIB_DEPENDS+= libpcre.so:devel/pcre \
+ libexpat.so:textproc/expat2 \
+ libfribidi.so:converters/fribidi \
libgdl-3.so:x11-toolkits/gdl
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
autogen:devel/autogen \
@@ -38,7 +39,7 @@ gjs_CMD= ${LOCALBASE}/bin/gjs
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-USE_GNOME= gtksourceview3 intlhack libgda5 libwnck3 vte3
+USE_GNOME= cairo gtksourceview3 intlhack libgda5 libwnck3
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -72,7 +73,6 @@ GLIB_SCHEMAS= org.gnome.anjuta.cvs.gschema.xml \
org.gnome.anjuta.snippets.gschema.xml \
org.gnome.anjuta.starter.gschema.xml \
org.gnome.anjuta.symbol-db.gschema.xml \
- org.gnome.anjuta.terminal.gschema.xml \
org.gnome.anjuta.tools.gschema.xml
OPTIONS_SUB= yes
@@ -89,6 +89,9 @@ GLADE_CONFIGURE_ENABLE= plugin-glade
TERMINAL_USE= GNOME=vte3
TERMINAL_CONFIGURE_ENABLE= plugin-terminal
+TERMINAL_LIB_DEPENDS= libgnutls.so:security/gnutls \
+ libpcre2-8.so:devel/pcre2
+TERMINAL_VARS= GLIB_SCHEMAS+=org.gnome.anjuta.terminal.gschema.xml
SVN_BUILD_DEPENDS= svn:devel/subversion
SVN_LIB_DEPENDS= libapr-1.so:devel/apr1 \
@@ -96,10 +99,12 @@ SVN_LIB_DEPENDS= libapr-1.so:devel/apr1 \
SVN_RUN_DEPENDS= svn:devel/subversion
SVN_CONFIGURE_ENABLE= plugin-subversion
-DEVHELP_LIB_DEPENDS= libdevhelp-3.so:devel/devhelp
+DEVHELP_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
+ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+ libdevhelp-3.so:devel/devhelp
DEVHELP_CONFIGURE_ENBABLE= plugin-devhelp
-VALA_VER= 0.36
+VALA_VER= 0.40
VALA_BUILD_DEPENDS= vala>=${VALA_VER},1<${VALA_VER}.99,1:lang/vala
VALA_RUN_DEPENDS= vala>=${VALA_VER},1<${VALA_VER}.99,1:lang/vala
VALA_CONFIGURE_ENABLE= vala
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 8cc1f788b5e5..efeced4809bb 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/anjuta-3.18.2.tar.xz) = be864f2f1807e1b870697f646294e997d221d5984a135245543b719e501cef8e
-SIZE (gnome3/anjuta-3.18.2.tar.xz) = 6356972
+TIMESTAMP = 1536528098
+SHA256 (gnome3/anjuta-3.28.0.tar.xz) = b087b0a5857952d0edd24dae458616eb166a3257bc647d5279a9e71495544779
+SIZE (gnome3/anjuta-3.28.0.tar.xz) = 6382736
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index 55afd3d2f61c..b8e2709062ca 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -154,7 +154,7 @@ lib/anjuta/anjuta-run-program.plugin
lib/anjuta/anjuta-snippets-manager.plugin
lib/anjuta/anjuta-starter.plugin
%%SVN%%lib/anjuta/anjuta-subversion.plugin
-lib/anjuta/anjuta-terminal.plugin
+%%TERMINAL%%lib/anjuta/anjuta-terminal.plugin
lib/anjuta/anjuta-tools.plugin
%%VALA%%lib/anjuta/anjuta-vala.plugin
lib/anjuta/dir-project.plugin
@@ -195,7 +195,7 @@ lib/anjuta/libanjuta-sourceview.so
lib/anjuta/libanjuta-starter.so
%%SVN%%lib/anjuta/libanjuta-subversion.so
lib/anjuta/libanjuta-symbol-db.so
-lib/anjuta/libanjuta-terminal.so
+%%TERMINAL%%lib/anjuta/libanjuta-terminal.so
lib/anjuta/libanjuta-tools.so
lib/anjuta/libdir-project.so
lib/anjuta/libfile-manager.so
@@ -248,7 +248,7 @@ man/man1/anjuta.1.gz
%%DATADIR%%/glade/anjuta-run-program.ui
%%SVN%%%%DATADIR%%/glade/anjuta-subversion.ui
%%DATADIR%%/glade/anjuta-symbol-db.ui
-%%DATADIR%%/glade/anjuta-terminal-plugin.ui
+%%TERMINAL%%%%DATADIR%%/glade/anjuta-terminal-plugin.ui
%%DATADIR%%/glade/anjuta-tools.ui
%%VALA%%%%DATADIR%%/glade/anjuta-vala.ui
%%DATADIR%%/glade/applogo.png
@@ -467,13 +467,12 @@ man/man1/anjuta.1.gz
%%DATADIR%%/ui/anjuta-sourceview.xml
%%SVN%%%%DATADIR%%/ui/anjuta-subversion.xml
%%DATADIR%%/ui/anjuta-symbol-db-plugin.xml
-%%DATADIR%%/ui/anjuta-terminal-plugin.xml
+%%TERMINAL%%%%DATADIR%%/ui/anjuta-terminal-plugin.xml
%%DATADIR%%/ui/anjuta-tools.xml
%%DATADIR%%/ui/anjuta.xml
%%DATADIR%%/ui/file-manager.xml
%%DATADIR%%/ui/snippets-manager-ui.xml
%%DATADIR%%/welcome.txt
-share/appdata/anjuta.appdata.xml
share/applications/anjuta.desktop
share/doc/anjuta/AUTHORS
share/doc/anjuta/COPYING
@@ -604,7 +603,6 @@ share/gtk-doc/html/libanjuta/distribution.html
share/gtk-doc/html/libanjuta/header-block.html
share/gtk-doc/html/libanjuta/home.png
share/gtk-doc/html/libanjuta/index.html
-share/gtk-doc/html/libanjuta/index.sgml
share/gtk-doc/html/libanjuta/internationalization.html
share/gtk-doc/html/libanjuta/left-insensitive.png
share/gtk-doc/html/libanjuta/left.png
@@ -794,6 +792,16 @@ share/help/ca/anjuta-manual/project-wizard-template.page
share/help/ca/anjuta-manual/run-parameters-dialog.page
share/help/ca/anjuta-manual/run-run.page
share/help/ca/anjuta-manual/widget-index.page
+share/help/cs/anjuta-faqs/editor-goto-error.page
+share/help/cs/anjuta-faqs/editor-maximize.page
+share/help/cs/anjuta-faqs/editor-scintilla.page
+share/help/cs/anjuta-faqs/general-bugs.page
+share/help/cs/anjuta-faqs/general-feature.page
+share/help/cs/anjuta-faqs/general-name.page
+share/help/cs/anjuta-faqs/general-windows.page
+share/help/cs/anjuta-faqs/index.page
+share/help/cs/anjuta-faqs/project-existing.page
+share/help/cs/anjuta-faqs/project-resource.page
share/help/cs/anjuta-manual/anjuta-code-assist.page
share/help/cs/anjuta-manual/anjuta-code-help.page
share/help/cs/anjuta-manual/anjuta-code-indentation.page
@@ -1072,6 +1080,29 @@ share/help/el/anjuta-manual/project-wizard-template.page
share/help/el/anjuta-manual/run-parameters-dialog.page
share/help/el/anjuta-manual/run-run.page
share/help/el/anjuta-manual/widget-index.page
+share/help/es/anjuta-build-tutorial/figures/autotools-process.png
+share/help/es/anjuta-build-tutorial/figures/build_preferences.png
+share/help/es/anjuta-build-tutorial/figures/compilation-stages.png
+share/help/es/anjuta-build-tutorial/figures/configure-dialog.png
+share/help/es/anjuta-build-tutorial/figures/configure-process.png
+share/help/es/anjuta-build-tutorial/figures/library-add-pkgconfig.png
+share/help/es/anjuta-build-tutorial/figures/library-add-properties.png
+share/help/es/anjuta-build-tutorial/figures/new-project-basic.png
+share/help/es/anjuta-build-tutorial/figures/new-project-message.png
+share/help/es/anjuta-build-tutorial/figures/new-project-options.png
+share/help/es/anjuta-build-tutorial/figures/new-project-select.png
+share/help/es/anjuta-build-tutorial/figures/new-project-summary.png
+share/help/es/anjuta-build-tutorial/index.docbook
+share/help/es/anjuta-faqs/editor-goto-error.page
+share/help/es/anjuta-faqs/editor-maximize.page
+share/help/es/anjuta-faqs/editor-scintilla.page
+share/help/es/anjuta-faqs/general-bugs.page
+share/help/es/anjuta-faqs/general-feature.page
+share/help/es/anjuta-faqs/general-name.page
+share/help/es/anjuta-faqs/general-windows.page
+share/help/es/anjuta-faqs/index.page
+share/help/es/anjuta-faqs/project-existing.page
+share/help/es/anjuta-faqs/project-resource.page
share/help/es/anjuta-manual/anjuta-code-assist.page
share/help/es/anjuta-manual/anjuta-code-help.page
share/help/es/anjuta-manual/anjuta-code-indentation.page
@@ -1541,6 +1572,16 @@ share/help/oc/anjuta-manual/project-wizard-template.page
share/help/oc/anjuta-manual/run-parameters-dialog.page
share/help/oc/anjuta-manual/run-run.page
share/help/oc/anjuta-manual/widget-index.page
+share/help/pt_BR/anjuta-faqs/editor-goto-error.page
+share/help/pt_BR/anjuta-faqs/editor-maximize.page
+share/help/pt_BR/anjuta-faqs/editor-scintilla.page
+share/help/pt_BR/anjuta-faqs/general-bugs.page
+share/help/pt_BR/anjuta-faqs/general-feature.page
+share/help/pt_BR/anjuta-faqs/general-name.page
+share/help/pt_BR/anjuta-faqs/general-windows.page
+share/help/pt_BR/anjuta-faqs/index.page
+share/help/pt_BR/anjuta-faqs/project-existing.page
+share/help/pt_BR/anjuta-faqs/project-resource.page
share/help/pt_BR/anjuta-manual/anjuta-code-assist.page
share/help/pt_BR/anjuta-manual/anjuta-code-help.page
share/help/pt_BR/anjuta-manual/anjuta-code-indentation.page
@@ -2044,6 +2085,7 @@ share/locale/es/LC_MESSAGES/anjuta.mo
share/locale/eu/LC_MESSAGES/anjuta.mo
share/locale/fi/LC_MESSAGES/anjuta.mo
share/locale/fr/LC_MESSAGES/anjuta.mo
+share/locale/fur/LC_MESSAGES/anjuta.mo
share/locale/ga/LC_MESSAGES/anjuta.mo
share/locale/gl/LC_MESSAGES/anjuta.mo
share/locale/gu/LC_MESSAGES/anjuta.mo
@@ -2095,6 +2137,7 @@ share/locale/vi/LC_MESSAGES/anjuta.mo
share/locale/zh_CN/LC_MESSAGES/anjuta.mo
share/locale/zh_HK/LC_MESSAGES/anjuta.mo
share/locale/zh_TW/LC_MESSAGES/anjuta.mo
+share/metainfo/anjuta.appdata.xml
share/mime/packages/anjuta.xml
share/pixmaps/anjuta/am-project-plugin-48.png
share/pixmaps/anjuta/anjuta-attach-16.png
@@ -2247,8 +2290,8 @@ share/pixmaps/anjuta/anjuta-swap-24.png
share/pixmaps/anjuta/anjuta-symbol-db-plugin-16.png
share/pixmaps/anjuta/anjuta-symbol-db-plugin-48.png
share/pixmaps/anjuta/anjuta-symbol-db-plugin.svg
-share/pixmaps/anjuta/anjuta-terminal-plugin-48.png
-share/pixmaps/anjuta/anjuta-terminal-plugin.svg
+%%TERMINAL%%share/pixmaps/anjuta/anjuta-terminal-plugin-48.png
+%%TERMINAL%%share/pixmaps/anjuta/anjuta-terminal-plugin.svg
share/pixmaps/anjuta/anjuta-tools-plugin-48.png
share/pixmaps/anjuta/anjuta-tools-plugin.svg
%%VALA%%share/pixmaps/anjuta/anjuta-vala.png
diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile
index 21042a28b5c1..059706368b6d 100644
--- a/devel/appstream-glib/Makefile
+++ b/devel/appstream-glib/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= appstream-glib
-PORTVERSION= 0.5.7
+PORTVERSION= 0.7.8
CATEGORIES= devel
-#MASTER_SITES= http://people.freedesktop.org/~hughsient/appstream-glib/releases/
-MASTER_SITES= http://rainbow-runner.nl/freebsd/
-DIST_SUBDIR= gnome3
+MASTER_SITES= http://people.freedesktop.org/~hughsient/appstream-glib/releases/
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library to help with AppStream metadata
@@ -14,42 +13,34 @@ COMMENT= Library to help with AppStream metadata
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
+CONFLICTS_BUILD= appstream-glib-0.5.*
+
BUILD_DEPENDS= gtkdoc-check:textproc/gtk-doc \
gcab:archivers/gcab
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
+ libjson-glib-1.0.so:devel/json-glib \
libyaml.so:textproc/libyaml \
libuuid.so:misc/e2fsprogs-libuuid \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
RUN_DEPENDS= gcab:archivers/gcab
-USES= gettext gperf gmake gnome libarchive libtool pathfix \
+USES= gettext gperf gnome libarchive meson \
pkgconfig sqlite tar:xz
-USE_GNOME= gdkpixbuf2 glib20 gtk30 intlhack introspection:build \
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 introspection:build \
libxml2:build pango
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --with-xml-catalog=${LOCALBASE}/share/xml/catalog \
- --disable-rpm \
- --disable-ostree
-INSTALL_TARGET= install-strip
+MESON_ARGS= -Drpm=false \
+ -Dalpm=false \
+ -Dstemmer=false
OPTIONS_DEFINE= MANPAGES
OPTIONS_DEFAULT=MANPAGES
OPTIONS_SUB= yes
-MANPAGES_CONFIGURE_ENABLE= man
-MANPAGES_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \
+
+MANPAGES_MESON_TRUE= man
+MANPAGE_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \
docbook-xsl>=0:textproc/docbook-xsl
MANPAGES_USE= GNOME=libxslt:build
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == powerpc || ${ARCH} == powerpc64
-post-patch:
- @${REINPLACE_CMD} -e 's|-Wtype-limits||g' \
- ${WRKSRC}/configure
-.endif
-
.include <bsd.port.mk>
diff --git a/devel/appstream-glib/distinfo b/devel/appstream-glib/distinfo
index 1c018481e926..940336c7db6e 100644
--- a/devel/appstream-glib/distinfo
+++ b/devel/appstream-glib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/appstream-glib-0.5.7.tar.xz) = 6d7fe9c5a3dd4488398628ad283a6383cc5324a02f6ff504c73393adc4972264
-SIZE (gnome3/appstream-glib-0.5.7.tar.xz) = 1858904
+TIMESTAMP = 1526118345
+SHA256 (gnome/appstream-glib-0.7.8.tar.xz) = eb0e2cfd5a6070615efea4c87b1fc539f4566085aa5f5b41945f679d9d61dd4c
+SIZE (gnome/appstream-glib-0.7.8.tar.xz) = 2244652
diff --git a/devel/appstream-glib/pkg-plist b/devel/appstream-glib/pkg-plist
index e1e28a3c0e78..b0f981ede9d4 100644
--- a/devel/appstream-glib/pkg-plist
+++ b/devel/appstream-glib/pkg-plist
@@ -4,48 +4,49 @@ bin/appstream-util
include/libappstream-builder/appstream-builder.h
include/libappstream-builder/asb-app.h
include/libappstream-glib/appstream-glib.h
-include/libappstream-glib/as-app-gettext.h
+include/libappstream-glib/as-agreement-section.h
+include/libappstream-glib/as-agreement.h
+include/libappstream-glib/as-app-builder.h
include/libappstream-glib/as-app.h
include/libappstream-glib/as-bundle.h
include/libappstream-glib/as-checksum.h
+include/libappstream-glib/as-content-rating.h
include/libappstream-glib/as-enums.h
+include/libappstream-glib/as-format.h
include/libappstream-glib/as-icon.h
include/libappstream-glib/as-image.h
include/libappstream-glib/as-inf.h
+include/libappstream-glib/as-launchable.h
+include/libappstream-glib/as-markup.h
+include/libappstream-glib/as-monitor.h
include/libappstream-glib/as-node.h
include/libappstream-glib/as-problem.h
include/libappstream-glib/as-profile.h
include/libappstream-glib/as-provide.h
include/libappstream-glib/as-release.h
+include/libappstream-glib/as-require.h
+include/libappstream-glib/as-review.h
include/libappstream-glib/as-screenshot.h
include/libappstream-glib/as-store.h
+include/libappstream-glib/as-suggest.h
include/libappstream-glib/as-tag.h
+include/libappstream-glib/as-translation.h
include/libappstream-glib/as-utils.h
include/libappstream-glib/as-version.h
-lib/asb-plugins-5/libasb_plugin_absorb.a
-lib/asb-plugins-5/libasb_plugin_absorb.so
-lib/asb-plugins-5/libasb_plugin_appdata.a
lib/asb-plugins-5/libasb_plugin_appdata.so
-lib/asb-plugins-5/libasb_plugin_dbus.a
-lib/asb-plugins-5/libasb_plugin_dbus.so
-lib/asb-plugins-5/libasb_plugin_desktop.a
lib/asb-plugins-5/libasb_plugin_desktop.so
-lib/asb-plugins-5/libasb_plugin_font.a
lib/asb-plugins-5/libasb_plugin_font.so
-lib/asb-plugins-5/libasb_plugin_gettext.a
lib/asb-plugins-5/libasb_plugin_gettext.so
-lib/asb-plugins-5/libasb_plugin_hardcoded.a
lib/asb-plugins-5/libasb_plugin_hardcoded.so
+lib/asb-plugins-5/libasb_plugin_shell_extension.so
lib/girepository-1.0/AppStreamBuilder-1.0.typelib
lib/girepository-1.0/AppStreamGlib-1.0.typelib
-lib/libappstream-builder.a
lib/libappstream-builder.so
lib/libappstream-builder.so.8
-lib/libappstream-builder.so.8.0.4
-lib/libappstream-glib.a
+lib/libappstream-builder.so.8.0.10
lib/libappstream-glib.so
lib/libappstream-glib.so.8
-lib/libappstream-glib.so.8.0.4
+lib/libappstream-glib.so.8.0.10
libdata/pkgconfig/appstream-builder.pc
libdata/pkgconfig/appstream-glib.pc
%%MANPAGES%%man/man1/appstream-builder.1.gz
@@ -59,33 +60,6 @@ share/gettext/its/appdata.its
share/gettext/its/appdata.loc
share/gir-1.0/AppStreamBuilder-1.0.gir
share/gir-1.0/AppStreamGlib-1.0.gir
-share/gtk-doc/html/appstream-glib/AsApp.html
-share/gtk-doc/html/appstream-glib/AsChecksum.html
-share/gtk-doc/html/appstream-glib/AsIcon.html
-share/gtk-doc/html/appstream-glib/AsImage.html
-share/gtk-doc/html/appstream-glib/AsProblem.html
-share/gtk-doc/html/appstream-glib/AsProvide.html
-share/gtk-doc/html/appstream-glib/AsRelease.html
-share/gtk-doc/html/appstream-glib/AsScreenshot.html
-share/gtk-doc/html/appstream-glib/AsStore.html
-share/gtk-doc/html/appstream-glib/annotation-glossary.html
-share/gtk-doc/html/appstream-glib/appstream-glib-as-enums.html
-share/gtk-doc/html/appstream-glib/appstream-glib-as-node.html
-share/gtk-doc/html/appstream-glib/appstream-glib-as-tag.html
-share/gtk-doc/html/appstream-glib/appstream-glib-as-utils.html
-share/gtk-doc/html/appstream-glib/appstream-glib-as-version.html
-share/gtk-doc/html/appstream-glib/appstream-glib.devhelp2
-share/gtk-doc/html/appstream-glib/home.png
-share/gtk-doc/html/appstream-glib/index.html
-share/gtk-doc/html/appstream-glib/index.sgml
-share/gtk-doc/html/appstream-glib/left-insensitive.png
-share/gtk-doc/html/appstream-glib/left.png
-share/gtk-doc/html/appstream-glib/libappstream-glib.html
-share/gtk-doc/html/appstream-glib/right-insensitive.png
-share/gtk-doc/html/appstream-glib/right.png
-share/gtk-doc/html/appstream-glib/style.css
-share/gtk-doc/html/appstream-glib/up-insensitive.png
-share/gtk-doc/html/appstream-glib/up.png
share/installed-tests/appstream-glib/appdata-validate.test
share/installed-tests/appstream-glib/destdir-check.test
share/locale/ca/LC_MESSAGES/appstream-glib.mo
@@ -96,10 +70,14 @@ share/locale/en_GB/LC_MESSAGES/appstream-glib.mo
share/locale/es/LC_MESSAGES/appstream-glib.mo
share/locale/fi/LC_MESSAGES/appstream-glib.mo
share/locale/fr/LC_MESSAGES/appstream-glib.mo
+share/locale/fur/LC_MESSAGES/appstream-glib.mo
share/locale/gl/LC_MESSAGES/appstream-glib.mo
share/locale/hu/LC_MESSAGES/appstream-glib.mo
+share/locale/id/LC_MESSAGES/appstream-glib.mo
share/locale/it/LC_MESSAGES/appstream-glib.mo
share/locale/ko/LC_MESSAGES/appstream-glib.mo
+share/locale/lt/LC_MESSAGES/appstream-glib.mo
+share/locale/oc/LC_MESSAGES/appstream-glib.mo
share/locale/pl/LC_MESSAGES/appstream-glib.mo
share/locale/pt/LC_MESSAGES/appstream-glib.mo
share/locale/pt_BR/LC_MESSAGES/appstream-glib.mo
diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile
index 2d248b7ae0a6..1b6640480c0a 100644
--- a/devel/dconf-editor/Makefile
+++ b/devel/dconf-editor/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= dconf-editor
-PORTVERSION= 3.22.1
+PORTVERSION= 3.28.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Configuration database editor for GNOME
@@ -19,12 +19,12 @@ LIB_DEPENDS= libdconf.so:devel/dconf
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome localbase pathfix \
- pkgconfig tar:xz
-USE_GNOME= cairo intltool gtk30 libxml2
+USES= gettext gnome localbase meson \
+ pkgconfig python:3.6+,build tar:xz
+USE_GNOME= gtk30
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
+BINARY_ALIAS= python3=${PYTHON_VERSION}
+
GLIB_SCHEMAS= ca.desrt.dconf-editor.gschema.xml
.include <bsd.port.mk>
diff --git a/devel/dconf-editor/distinfo b/devel/dconf-editor/distinfo
index 5a4f63f547b5..8afcf7b0e050 100644
--- a/devel/dconf-editor/distinfo
+++ b/devel/dconf-editor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477082413
-SHA256 (gnome3/dconf-editor-3.22.1.tar.xz) = 0a0e56a5dc7cc20cd7127901069939f0c8049b585f90e229ef753ee9b3a4c126
-SIZE (gnome3/dconf-editor-3.22.1.tar.xz) = 419100
+TIMESTAMP = 1526105706
+SHA256 (gnome/dconf-editor-3.28.0.tar.xz) = 455b53d827820efd28a176ee52e13eda5cda8cdf4e31e0145cfdd69931bf0c5a
+SIZE (gnome/dconf-editor-3.28.0.tar.xz) = 417244
diff --git a/devel/dconf-editor/pkg-plist b/devel/dconf-editor/pkg-plist
index a2f22aeaf18c..fc197f0c8d7c 100644
--- a/devel/dconf-editor/pkg-plist
+++ b/devel/dconf-editor/pkg-plist
@@ -1,74 +1,77 @@
bin/dconf-editor
man/man1/dconf-editor.1.gz
-share/appdata/ca.desrt.dconf-editor.appdata.xml
share/applications/ca.desrt.dconf-editor.desktop
+share/bash-completion/completions/dconf-editor
share/dbus-1/services/ca.desrt.dconf-editor.service
-share/icons/hicolor/16x16/apps/dconf-editor.png
-share/icons/hicolor/22x22/apps/dconf-editor.png
-share/icons/hicolor/24x24/apps/dconf-editor.png
-share/icons/hicolor/256x256/apps/dconf-editor.png
-share/icons/hicolor/32x32/apps/dconf-editor.png
-share/icons/hicolor/48x48/apps/dconf-editor.png
-share/icons/hicolor/64x64/apps/dconf-editor.png
-share/icons/hicolor/scalable/apps/dconf-editor-symbolic.svg
-share/locale/an/LC_MESSAGES/dconf.mo
-share/locale/ar/LC_MESSAGES/dconf.mo
-share/locale/as/LC_MESSAGES/dconf.mo
-share/locale/be/LC_MESSAGES/dconf.mo
-share/locale/bg/LC_MESSAGES/dconf.mo
-share/locale/bn_IN/LC_MESSAGES/dconf.mo
-share/locale/bs/LC_MESSAGES/dconf.mo
-share/locale/ca/LC_MESSAGES/dconf.mo
-share/locale/ca@valencia/LC_MESSAGES/dconf.mo
-share/locale/cs/LC_MESSAGES/dconf.mo
-share/locale/da/LC_MESSAGES/dconf.mo
-share/locale/de/LC_MESSAGES/dconf.mo
-share/locale/el/LC_MESSAGES/dconf.mo
-share/locale/en_GB/LC_MESSAGES/dconf.mo
-share/locale/eo/LC_MESSAGES/dconf.mo
-share/locale/es/LC_MESSAGES/dconf.mo
-share/locale/et/LC_MESSAGES/dconf.mo
-share/locale/eu/LC_MESSAGES/dconf.mo
-share/locale/fa/LC_MESSAGES/dconf.mo
-share/locale/fi/LC_MESSAGES/dconf.mo
-share/locale/fr/LC_MESSAGES/dconf.mo
-share/locale/fur/LC_MESSAGES/dconf.mo
-share/locale/gl/LC_MESSAGES/dconf.mo
-share/locale/he/LC_MESSAGES/dconf.mo
-share/locale/hi/LC_MESSAGES/dconf.mo
-share/locale/hu/LC_MESSAGES/dconf.mo
-share/locale/id/LC_MESSAGES/dconf.mo
-share/locale/is/LC_MESSAGES/dconf.mo
-share/locale/it/LC_MESSAGES/dconf.mo
-share/locale/ja/LC_MESSAGES/dconf.mo
-share/locale/kk/LC_MESSAGES/dconf.mo
-share/locale/ko/LC_MESSAGES/dconf.mo
-share/locale/lt/LC_MESSAGES/dconf.mo
-share/locale/lv/LC_MESSAGES/dconf.mo
-share/locale/ml/LC_MESSAGES/dconf.mo
-share/locale/mr/LC_MESSAGES/dconf.mo
-share/locale/nb/LC_MESSAGES/dconf.mo
-share/locale/nl/LC_MESSAGES/dconf.mo
-share/locale/oc/LC_MESSAGES/dconf.mo
-share/locale/pa/LC_MESSAGES/dconf.mo
-share/locale/pl/LC_MESSAGES/dconf.mo
-share/locale/pt/LC_MESSAGES/dconf.mo
-share/locale/pt_BR/LC_MESSAGES/dconf.mo
-share/locale/ro/LC_MESSAGES/dconf.mo
-share/locale/ru/LC_MESSAGES/dconf.mo
-share/locale/sk/LC_MESSAGES/dconf.mo
-share/locale/sl/LC_MESSAGES/dconf.mo
-share/locale/sr/LC_MESSAGES/dconf.mo
-share/locale/sr@latin/LC_MESSAGES/dconf.mo
-share/locale/sv/LC_MESSAGES/dconf.mo
-share/locale/ta/LC_MESSAGES/dconf.mo
-share/locale/te/LC_MESSAGES/dconf.mo
-share/locale/tg/LC_MESSAGES/dconf.mo
-share/locale/th/LC_MESSAGES/dconf.mo
-share/locale/tr/LC_MESSAGES/dconf.mo
-share/locale/ug/LC_MESSAGES/dconf.mo
-share/locale/uk/LC_MESSAGES/dconf.mo
-share/locale/vi/LC_MESSAGES/dconf.mo
-share/locale/zh_CN/LC_MESSAGES/dconf.mo
-share/locale/zh_HK/LC_MESSAGES/dconf.mo
-share/locale/zh_TW/LC_MESSAGES/dconf.mo
+share/icons/hicolor/16x16/apps/ca.desrt.dconf-editor.png
+share/icons/hicolor/22x22/apps/ca.desrt.dconf-editor.png
+share/icons/hicolor/24x24/apps/ca.desrt.dconf-editor.png
+share/icons/hicolor/256x256/apps/ca.desrt.dconf-editor.png
+share/icons/hicolor/32x32/apps/ca.desrt.dconf-editor.png
+share/icons/hicolor/48x48/apps/ca.desrt.dconf-editor.png
+share/icons/hicolor/64x64/apps/ca.desrt.dconf-editor.png
+share/icons/hicolor/scalable/apps/ca.desrt.dconf-editor-symbolic.svg
+share/locale/an/LC_MESSAGES/dconf-editor.mo
+share/locale/ar/LC_MESSAGES/dconf-editor.mo
+share/locale/as/LC_MESSAGES/dconf-editor.mo
+share/locale/be/LC_MESSAGES/dconf-editor.mo
+share/locale/bg/LC_MESSAGES/dconf-editor.mo
+share/locale/bn_IN/LC_MESSAGES/dconf-editor.mo
+share/locale/bs/LC_MESSAGES/dconf-editor.mo
+share/locale/ca/LC_MESSAGES/dconf-editor.mo
+share/locale/ca@valencia/LC_MESSAGES/dconf-editor.mo
+share/locale/cs/LC_MESSAGES/dconf-editor.mo
+share/locale/da/LC_MESSAGES/dconf-editor.mo
+share/locale/de/LC_MESSAGES/dconf-editor.mo
+share/locale/el/LC_MESSAGES/dconf-editor.mo
+share/locale/en_GB/LC_MESSAGES/dconf-editor.mo
+share/locale/eo/LC_MESSAGES/dconf-editor.mo
+share/locale/es/LC_MESSAGES/dconf-editor.mo
+share/locale/et/LC_MESSAGES/dconf-editor.mo
+share/locale/eu/LC_MESSAGES/dconf-editor.mo
+share/locale/fa/LC_MESSAGES/dconf-editor.mo
+share/locale/fi/LC_MESSAGES/dconf-editor.mo
+share/locale/fr/LC_MESSAGES/dconf-editor.mo
+share/locale/fur/LC_MESSAGES/dconf-editor.mo
+share/locale/gl/LC_MESSAGES/dconf-editor.mo
+share/locale/he/LC_MESSAGES/dconf-editor.mo
+share/locale/hi/LC_MESSAGES/dconf-editor.mo
+share/locale/hr/LC_MESSAGES/dconf-editor.mo
+share/locale/hu/LC_MESSAGES/dconf-editor.mo
+share/locale/id/LC_MESSAGES/dconf-editor.mo
+share/locale/is/LC_MESSAGES/dconf-editor.mo
+share/locale/it/LC_MESSAGES/dconf-editor.mo
+share/locale/ja/LC_MESSAGES/dconf-editor.mo
+share/locale/kk/LC_MESSAGES/dconf-editor.mo
+share/locale/ko/LC_MESSAGES/dconf-editor.mo
+share/locale/lt/LC_MESSAGES/dconf-editor.mo
+share/locale/lv/LC_MESSAGES/dconf-editor.mo
+share/locale/ml/LC_MESSAGES/dconf-editor.mo
+share/locale/mr/LC_MESSAGES/dconf-editor.mo
+share/locale/nb/LC_MESSAGES/dconf-editor.mo
+share/locale/ne/LC_MESSAGES/dconf-editor.mo
+share/locale/nl/LC_MESSAGES/dconf-editor.mo
+share/locale/oc/LC_MESSAGES/dconf-editor.mo
+share/locale/pa/LC_MESSAGES/dconf-editor.mo
+share/locale/pl/LC_MESSAGES/dconf-editor.mo
+share/locale/pt/LC_MESSAGES/dconf-editor.mo
+share/locale/pt_BR/LC_MESSAGES/dconf-editor.mo
+share/locale/ro/LC_MESSAGES/dconf-editor.mo
+share/locale/ru/LC_MESSAGES/dconf-editor.mo
+share/locale/sk/LC_MESSAGES/dconf-editor.mo
+share/locale/sl/LC_MESSAGES/dconf-editor.mo
+share/locale/sr/LC_MESSAGES/dconf-editor.mo
+share/locale/sr@latin/LC_MESSAGES/dconf-editor.mo
+share/locale/sv/LC_MESSAGES/dconf-editor.mo
+share/locale/ta/LC_MESSAGES/dconf-editor.mo
+share/locale/te/LC_MESSAGES/dconf-editor.mo
+share/locale/tg/LC_MESSAGES/dconf-editor.mo
+share/locale/th/LC_MESSAGES/dconf-editor.mo
+share/locale/tr/LC_MESSAGES/dconf-editor.mo
+share/locale/ug/LC_MESSAGES/dconf-editor.mo
+share/locale/uk/LC_MESSAGES/dconf-editor.mo
+share/locale/vi/LC_MESSAGES/dconf-editor.mo
+share/locale/zh_CN/LC_MESSAGES/dconf-editor.mo
+share/locale/zh_HK/LC_MESSAGES/dconf-editor.mo
+share/locale/zh_TW/LC_MESSAGES/dconf-editor.mo
+share/metainfo/ca.desrt.dconf-editor.appdata.xml
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 23323e2f5749..e7f4bdf9bd84 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= dconf
-PORTVERSION= 0.26.1
+PORTVERSION= 0.28.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DISTNAME= dconf-${PORTVERSION}
@@ -20,24 +20,22 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome localbase pathfix pkgconfig tar:xz
+USES= gettext gnome localbase meson pkgconfig python:3.6+,build tar:xz
USE_GNOME= glib20 libxslt:build
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
+BINARY_ALIAS= python3=${PYTHON_VERSION}
+
+MESON_ARGS= -Denable-man=true
post-patch:
@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
-e 's|"/etc"|"${PREFIX}/etc"|g' \
+ ${WRKSRC}/docs/dconf-overview.xml \
${WRKSRC}/engine/dconf-engine.c \
${WRKSRC}/engine/dconf-engine-profile.c \
${WRKSRC}/engine/dconf-engine-source-system.c \
- ${WRKSRC}/bin/dconf-update.c \
+ ${WRKSRC}/bin/dconf-update.vala \
${WRKSRC}/tests/engine.c
- @${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
- ${WRKSRC}/bin/Makefile.in \
- ${WRKSRC}/client/Makefile.in
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/docs/Makefile.in
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/db
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index ad61a0d84ff6..cf6716500d55 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507232441
-SHA256 (gnome3/dconf-0.26.1.tar.xz) = d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535
-SIZE (gnome3/dconf-0.26.1.tar.xz) = 218516
+TIMESTAMP = 1525984843
+SHA256 (gnome3/dconf-0.28.0.tar.xz) = 61d3b3865ef58b729c3b39aa0979f886c014aa8362f93dcfc74bf5648ed9c742
+SIZE (gnome3/dconf-0.28.0.tar.xz) = 99340
diff --git a/devel/dconf/files/patch-docs_Makefile.in b/devel/dconf/files/patch-docs_Makefile.in
deleted file mode 100644
index eb5f7d440b14..000000000000
--- a/devel/dconf/files/patch-docs_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- docs/Makefile.in.orig 2017-10-03 13:54:54 UTC
-+++ docs/Makefile.in
-@@ -920,13 +920,13 @@ dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-loc
- .PHONY : dist-hook-local docs
-
- %.1: %.xml
-- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $<
-
- dconf.1: dconf-tool.xml
-- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $<
-
- dconf.7: dconf-overview.xml
-- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $<
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/dconf/files/patch-docs_meson.build b/devel/dconf/files/patch-docs_meson.build
new file mode 100644
index 000000000000..c6642d8cd937
--- /dev/null
+++ b/devel/dconf/files/patch-docs_meson.build
@@ -0,0 +1,34 @@
+--- docs/meson.build.orig 2018-05-12 08:26:06.064672000 +0200
++++ docs/meson.build 2018-05-12 08:27:30.954842000 +0200
+@@ -1,16 +1,18 @@
+-gnome.gtkdoc(
+- meson.project_name(),
+- main_xml: meson.project_name() + '-docs.xml',
+- src_dir: [
+- common_inc,
+- client_inc
+- ],
+- dependencies: libdconf_dep,
+- scan_args: '--rebuild-types',
+- gobject_typesfile: meson.project_name() + '.types',
+- install: true,
+- install_dir: join_paths(dconf_datadir, 'gtk-doc', 'html', meson.project_name())
+-)
++if get_option('enable-gtk-doc')
++ gnome.gtkdoc(
++ meson.project_name(),
++ main_xml: meson.project_name() + '-docs.xml',
++ src_dir: [
++ common_inc,
++ client_inc
++ ],
++ dependencies: libdconf_dep,
++ scan_args: '--rebuild-types',
++ gobject_typesfile: meson.project_name() + '.types',
++ install: true,
++ install_dir: join_paths(dconf_datadir, 'gtk-doc', 'html', meson.project_name())
++ )
++endif
+
+ if get_option('enable-man')
+ xsltproc = find_program('xsltproc', required: false)
diff --git a/devel/dconf/files/patch-meson.build b/devel/dconf/files/patch-meson.build
new file mode 100644
index 000000000000..0f0ad1e227fc
--- /dev/null
+++ b/devel/dconf/files/patch-meson.build
@@ -0,0 +1,13 @@
+--- meson.build.orig 2018-05-12 08:27:37.460446000 +0200
++++ meson.build 2018-05-12 08:27:52.259649000 +0200
+@@ -105,9 +105,5 @@
+ subdir('gsettings')
+ subdir('client')
+ subdir('bin')
+-
+-if get_option('enable-gtk-doc')
+- subdir('docs')
+-endif
+-
++subdir('docs')
+ subdir('tests')
diff --git a/devel/dconf/files/patch-userconfigdir b/devel/dconf/files/patch-userconfigdir
new file mode 100644
index 000000000000..30edbf22d67a
--- /dev/null
+++ b/devel/dconf/files/patch-userconfigdir
@@ -0,0 +1,40 @@
+From e01be93304fdff9e4c5109ae50f1bc9e64524b0b Mon Sep 17 00:00:00 2001
+From: Sebastien Bacher <seb128@ubuntu.com>
+Date: Thu, 29 Mar 2018 10:59:34 +0200
+Subject: Don't create the user config dir as world readable
+
+https://bugzilla.gnome.org/show_bug.cgi?id=792677
+---
+ service/dconf-gvdb-utils.c | 2 +-
+ service/dconf-keyfile-writer.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/service/dconf-gvdb-utils.c b/service/dconf-gvdb-utils.c
+index 0ff4bdc..099a9f3 100644
+--- service/dconf-gvdb-utils.c
++++ service/dconf-gvdb-utils.c
+@@ -174,7 +174,7 @@ dconf_gvdb_utils_write_file (const gchar *filename,
+ * again, after mkdir().
+ */
+ dirname = g_path_get_dirname (filename);
+- g_mkdir_with_parents (dirname, 0777);
++ g_mkdir_with_parents (dirname, 0700);
+ g_free (dirname);
+
+ g_clear_error (error);
+diff --git a/service/dconf-keyfile-writer.c b/service/dconf-keyfile-writer.c
+index 88f0305..f4951bb 100644
+--- service/dconf-keyfile-writer.c
++++ service/dconf-keyfile-writer.c
+@@ -207,7 +207,7 @@ dconf_keyfile_writer_begin (DConfWriter *writer,
+ * again, after mkdir().
+ */
+ dirname = g_path_get_dirname (kfw->lock_filename);
+- g_mkdir_with_parents (dirname, 0777);
++ g_mkdir_with_parents (dirname, 0700);
+ g_free (dirname);
+
+ kfw->lock_fd = open (kfw->lock_filename, O_RDWR | O_CREAT, 0666);
+--
+cgit v0.12
+
diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist
index ff0049e74c96..7884eb58e351 100644
--- a/devel/dconf/pkg-plist
+++ b/devel/dconf/pkg-plist
@@ -15,28 +15,6 @@ man/man1/dconf.1.gz
man/man7/dconf.7.gz
share/bash-completion/completions/dconf
share/dbus-1/services/ca.desrt.dconf.service
-share/gtk-doc/html/dconf/DConfClient.html
-share/gtk-doc/html/dconf/annotation-glossary.html
-share/gtk-doc/html/dconf/api-index-full.html
-share/gtk-doc/html/dconf/ch01.html
-share/gtk-doc/html/dconf/dconf-DConfChangeset.html
-share/gtk-doc/html/dconf/dconf-DConfError.html
-share/gtk-doc/html/dconf/dconf-dconf-Paths.html
-share/gtk-doc/html/dconf/dconf-overview.html
-share/gtk-doc/html/dconf/dconf-service.html
-share/gtk-doc/html/dconf/dconf-tool.html
-share/gtk-doc/html/dconf/dconf.devhelp2
-share/gtk-doc/html/dconf/home.png
-share/gtk-doc/html/dconf/index.html
-share/gtk-doc/html/dconf/left-insensitive.png
-share/gtk-doc/html/dconf/left.png
-share/gtk-doc/html/dconf/object-tree.html
-share/gtk-doc/html/dconf/programs.html
-share/gtk-doc/html/dconf/right-insensitive.png
-share/gtk-doc/html/dconf/right.png
-share/gtk-doc/html/dconf/style.css
-share/gtk-doc/html/dconf/up-insensitive.png
-share/gtk-doc/html/dconf/up.png
share/vala/vapi/dconf.deps
share/vala/vapi/dconf.vapi
@dir %%ETCDIR%%/db
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 4373b7084bd3..7a6acb2c15b5 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= devhelp
-PORTVERSION= 3.24.0
-PORTREVISION= 4
+PORTVERSION= 3.28.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -14,6 +13,7 @@ COMMENT= Developer help browser for GNOME 3
LICENSE= GPLv2
LICENSE_FILES= ${WRKSRC}/COPYING
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libwebkit2gtk-4.0.so:www/webkit2-gtk3
diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo
index 4f5639f19e64..47c4b7353707 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496675768
-SHA256 (gnome3/devhelp-3.24.0.tar.xz) = 4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430
-SIZE (gnome3/devhelp-3.24.0.tar.xz) = 615460
+TIMESTAMP = 1525590439
+SHA256 (gnome3/devhelp-3.28.1.tar.xz) = da1ce2c66ba54908c2de5ae6b59255f02b13ca3bf98cf6c198c87c2c7fec4821
+SIZE (gnome3/devhelp-3.28.1.tar.xz) = 642992
diff --git a/devel/devhelp/files/patch-src_dh-book-manager.c b/devel/devhelp/files/patch-src_dh-book-manager.c
deleted file mode 100644
index a9d8640db7d8..000000000000
--- a/devel/devhelp/files/patch-src_dh-book-manager.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/dh-book-manager.c.orig 2010-09-01 11:30:01.000000000 +0200
-+++ src/dh-book-manager.c 2010-09-01 11:31:03.000000000 +0200
-@@ -149,6 +149,10 @@ book_manager_add_books_in_data_dir (DhBo
- dir = g_build_filename (data_dir, "devhelp", "books", NULL);
- book_manager_add_from_dir (book_manager, dir);
- g_free (dir);
-+
-+ dir = g_build_filename (data_dir, "doc", NULL);
-+ book_manager_add_from_dir (book_manager, dir);
-+ g_free (dir);
- }
-
- void
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index cafb9f0a0f7e..f75faa7db13d 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -1,63 +1,78 @@
bin/devhelp
include/devhelp-3.0/devhelp/devhelp.h
-include/devhelp-3.0/devhelp/dh-app.h
include/devhelp-3.0/devhelp/dh-assistant-view.h
-include/devhelp-3.0/devhelp/dh-assistant.h
include/devhelp-3.0/devhelp/dh-book-manager.h
include/devhelp-3.0/devhelp/dh-book-tree.h
include/devhelp-3.0/devhelp/dh-book.h
-include/devhelp-3.0/devhelp/dh-error.h
+include/devhelp-3.0/devhelp/dh-completion.h
+include/devhelp-3.0/devhelp/dh-enum-types.h
+include/devhelp-3.0/devhelp/dh-init.h
include/devhelp-3.0/devhelp/dh-keyword-model.h
-include/devhelp-3.0/devhelp/dh-language.h
include/devhelp-3.0/devhelp/dh-link.h
include/devhelp-3.0/devhelp/dh-sidebar.h
-include/devhelp-3.0/devhelp/dh-window.h
lib/gedit/plugins/__pycache__/devhelp.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/gedit/plugins/__pycache__/devhelp.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/devhelp.plugin
lib/gedit/plugins/devhelp.py
lib/girepository-1.0/Devhelp-3.0.typelib
lib/libdevhelp-3.so
-lib/libdevhelp-3.so.3
-lib/libdevhelp-3.so.3.0.0
+lib/libdevhelp-3.so.5
+lib/libdevhelp-3.so.5.0.0
libdata/pkgconfig/libdevhelp-3.0.pc
man/man1/devhelp.1.gz
-share/GConf/gsettings/devhelp.convert
-share/appdata/org.gnome.Devhelp.appdata.xml
share/applications/org.gnome.Devhelp.desktop
share/dbus-1/services/org.gnome.Devhelp.service
%%DATADIR%%/assistant/assistant.css
%%DATADIR%%/assistant/assistant.js
-%%DATADIR%%/dtd/devhelp-1.dtd
share/gir-1.0/Devhelp-3.0.gir
-share/gtk-doc/html/devhelp-3/DhApp.html
-share/gtk-doc/html/devhelp-3/DhAssistant.html
share/gtk-doc/html/devhelp-3/DhAssistantView.html
share/gtk-doc/html/devhelp-3/DhBook.html
share/gtk-doc/html/devhelp-3/DhBookManager.html
share/gtk-doc/html/devhelp-3/DhBookTree.html
+share/gtk-doc/html/devhelp-3/DhCompletion.html
share/gtk-doc/html/devhelp-3/DhKeywordModel.html
-share/gtk-doc/html/devhelp-3/DhLanguage.html
share/gtk-doc/html/devhelp-3/DhLink.html
share/gtk-doc/html/devhelp-3/DhSidebar.html
-share/gtk-doc/html/devhelp-3/DhWindow.html
+share/gtk-doc/html/devhelp-3/annexes.html
share/gtk-doc/html/devhelp-3/annotation-glossary.html
+share/gtk-doc/html/devhelp-3/api-breaks.html
share/gtk-doc/html/devhelp-3/api-index-full.html
-share/gtk-doc/html/devhelp-3/ch01.html
-share/gtk-doc/html/devhelp-3/deprecated-api-index.html
+share/gtk-doc/html/devhelp-3/api-reference.html
+share/gtk-doc/html/devhelp-3/assistant.html
+share/gtk-doc/html/devhelp-3/data.html
share/gtk-doc/html/devhelp-3/devhelp-3.devhelp2
-share/gtk-doc/html/devhelp-3/devhelp-DhError.html
-share/gtk-doc/html/devhelp-3/devhelp-Initialization.html
+share/gtk-doc/html/devhelp-3/devhelp-Initialization-and-Finalization.html
+share/gtk-doc/html/devhelp-3/general.html
share/gtk-doc/html/devhelp-3/home.png
share/gtk-doc/html/devhelp-3/index.html
share/gtk-doc/html/devhelp-3/left-insensitive.png
share/gtk-doc/html/devhelp-3/left.png
+share/gtk-doc/html/devhelp-3/misc.html
share/gtk-doc/html/devhelp-3/object-tree.html
share/gtk-doc/html/devhelp-3/right-insensitive.png
share/gtk-doc/html/devhelp-3/right.png
+share/gtk-doc/html/devhelp-3/side-panel.html
share/gtk-doc/html/devhelp-3/style.css
share/gtk-doc/html/devhelp-3/up-insensitive.png
share/gtk-doc/html/devhelp-3/up.png
+share/help/C/devhelp/index.page
+share/help/C/devhelp/search.page
+share/help/cs/devhelp/index.page
+share/help/cs/devhelp/search.page
+share/help/de/devhelp/index.page
+share/help/de/devhelp/search.page
+share/help/es/devhelp/index.page
+share/help/es/devhelp/search.page
+share/help/hr/devhelp/index.page
+share/help/hr/devhelp/search.page
+share/help/hu/devhelp/index.page
+share/help/hu/devhelp/search.page
+share/help/pl/devhelp/index.page
+share/help/pl/devhelp/search.page
+share/help/pt_BR/devhelp/index.page
+share/help/pt_BR/devhelp/search.page
+share/help/sv/devhelp/index.page
+share/help/sv/devhelp/search.page
share/icons/hicolor/16x16/apps/devhelp.png
share/icons/hicolor/22x22/apps/devhelp.png
share/icons/hicolor/24x24/apps/devhelp.png
@@ -147,3 +162,4 @@ share/locale/vi/LC_MESSAGES/devhelp.mo
share/locale/zh_CN/LC_MESSAGES/devhelp.mo
share/locale/zh_HK/LC_MESSAGES/devhelp.mo
share/locale/zh_TW/LC_MESSAGES/devhelp.mo
+share/metainfo/org.gnome.Devhelp.appdata.xml
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 17475e53c329..4f2430a8d6b9 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= glade
-PORTVERSION= 3.18.3
-PORTREVISION= 3
+PORTVERSION= 3.22.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -23,23 +22,26 @@ PORTSCOUT= limitw:1,even
USES= desktop-file-utils gettext gmake libtool \
localbase:ldflags pathfix pkgconfig tar:xz
-USE_GNOME= gtk30 gnomedocutils intlhack
-# introspection:build
-# temp disable, introspection generation crashes with GNOME 3.15
-CONFIGURE_ARGS= --disable-introspection
+USE_GNOME= cairo gtk30 gnomedocutils intlhack \
+ introspection:build
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -Wno-error=format-nonliteral
INSTALL_TARGET= install-strip
DOCSDIR= ${PREFIX}/share/doc/gladeui-2
OPTIONS_SUB= yes
-OPTIONS_DEFINE= PYTHON
-OPTIONS_DEFAULT=PYTHON
+OPTIONS_DEFINE= PYTHON WEBKIT
+OPTIONS_DEFAULT=PYTHON WEBKIT
+
PYTHON_CONFIGURE_ENABLE= python
PYTHON_USES= python:3.4+
PYTHON_USE= GNOME=pygobject3
+WEBKIT_DESC= Webkit glade support
+WEBKIT_CONFIGURE_ENABLE= webkit2gtk
+WEBKIT_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
+ libwebkit2gtk-4.0.so:www/webkit2-gtk3
+
.include <bsd.port.mk>
diff --git a/devel/glade/distinfo b/devel/glade/distinfo
index 9d8fc4cdc65f..bb2debc08bdd 100644
--- a/devel/glade/distinfo
+++ b/devel/glade/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/glade-3.18.3.tar.xz) = ecdbce46e7fbfecd463be840b94fbf54d83723b3ebe075414cfd225ddab66452
-SIZE (gnome3/glade-3.18.3.tar.xz) = 3266400
+TIMESTAMP = 1523096445
+SHA256 (gnome3/glade-3.22.1.tar.xz) = dff89a2ef2eaf000ff2a46979978d03cb9202cb04668e01d0ea5c5bb5547e39a
+SIZE (gnome3/glade-3.22.1.tar.xz) = 3592952
diff --git a/devel/glade/files/patch-configure b/devel/glade/files/patch-configure
index dea446beb893..a8cd112ecdcf 100644
--- a/devel/glade/files/patch-configure
+++ b/devel/glade/files/patch-configure
@@ -1,24 +1,24 @@
---- configure.orig 2011-04-06 10:16:19.000000000 +0200
-+++ configure 2011-04-06 10:34:06.000000000 +0200
-@@ -14541,7 +14541,7 @@
- $as_echo_n "checking for headers required to compile python extensions... " >&6; }
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+--- configure.orig 2016-04-07 13:52:21.629199000 +0200
++++ configure 2016-04-07 13:53:25.241848000 +0200
+@@ -14929,7 +14929,7 @@
+
+ print(' '.join(incldirs))
+ "
-if test "x$PYTHON_INCLUDES" == x; then
+if test "x$PYTHON_INCLUDES" = x; then
- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- if test "$py_prefix" != "$py_exec_prefix"; then
- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-@@ -14570,10 +14570,10 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to embed python" >&5
- $as_echo_n "checking for libraries required to embed python... " >&6; }
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+ PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
+ fi
+
+@@ -14962,10 +14962,10 @@
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
-if test "x$PYTHON_LIBS" == x; then
+if test "x$PYTHON_LIBS" = x; then
- PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
+ PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
fi
-if test "x$PYTHON_LIB_LOC" == x; then
+if test "x$PYTHON_LIB_LOC" = x; then
- PYTHON_LIB_LOC="${py_prefix}/lib"
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
fi
diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist
index 9f7525963bc4..a8d9c1acaa07 100644
--- a/devel/glade/pkg-plist
+++ b/devel/glade/pkg-plist
@@ -1,5 +1,6 @@
bin/glade
bin/glade-previewer
+include/libgladeui-2.0/gladeui/glade-adaptor-chooser.h
include/libgladeui-2.0/gladeui/glade-app.h
include/libgladeui-2.0/gladeui/glade-base-editor.h
include/libgladeui-2.0/gladeui/glade-builtins.h
@@ -35,304 +36,334 @@ include/libgladeui-2.0/gladeui/glade-widget-adaptor.h
include/libgladeui-2.0/gladeui/glade-widget.h
include/libgladeui-2.0/gladeui/glade-xml-utils.h
include/libgladeui-2.0/gladeui/glade.h
+lib/girepository-1.0/Gladeui-2.0.typelib
lib/glade/modules/libgladegtk.so
+%%PYTHON%%lib/glade/modules/libgladepython.so
+%%WEBKIT%%lib/glade/modules/libgladewebkit2gtk.so
lib/libgladeui-2.so
lib/libgladeui-2.so.6
-lib/libgladeui-2.so.6.1.3
+lib/libgladeui-2.so.6.5.1
libdata/pkgconfig/gladeui-2.0.pc
man/man1/glade-previewer.1.gz
man/man1/glade.1.gz
-share/appdata/glade.appdata.xml
share/applications/glade.desktop
-share/glade/catalogs/glade-catalog.dtd
-share/glade/catalogs/gtk+.xml
-share/glade/catalogs/gtkunixprint.xml
-share/glade/pixmaps/deprecated-16x16.png
-share/glade/pixmaps/deprecated-22x22.png
-share/glade/pixmaps/devhelp.png
-share/glade/pixmaps/fixed-bg.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-accelgroup.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-action.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-actiongroup.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-adjustment.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-alignment.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserdialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserwidget.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-arrow.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-aspectframe.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-assistant.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-box.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-button.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-buttonbox.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-calendar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellareabox.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendereraccel.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderercombo.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererpixbuf.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererprogress.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererspin.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererspinner.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderertext.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderertoggle.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-checkmenuitem.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-colorbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-colorselection.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-colorselectiondialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxtext.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-default.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-dialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-drawingarea.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-entry.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-entrybuffer.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-entrycompletion.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-eventbox.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-expander.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserdialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserwidget.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filefilter.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fixed.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fontbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fontselection.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-frame.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-grid.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-handlebox.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hbuttonbox.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hpaned.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hscrollbar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hseparator.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-iconfactory.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-iconview.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-image.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-imagemenuitem.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-infobar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-inputdialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-label.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-layout.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-levelbar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-linkbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-listbox.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-listboxrow.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-liststore.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menu.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menubar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menubutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menuitem.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menutoolbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-messagedialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-notebook.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-offscreenwindow.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-overlay.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-paned.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-placessidebar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-printdialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-radioaction.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-radiobutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-radiomenuitem.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentaction.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooser.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentchoosermenu.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentfilter.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentmanager.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-revealer.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scale.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scalebutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scrollbar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scrolledwindow.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-searchentry.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-separator.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-separatormenuitem.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-separatortoolitem.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-sizegroup.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-spinbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-spinner.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-statusbar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-statusicon.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-switch.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-table.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-tearoffmenuitem.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-textbuffer.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-texttag.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-texttagtable.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-textview.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toggleaction.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-togglebutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toolbar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toolbutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toolitem.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toolitemgroup.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toolpalette.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treemodelfilter.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treemodelsort.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treeselection.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treestore.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treeview.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treeviewcolumn.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vbox.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vbuttonbox.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-viewport.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-volumebutton.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vpaned.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vscale.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vscrollbar.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-window.png
-share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-windowgroup.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-accelgroup.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-action.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-actiongroup.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-adjustment.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-alignment.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserdialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserwidget.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-arrow.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-aspectframe.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-assistant.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-box.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-button.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-buttonbox.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-calendar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellareabox.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendereraccel.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderercombo.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererpixbuf.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererprogress.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererspin.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererspinner.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderertext.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderertoggle.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-checkbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-checkmenuitem.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-colorbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-colorselection.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-colorselectiondialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-combobox.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxtext.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-default.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-dialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-drawingarea.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-entry.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-entrybuffer.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-entrycompletion.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-eventbox.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-expander.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserdialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserwidget.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-filefilter.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fixed.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fontbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fontselection.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-frame.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-grid.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-handlebox.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hbox.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hbuttonbox.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hpaned.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hscale.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hscrollbar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hseparator.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-iconfactory.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-iconview.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-image.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-imagemenuitem.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-infobar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-inputdialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-label.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-layout.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-levelbar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-linkbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-listbox.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-listboxrow.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-liststore.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menu.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menubar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menubutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menuitem.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menutoolbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-messagedialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-notebook.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-offscreenwindow.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-overlay.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-paned.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-placessidebar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-printdialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-progressbar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-radioaction.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-radiobutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-radiomenuitem.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentaction.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooser.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentchoosermenu.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentfilter.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentmanager.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-revealer.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scale.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scalebutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scrollbar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scrolledwindow.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-searchentry.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-separator.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-separatormenuitem.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-separatortoolitem.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-sizegroup.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-spinbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-spinner.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-statusbar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-statusicon.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-switch.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-table.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-tearoffmenuitem.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-textbuffer.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-texttag.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-texttagtable.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-textview.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toggleaction.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-togglebutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toolbar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toolbutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toolitem.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toolitemgroup.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toolpalette.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treemodelfilter.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treemodelsort.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treeselection.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treestore.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treeview.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treeviewcolumn.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vbox.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vbuttonbox.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-viewport.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-volumebutton.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vpaned.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vscale.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vscrollbar.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vseparator.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-window.png
-share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-windowgroup.png
-share/glade/pixmaps/placeholder.png
-share/glade/pixmaps/plus.png
+share/gir-1.0/Gladeui-2.0.gir
+%%DATADIR%%/catalogs/glade-catalog.dtd
+%%DATADIR%%/catalogs/gtk+.xml
+%%DATADIR%%/catalogs/gtkunixprint.xml
+%%WEBKIT%%%%DATADIR%%/catalogs/webkit2gtk.xml
+%%DATADIR%%/pixmaps/deprecated-16x16.png
+%%DATADIR%%/pixmaps/deprecated-22x22.png
+%%DATADIR%%/pixmaps/devhelp.png
+%%DATADIR%%/pixmaps/fixed-bg.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accelgroup.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-action.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-actionbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-actiongroup.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-adjustment.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-alignment.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserwidget.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-arrow.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aspectframe.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-assistant.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-box.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-button.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-buttonbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-calendar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellareabox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendereraccel.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderercombo.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererpixbuf.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererprogress.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererspin.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererspinner.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderertext.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderertoggle.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-checkmenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorselection.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxtext.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-default.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-dialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-drawingarea.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-entry.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-entrybuffer.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-entrycompletion.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-eventbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-expander.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserwidget.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filefilter.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fixed.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-flowbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-flowboxchild.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontselection.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-frame.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-glarea.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-grid.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-handlebox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-headerbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hpaned.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hseparator.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-iconfactory.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-iconview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-image.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-imagemenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-infobar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-inputdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-label.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-layout.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-levelbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-linkbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-listbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-listboxrow.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-liststore.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-lockbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menu.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menubar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menubutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menutoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-messagedialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-modelbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-notebook.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-offscreenwindow.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-overlay.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-paned.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-placessidebar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-popover.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-popovermenu.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-printdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radioaction.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiobutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiomenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentaction.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooser.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchoosermenu.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentfilter.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentmanager.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-revealer.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scale.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scalebutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scrollbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scrolledwindow.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-searchbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-searchentry.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separator.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separatormenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separatortoolitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-sizegroup.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-spinbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-spinner.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-stack.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-stacksidebar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-stackswitcher.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-statusbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-statusicon.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-switch.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-table.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-tearoffmenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-textbuffer.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-texttag.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-texttagtable.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-textview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toggleaction.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-togglebutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolitemgroup.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolpalette.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treemodelfilter.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treemodelsort.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treeselection.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treestore.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treeview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treeviewcolumn.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-viewport.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-volumebutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vpaned.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vscale.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-window.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-windowgroup.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accelgroup.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-action.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-actionbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-actiongroup.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-adjustment.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-alignment.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserwidget.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-arrow.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aspectframe.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-assistant.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-box.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-button.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-buttonbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-calendar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellareabox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendereraccel.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderercombo.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererpixbuf.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererprogress.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererspin.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererspinner.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderertext.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderertoggle.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-checkbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-checkmenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorselection.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-combobox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxtext.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-default.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-dialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-drawingarea.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-entry.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-entrybuffer.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-entrycompletion.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-eventbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-expander.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserwidget.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filefilter.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fixed.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-flowbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-flowboxchild.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontselection.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-frame.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-glarea.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-grid.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-handlebox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-headerbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hpaned.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hscale.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hseparator.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-iconfactory.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-iconview.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-image.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-imagemenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-infobar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-inputdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-label.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-layout.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-levelbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-linkbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-listbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-listboxrow.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-liststore.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-lockbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menu.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menubar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menubutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menutoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-messagedialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-modelbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-notebook.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-offscreenwindow.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-overlay.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-paned.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-placessidebar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-popover.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-popovermenu.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-printdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-progressbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radioaction.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiobutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiomenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentaction.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooser.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchoosermenu.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentfilter.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentmanager.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-revealer.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scale.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scalebutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scrollbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scrolledwindow.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-searchbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-searchentry.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separator.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separatormenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separatortoolitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-sizegroup.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-spinbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-spinner.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-stack.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-stacksidebar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-stackswitcher.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-statusbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-statusicon.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-switch.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-table.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-tearoffmenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-textbuffer.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-texttag.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-texttagtable.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-textview.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toggleaction.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-togglebutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolitemgroup.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolpalette.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treemodelfilter.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treemodelsort.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treeselection.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treestore.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treeview.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treeviewcolumn.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-viewport.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-volumebutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vpaned.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vscale.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vseparator.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-window.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-windowgroup.png
+%%DATADIR%%/pixmaps/placeholder.png
+%%DATADIR%%/pixmaps/plus.png
share/gtk-doc/html/gladeui-2/GladeApp.html
share/gtk-doc/html/gladeui-2/GladeBaseEditor.html
share/gtk-doc/html/gladeui-2/GladeClipboard.html
@@ -362,7 +393,6 @@ share/gtk-doc/html/gladeui-2/gladeui-glade-parameter.html
share/gtk-doc/html/gladeui-2/gladeui-glade-widget-adaptor.html
share/gtk-doc/html/gladeui-2/home.png
share/gtk-doc/html/gladeui-2/index.html
-share/gtk-doc/html/gladeui-2/index.sgml
share/gtk-doc/html/gladeui-2/ix01.html
share/gtk-doc/html/gladeui-2/left-insensitive.png
share/gtk-doc/html/gladeui-2/left.png
@@ -420,9 +450,15 @@ share/help/it/glade/legal.xml
share/help/ja/glade/figures/main-window.png
share/help/ja/glade/index.docbook
share/help/ja/glade/legal.xml
+share/help/ko/glade/figures/main-window.png
+share/help/ko/glade/index.docbook
+share/help/ko/glade/legal.xml
share/help/oc/glade/figures/main-window.png
share/help/oc/glade/index.docbook
share/help/oc/glade/legal.xml
+share/help/pl/glade/figures/main-window.png
+share/help/pl/glade/index.docbook
+share/help/pl/glade/legal.xml
share/help/pt_BR/glade/figures/main-window.png
share/help/pt_BR/glade/index.docbook
share/help/pt_BR/glade/legal.xml
@@ -447,12 +483,15 @@ share/icons/hicolor/24x24/apps/glade.png
share/icons/hicolor/256x256/apps/glade.png
share/icons/hicolor/32x32/apps/glade.png
share/icons/hicolor/48x48/apps/glade.png
+share/icons/hicolor/scalable/apps/glade-brand-symbolic.svg
+share/icons/hicolor/scalable/apps/glade-symbolic.svg
share/locale/ar/LC_MESSAGES/glade.mo
share/locale/ast/LC_MESSAGES/glade.mo
share/locale/az/LC_MESSAGES/glade.mo
share/locale/bg/LC_MESSAGES/glade.mo
share/locale/bn/LC_MESSAGES/glade.mo
share/locale/bn_IN/LC_MESSAGES/glade.mo
+share/locale/bs/LC_MESSAGES/glade.mo
share/locale/ca/LC_MESSAGES/glade.mo
share/locale/ca@valencia/LC_MESSAGES/glade.mo
share/locale/cs/LC_MESSAGES/glade.mo
@@ -468,6 +507,7 @@ share/locale/et/LC_MESSAGES/glade.mo
share/locale/eu/LC_MESSAGES/glade.mo
share/locale/fi/LC_MESSAGES/glade.mo
share/locale/fr/LC_MESSAGES/glade.mo
+share/locale/fur/LC_MESSAGES/glade.mo
share/locale/gl/LC_MESSAGES/glade.mo
share/locale/gu/LC_MESSAGES/glade.mo
share/locale/he/LC_MESSAGES/glade.mo
@@ -477,6 +517,7 @@ share/locale/hy/LC_MESSAGES/glade.mo
share/locale/id/LC_MESSAGES/glade.mo
share/locale/it/LC_MESSAGES/glade.mo
share/locale/ja/LC_MESSAGES/glade.mo
+share/locale/kk/LC_MESSAGES/glade.mo
share/locale/km/LC_MESSAGES/glade.mo
share/locale/ko/LC_MESSAGES/glade.mo
share/locale/lt/LC_MESSAGES/glade.mo
@@ -487,6 +528,7 @@ share/locale/ml/LC_MESSAGES/glade.mo
share/locale/mr/LC_MESSAGES/glade.mo
share/locale/ms/LC_MESSAGES/glade.mo
share/locale/nb/LC_MESSAGES/glade.mo
+share/locale/ne/LC_MESSAGES/glade.mo
share/locale/nl/LC_MESSAGES/glade.mo
share/locale/nn/LC_MESSAGES/glade.mo
share/locale/oc/LC_MESSAGES/glade.mo
@@ -514,3 +556,4 @@ share/locale/vi/LC_MESSAGES/glade.mo
share/locale/zh_CN/LC_MESSAGES/glade.mo
share/locale/zh_HK/LC_MESSAGES/glade.mo
share/locale/zh_TW/LC_MESSAGES/glade.mo
+share/metainfo/glade.appdata.xml
diff --git a/devel/glib20-reference/pkg-plist b/devel/glib20-reference/pkg-plist
index efbb51930954..866accc4b6a9 100644
--- a/devel/glib20-reference/pkg-plist
+++ b/devel/glib20-reference/pkg-plist
@@ -79,6 +79,7 @@ share/doc/gio/GPollableOutputStream.html
share/doc/gio/GPropertyAction.html
share/doc/gio/GProxy.html
share/doc/gio/GProxyAddress.html
+share/doc/gio/GProxyAddressEnumerator.html
share/doc/gio/GProxyResolver.html
share/doc/gio/GRemoteActionGroup.html
share/doc/gio/GResolver.html
@@ -94,6 +95,7 @@ share/doc/gio/GSimplePermission.html
share/doc/gio/GSimpleProxyResolver.html
share/doc/gio/GSocket.html
share/doc/gio/GSocketAddress.html
+share/doc/gio/GSocketAddressEnumerator.html
share/doc/gio/GSocketClient.html
share/doc/gio/GSocketConnectable.html
share/doc/gio/GSocketConnection.html
@@ -131,24 +133,6 @@ share/doc/gio/GVolumeMonitor.html
share/doc/gio/GZlibCompressor.html
share/doc/gio/GZlibDecompressor.html
share/doc/gio/annotation-glossary.html
-share/doc/gio/api-index-2-18.html
-share/doc/gio/api-index-2-20.html
-share/doc/gio/api-index-2-22.html
-share/doc/gio/api-index-2-24.html
-share/doc/gio/api-index-2-26.html
-share/doc/gio/api-index-2-28.html
-share/doc/gio/api-index-2-30.html
-share/doc/gio/api-index-2-32.html
-share/doc/gio/api-index-2-34.html
-share/doc/gio/api-index-2-36.html
-share/doc/gio/api-index-2-38.html
-share/doc/gio/api-index-2-40.html
-share/doc/gio/api-index-2-42.html
-share/doc/gio/api-index-2-44.html
-share/doc/gio/api-index-2-46.html
-share/doc/gio/api-index-2-48.html
-share/doc/gio/api-index-2-50.html
-share/doc/gio/api-index-deprecated.html
share/doc/gio/api-index-full.html
share/doc/gio/application.html
share/doc/gio/async.html
@@ -252,32 +236,6 @@ share/doc/gio/volume_mon.html
%%PORTDOCS%%%%DOCSDIR%%/Sorted_binary_tree_postorder.svg
%%PORTDOCS%%%%DOCSDIR%%/Sorted_binary_tree_preorder.svg
%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-10.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-12.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-14.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-16.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-18.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-2.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-20.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-22.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-24.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-26.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-28.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-30.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-32.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-34.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-36.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-38.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-4.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-40.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-42.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-44.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-46.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-48.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-50.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-6.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-2-8.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-deprecated.html
%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
%%PORTDOCS%%%%DOCSDIR%%/deprecated.html
%%PORTDOCS%%%%DOCSDIR%%/file-name-encodings.png
@@ -307,6 +265,7 @@ share/doc/gio/volume_mon.html
%%PORTDOCS%%%%DOCSDIR%%/glib-File-Utilities.html
%%PORTDOCS%%%%DOCSDIR%%/glib-GDateTime.html
%%PORTDOCS%%%%DOCSDIR%%/glib-GTimeZone.html
+%%PORTDOCS%%%%DOCSDIR%%/glib-GUuid.html
%%PORTDOCS%%%%DOCSDIR%%/glib-GVariant.html
%%PORTDOCS%%%%DOCSDIR%%/glib-GVariantType.html
%%PORTDOCS%%%%DOCSDIR%%/glib-Glob-style-pattern-matching.html
@@ -386,28 +345,6 @@ share/doc/gobject/GBinding.html
share/doc/gobject/GTypeModule.html
share/doc/gobject/GTypePlugin.html
share/doc/gobject/annotation-glossary.html
-share/doc/gobject/api-index-2-10.html
-share/doc/gobject/api-index-2-12.html
-share/doc/gobject/api-index-2-14.html
-share/doc/gobject/api-index-2-18.html
-share/doc/gobject/api-index-2-2.html
-share/doc/gobject/api-index-2-22.html
-share/doc/gobject/api-index-2-24.html
-share/doc/gobject/api-index-2-26.html
-share/doc/gobject/api-index-2-28.html
-share/doc/gobject/api-index-2-30.html
-share/doc/gobject/api-index-2-32.html
-share/doc/gobject/api-index-2-34.html
-share/doc/gobject/api-index-2-36.html
-share/doc/gobject/api-index-2-38.html
-share/doc/gobject/api-index-2-4.html
-share/doc/gobject/api-index-2-40.html
-share/doc/gobject/api-index-2-42.html
-share/doc/gobject/api-index-2-44.html
-share/doc/gobject/api-index-2-46.html
-share/doc/gobject/api-index-2-6.html
-share/doc/gobject/api-index-2-8.html
-share/doc/gobject/api-index-deprecated.html
share/doc/gobject/api-index-full.html
share/doc/gobject/ch01s02.html
share/doc/gobject/chapter-gobject.html
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index d42ca4a9c931..2d31b5cab27d 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= glib
-PORTVERSION= 2.50.3
-PORTREVISION= 5
+PORTVERSION= 2.56.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -39,11 +39,11 @@ INSTALL_TARGET= install-strip
SHEBANG_FILES= */*.pl
-LIBVERSION= 0.5000.3
+LIBVERSION= 0.5600.1
PLIST_SUB+= LIBVERSION=${LIBVERSION}
glib_MAN= gtester.1 gtester-report.1 glib-gettextize.1
-gio_MAN= gdbus.1 gsettings.1 gio-querymodules.1 \
+gio_MAN= gdbus.1 gsettings.1 gio-querymodules.1 gio.1 \
glib-compile-schemas.1 gapplication.1 \
glib-compile-resources.1 gresource.1 gdbus-codegen.1
gobject_MAN= glib-genmarshal.1 glib-mkenums.1 gobject-query.1
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 2a2432db2305..767d2d841551 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516046336
-SHA256 (gnome2/glib-2.50.3.tar.xz) = 82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999
-SIZE (gnome2/glib-2.50.3.tar.xz) = 7589284
+TIMESTAMP = 1525371429
+SHA256 (gnome2/glib-2.56.1.tar.xz) = 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d
+SIZE (gnome2/glib-2.56.1.tar.xz) = 8028716
diff --git a/devel/glib20/files/patch-gio_filemonitor b/devel/glib20/files/patch-gio_filemonitor
deleted file mode 100644
index 883c7b1bbd8d..000000000000
--- a/devel/glib20/files/patch-gio_filemonitor
+++ /dev/null
@@ -1,1038 +0,0 @@
-# gio: Always purge kqueue subs from missing list
-# https://gitlab.gnome.org/GNOME/glib/commit/e305fe971e4647d971428a772b7290b9c308a96f
-# kqueue: Fix invalid emission of G_FILE_MONITOR_EVENT_MOVED event
-# https://gitlab.gnome.org/GNOME/glib/commit/76072a2dde4a4acc8be8d3c47efbc6811ebe0c1e
-# kqueue: Multiple fixes and simplifications
-# https://gitlab.gnome.org/GNOME/glib/commit/aa39a0557c679fc345b0ba72a87c33152eb8ebcd
-# gpollfilemonitor: Fix use-after-free caused by leaking GSource
-# https://gitlab.gnome.org/GNOME/glib/commit/ba4a9538e14e8ba0ea037cab5f4b23aa47272a4c
-# Reorder operations in _kqsub_cancel() to prevent races.
-# https://gitlab.gnome.org/GNOME/glib/commit/ab179184b883ad378a420223f378071821f0c8b9
-# Convert gio/kqueue/Makefile.am to gio/kqueue/Makefile.in patch
-
---- gio/gpollfilemonitor.c.orig 2016-10-22 05:17:34 UTC
-+++ gio/gpollfilemonitor.c
-@@ -50,7 +50,9 @@ g_poll_file_monitor_finalize (GObject* o
-
- poll_monitor = G_POLL_FILE_MONITOR (object);
-
-+ g_poll_file_monitor_cancel (G_FILE_MONITOR (poll_monitor));
- g_object_unref (poll_monitor->file);
-+ g_clear_object (&poll_monitor->last_info);
-
- G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize (object);
- }
---- gio/kqueue/Makefile.in.orig 2017-02-13 15:22:04 UTC
-+++ gio/kqueue/Makefile.in
-@@ -183,9 +183,8 @@ LTLIBRARIES = $(installed_test_LTLIBRARI
- libkqueue_la_LIBADD =
- am__objects_1 =
- am_libkqueue_la_OBJECTS = libkqueue_la-gkqueuefilemonitor.lo \
-- libkqueue_la-kqueue-helper.lo libkqueue_la-kqueue-thread.lo \
-- libkqueue_la-kqueue-sub.lo libkqueue_la-kqueue-missing.lo \
-- libkqueue_la-kqueue-utils.lo libkqueue_la-kqueue-exclusions.lo \
-+ libkqueue_la-kqueue-helper.lo \
-+ libkqueue_la-kqueue-missing.lo \
- libkqueue_la-dep-list.lo $(am__objects_1)
- libkqueue_la_OBJECTS = $(am_libkqueue_la_OBJECTS)
- AM_V_lt = $(am__v_lt_@AM_V@)
---- gio/kqueue/gkqueuefilemonitor.c.orig 2016-10-22 05:18:22 UTC
-+++ gio/kqueue/gkqueuefilemonitor.c
-@@ -22,33 +22,73 @@
-
- #include "config.h"
-
--#include "gkqueuefilemonitor.h"
--#include "kqueue-helper.h"
--#include "kqueue-exclusions.h"
-+#include <sys/types.h>
-+#include <sys/event.h>
-+#include <sys/time.h>
-+#include <sys/socket.h>
-+#include <sys/stat.h>
-+
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <string.h>
-+
-+#include <glib-object.h>
-+#include <gio/gfilemonitor.h>
-+#include <gio/glocalfilemonitor.h>
-+#include <gio/giomodule.h>
- #include <gio/gpollfilemonitor.h>
- #include <gio/gfile.h>
--#include <gio/giomodule.h>
-+#include <glib-unix.h>
-+#include "glib-private.h"
-
-+#include "kqueue-helper.h"
-+#include "dep-list.h"
-
--struct _GKqueueFileMonitor
-+G_LOCK_DEFINE_STATIC (kq_lock);
-+static GSource *kq_source;
-+static int kq_queue = -1;
-+
-+#define G_TYPE_KQUEUE_FILE_MONITOR (g_kqueue_file_monitor_get_type ())
-+#define G_KQUEUE_FILE_MONITOR(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-+ G_TYPE_KQUEUE_FILE_MONITOR, GKqueueFileMonitor))
-+
-+typedef GLocalFileMonitorClass GKqueueFileMonitorClass;
-+
-+typedef struct
- {
- GLocalFileMonitor parent_instance;
-
- kqueue_sub *sub;
--
-+#ifndef O_EVTONLY
- GFileMonitor *fallback;
- GFile *fbfile;
--};
-+#endif
-+} GKqueueFileMonitor;
-+
-+GType g_kqueue_file_monitor_get_type (void);
-+G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR,
-+ g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME,
-+ g_define_type_id,
-+ "kqueue",
-+ 20))
-+
-+#ifndef O_EVTONLY
-+#define O_KQFLAG O_RDONLY
-+#else
-+#define O_KQFLAG O_EVTONLY
-+#endif
-+
-+#define NOTE_ALL (NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_RENAME)
-
- static gboolean g_kqueue_file_monitor_cancel (GFileMonitor* monitor);
-+static gboolean g_kqueue_file_monitor_is_supported (void);
-
--G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR,
-- g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME,
-- g_define_type_id,
-- "kqueue",
-- 20))
-+static kqueue_sub *_kqsub_new (const gchar *, GLocalFileMonitor *, GFileMonitorSource *);
-+static void _kqsub_free (kqueue_sub *);
-+static gboolean _kqsub_cancel (kqueue_sub *);
-
-
-+#ifndef O_EVTONLY
- static void
- _fallback_callback (GFileMonitor *unused,
- GFile *first,
-@@ -57,21 +97,41 @@ _fallback_callback (GFileMonitor *u
- gpointer udata)
- {
- GKqueueFileMonitor *kq_mon = G_KQUEUE_FILE_MONITOR (udata);
-- GFileMonitor *mon = G_FILE_MONITOR (kq_mon);
-- g_assert (kq_mon != NULL);
-- g_assert (mon != NULL);
-- (void) unused;
--
-- if (event == G_FILE_MONITOR_EVENT_CHANGED)
-- {
-- GLocalFileMonitor *local_monitor = G_LOCAL_FILE_MONITOR (kq_mon);
-
-- _kh_dir_diff (kq_mon->sub, local_monitor->source);
-- }
-- else
-- g_file_monitor_emit_event (mon, first, second, event);
-+ g_file_monitor_emit_event (G_FILE_MONITOR (kq_mon), first, second, event);
- }
-
-+/*
-+ * _ke_is_excluded:
-+ * @full_path - a path to file to check.
-+ *
-+ * Returns: TRUE if the file should be excluded from the kqueue-powered
-+ * monitoring, FALSE otherwise.
-+ **/
-+gboolean
-+_ke_is_excluded (const char *full_path)
-+{
-+ GFile *f = NULL;
-+ GMount *mount = NULL;
-+
-+ f = g_file_new_for_path (full_path);
-+
-+ if (f != NULL) {
-+ mount = g_file_find_enclosing_mount (f, NULL, NULL);
-+ g_object_unref (f);
-+ }
-+
-+ if ((mount != NULL && (g_mount_can_unmount (mount))) || g_str_has_prefix (full_path, "/mnt/"))
-+ {
-+ g_warning ("Excluding %s from kernel notification, falling back to poll", full_path);
-+ if (mount)
-+ g_object_unref (mount);
-+ return TRUE;
-+ }
-+
-+ return FALSE;
-+}
-+#endif /* !O_EVTONLY */
-
- static void
- g_kqueue_file_monitor_finalize (GObject *object)
-@@ -80,16 +140,18 @@ g_kqueue_file_monitor_finalize (GObject
-
- if (kqueue_monitor->sub)
- {
-- _kh_cancel_sub (kqueue_monitor->sub);
-- _kh_sub_free (kqueue_monitor->sub);
-+ _kqsub_cancel (kqueue_monitor->sub);
-+ _kqsub_free (kqueue_monitor->sub);
- kqueue_monitor->sub = NULL;
- }
-
-+#ifndef O_EVTONLY
- if (kqueue_monitor->fallback)
- g_object_unref (kqueue_monitor->fallback);
-
- if (kqueue_monitor->fbfile)
- g_object_unref (kqueue_monitor->fbfile);
-+#endif
-
- if (G_OBJECT_CLASS (g_kqueue_file_monitor_parent_class)->finalize)
- (*G_OBJECT_CLASS (g_kqueue_file_monitor_parent_class)->finalize) (object);
-@@ -103,21 +165,25 @@ g_kqueue_file_monitor_start (GLocalFileM
- GFileMonitorSource *source)
- {
- GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (local_monitor);
-- GObject *obj;
-- GKqueueFileMonitorClass *klass;
-- GObjectClass *parent_class;
-- kqueue_sub *sub = NULL;
-- gboolean ret_kh_startup = FALSE;
-- const gchar *path = NULL;
--
--
-- ret_kh_startup = _kh_startup ();
-- g_assert (ret_kh_startup);
-+ kqueue_sub *sub;
-+ const gchar *path;
-
- path = filename;
-- if (!path)
-+ if (path == NULL)
- path = dirname;
-
-+#ifndef O_EVTONLY
-+ if (_ke_is_excluded (path))
-+ {
-+ GFile *file = g_file_new_for_path (path);
-+ kqueue_monitor->fbfile = file;
-+ kqueue_monitor->fallback = _g_poll_file_monitor_new (file);
-+ g_signal_connect (kqueue_monitor->fallback, "changed",
-+ G_CALLBACK (_fallback_callback), kqueue_monitor);
-+ return;
-+ }
-+#endif
-+
- /* For a directory monitor, create a subscription object anyway.
- * It will be used for directory diff calculation routines.
- * Wait, directory diff in a GKqueueFileMonitor?
-@@ -125,33 +191,13 @@ g_kqueue_file_monitor_start (GLocalFileM
- * file, GIO uses a GKqueueFileMonitor object for that. If a directory
- * will be created under that path, GKqueueFileMonitor will have to
- * handle the directory notifications. */
-+ sub = _kqsub_new (path, local_monitor, source);
-+ if (sub == NULL)
-+ return;
-
-- sub = _kh_sub_new (path, TRUE, source);
--
-- /* FIXME: what to do about errors here? we can't return NULL or another
-- * kind of error and an assertion is probably too hard (same issue as in
-- * the inotify backend) */
-- g_assert (sub != NULL);
- kqueue_monitor->sub = sub;
--
-- if (!_ke_is_excluded (path))
-- _kh_add_sub (sub);
-- else
-- {
-- GFile *file = g_file_new_for_path (path);
-- kqueue_monitor->fbfile = file;
-- kqueue_monitor->fallback = _g_poll_file_monitor_new (file);
-- g_signal_connect (kqueue_monitor->fallback,
-- "changed",
-- G_CALLBACK (_fallback_callback),
-- kqueue_monitor);
-- }
--}
--
--static gboolean
--g_kqueue_file_monitor_is_supported (void)
--{
-- return _kh_startup ();
-+ if (!_kqsub_start_watching (sub))
-+ _km_add_missing (sub);
- }
-
- static void
-@@ -175,24 +221,218 @@ g_kqueue_file_monitor_init (GKqueueFileM
- }
-
- static gboolean
-+g_kqueue_file_monitor_callback (gint fd, GIOCondition condition, gpointer user_data)
-+{
-+ gint64 now = g_source_get_time (kq_source);
-+ kqueue_sub *sub;
-+ GFileMonitorSource *source;
-+ struct kevent ev;
-+ struct timespec ts;
-+
-+ memset (&ts, 0, sizeof(ts));
-+ while (kevent(fd, NULL, 0, &ev, 1, &ts) > 0)
-+ {
-+ GFileMonitorEvent mask = 0;
-+
-+ if (ev.filter != EVFILT_VNODE || ev.udata == NULL)
-+ continue;
-+
-+ sub = ev.udata;
-+ source = sub->source;
-+
-+ if (ev.flags & EV_ERROR)
-+ ev.fflags = NOTE_REVOKE;
-+
-+ if (ev.fflags & (NOTE_DELETE | NOTE_REVOKE))
-+ {
-+ _kqsub_cancel (sub);
-+ _km_add_missing (sub);
-+ }
-+
-+ if (sub->is_dir && ev.fflags & (NOTE_WRITE | NOTE_EXTEND))
-+ {
-+ _kh_dir_diff (sub);
-+ ev.fflags &= ~(NOTE_WRITE | NOTE_EXTEND);
-+ }
-+
-+ if (ev.fflags & NOTE_DELETE)
-+ {
-+ mask = G_FILE_MONITOR_EVENT_DELETED;
-+ }
-+ else if (ev.fflags & NOTE_ATTRIB)
-+ {
-+ mask = G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED;
-+ }
-+ else if (ev.fflags & (NOTE_WRITE | NOTE_EXTEND))
-+ {
-+ mask = G_FILE_MONITOR_EVENT_CHANGED;
-+ }
-+ else if (ev.fflags & NOTE_RENAME)
-+ {
-+ /* Since there’s apparently no way to get the new name of the
-+ * file out of kqueue(), all we can do is say that this one has
-+ * been deleted. */
-+ mask = G_FILE_MONITOR_EVENT_DELETED;
-+ }
-+ else if (ev.fflags & NOTE_REVOKE)
-+ {
-+ mask = G_FILE_MONITOR_EVENT_UNMOUNTED;
-+ }
-+
-+ if (mask)
-+ g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, now);
-+ }
-+
-+ return TRUE;
-+}
-+
-+static gboolean
-+g_kqueue_file_monitor_is_supported (void)
-+{
-+ int errsv;
-+
-+ G_LOCK (kq_lock);
-+
-+ if (kq_queue == -1)
-+ {
-+ kq_queue = kqueue ();
-+ errsv = errno;
-+
-+ if (kq_queue == -1)
-+ {
-+ g_warning ("Unable to create a kqueue: %s", g_strerror (errsv));
-+ G_UNLOCK (kq_lock);
-+ return FALSE;
-+ }
-+
-+ kq_source = g_unix_fd_source_new (kq_queue, G_IO_IN);
-+ g_source_set_callback (kq_source, (GSourceFunc) g_kqueue_file_monitor_callback, NULL, NULL);
-+ g_source_attach (kq_source, GLIB_PRIVATE_CALL (g_get_worker_context) ());
-+ }
-+
-+ G_UNLOCK (kq_lock);
-+
-+ return TRUE;
-+}
-+
-+static gboolean
- g_kqueue_file_monitor_cancel (GFileMonitor *monitor)
- {
- GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (monitor);
-
- if (kqueue_monitor->sub)
- {
-- _kh_cancel_sub (kqueue_monitor->sub);
-- _kh_sub_free (kqueue_monitor->sub);
-+ _kqsub_cancel (kqueue_monitor->sub);
-+ _kqsub_free (kqueue_monitor->sub);
- kqueue_monitor->sub = NULL;
- }
-+#ifndef O_EVTONLY
- else if (kqueue_monitor->fallback)
- {
- g_signal_handlers_disconnect_by_func (kqueue_monitor->fallback, _fallback_callback, kqueue_monitor);
- g_file_monitor_cancel (kqueue_monitor->fallback);
- }
-+#endif
-
- if (G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel)
- (*G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel) (monitor);
-
- return TRUE;
- }
-+
-+static kqueue_sub *
-+_kqsub_new (const gchar *filename, GLocalFileMonitor *mon, GFileMonitorSource *source)
-+{
-+ kqueue_sub *sub;
-+
-+ sub = g_slice_new (kqueue_sub);
-+ sub->filename = g_strdup (filename);
-+ sub->mon = mon;
-+ g_source_ref ((GSource *) source);
-+ sub->source = source;
-+ sub->fd = -1;
-+ sub->deps = NULL;
-+ sub->is_dir = 0;
-+
-+ return sub;
-+}
-+
-+static void
-+_kqsub_free (kqueue_sub *sub)
-+{
-+ g_assert (sub->deps == NULL);
-+ g_assert (sub->fd == -1);
-+
-+ g_source_unref ((GSource *) sub->source);
-+ g_free (sub->filename);
-+ g_slice_free (kqueue_sub, sub);
-+}
-+
-+static gboolean
-+_kqsub_cancel (kqueue_sub *sub)
-+{
-+ struct kevent ev;
-+
-+ /* Remove the event and close the file descriptor to automatically
-+ * delete pending events. */
-+ if (sub->fd != -1)
-+ {
-+ EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_DELETE, NOTE_ALL, 0, sub);
-+ if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1)
-+ {
-+ g_warning ("Unable to remove event for %s: %s", sub->filename, g_strerror (errno));
-+ return FALSE;
-+ }
-+ close (sub->fd);
-+ sub->fd = -1;
-+ }
-+
-+ _km_remove (sub);
-+
-+ if (sub->deps)
-+ {
-+ dl_free (sub->deps);
-+ sub->deps = NULL;
-+ }
-+
-+ return TRUE;
-+}
-+
-+gboolean
-+_kqsub_start_watching (kqueue_sub *sub)
-+{
-+ struct stat st;
-+ struct kevent ev;
-+
-+ sub->fd = open (sub->filename, O_KQFLAG);
-+ if (sub->fd == -1)
-+ return FALSE;
-+
-+ if (fstat (sub->fd, &st) == -1)
-+ {
-+ g_warning ("fstat failed for %s: %s", sub->filename, g_strerror (errno));
-+ close (sub->fd);
-+ sub->fd = -1;
-+ return FALSE;
-+ }
-+
-+ sub->is_dir = (st.st_mode & S_IFDIR) ? 1 : 0;
-+ if (sub->is_dir)
-+ {
-+ if (sub->deps)
-+ dl_free (sub->deps);
-+
-+ sub->deps = dl_listing (sub->filename);
-+ }
-+
-+ EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_ALL, 0, sub);
-+ if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1)
-+ {
-+ g_warning ("Unable to add event for %s: %s", sub->filename, g_strerror (errno));
-+ close (sub->fd);
-+ sub->fd = -1;
-+ return FALSE;
-+ }
-+
-+ return TRUE;
-+}
---- gio/kqueue/kqueue-helper.c.orig 2016-10-22 05:18:22 UTC
-+++ gio/kqueue/kqueue-helper.c
-@@ -34,81 +34,6 @@
- #include <errno.h>
- #include <pthread.h>
- #include "kqueue-helper.h"
--#include "kqueue-utils.h"
--#include "kqueue-thread.h"
--#include "kqueue-missing.h"
--#include "kqueue-exclusions.h"
--
--static gboolean kh_debug_enabled = FALSE;
--#define KH_W if (kh_debug_enabled) g_warning
--
--static GHashTable *subs_hash_table = NULL;
--G_LOCK_DEFINE_STATIC (hash_lock);
--
--static int kqueue_descriptor = -1;
--static int kqueue_socket_pair[] = {-1, -1};
--static pthread_t kqueue_thread;
--
--
--void _kh_file_appeared_cb (kqueue_sub *sub);
--
--/**
-- * accessor function for kqueue_descriptor
-- **/
--int
--get_kqueue_descriptor()
--{
-- return kqueue_descriptor;
--}
--
--/**
-- * convert_kqueue_events_to_gio:
-- * @flags: a set of kqueue filter flags
-- * @done: a pointer to #gboolean indicating that the
-- * conversion has been done (out)
-- *
-- * Translates kqueue filter flags into GIO event flags.
-- *
-- * Returns: a #GFileMonitorEvent
-- **/
--static GFileMonitorEvent
--convert_kqueue_events_to_gio (uint32_t flags, gboolean *done)
--{
-- g_assert (done != NULL);
-- *done = FALSE;
--
-- /* TODO: The following notifications should be emulated, if possible:
-- * - G_FILE_MONITOR_EVENT_PRE_UNMOUNT
-- */
-- if (flags & NOTE_DELETE)
-- {
-- *done = TRUE;
-- return G_FILE_MONITOR_EVENT_DELETED;
-- }
-- if (flags & NOTE_ATTRIB)
-- {
-- *done = TRUE;
-- return G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED;
-- }
-- if (flags & (NOTE_WRITE | NOTE_EXTEND))
-- {
-- *done = TRUE;
-- return G_FILE_MONITOR_EVENT_CHANGED;
-- }
-- if (flags & NOTE_RENAME)
-- {
-- *done = TRUE;
-- return G_FILE_MONITOR_EVENT_MOVED;
-- }
-- if (flags & NOTE_REVOKE)
-- {
-- *done = TRUE;
-- return G_FILE_MONITOR_EVENT_UNMOUNTED;
-- }
--
-- /* done is FALSE */
-- return 0;
--}
-
- typedef struct {
- kqueue_sub *sub;
-@@ -236,323 +161,21 @@ static const traverse_cbs cbs = {
-
-
- void
--_kh_dir_diff (kqueue_sub *sub, GFileMonitorSource *source)
-+_kh_dir_diff (kqueue_sub *sub)
- {
- dep_list *was;
- handle_ctx ctx;
-
-- g_assert (sub != NULL);
-- g_assert (source != NULL);
--
- memset (&ctx, 0, sizeof (handle_ctx));
- ctx.sub = sub;
-- ctx.source = source;
-+ ctx.source = sub->source;
-
- was = sub->deps;
- sub->deps = dl_listing (sub->filename);
--
-+
- dl_calculate (was, sub->deps, &cbs, &ctx);
-
- dl_free (was);
- }
-
-
--/**
-- * process_kqueue_notifications:
-- * @gioc: unused.
-- * @cond: unused.
-- * @data: unused.
-- *
-- * Processes notifications, coming from the kqueue thread.
-- *
-- * Reads notifications from the command file descriptor, emits the
-- * "changed" event on the appropriate monitor.
-- *
-- * A typical GIO Channel callback function.
-- *
-- * Returns: %TRUE
-- **/
--static gboolean
--process_kqueue_notifications (GIOChannel *gioc,
-- GIOCondition cond,
-- gpointer data)
--{
-- struct kqueue_notification n;
-- kqueue_sub *sub = NULL;
-- GFileMonitorSource *source = NULL;
-- GFileMonitorEvent mask = 0;
--
-- g_assert (kqueue_socket_pair[0] != -1);
-- if (!_ku_read (kqueue_socket_pair[0], &n, sizeof (struct kqueue_notification)))
-- {
-- KH_W ("Failed to read a kqueue notification, error %d", errno);
-- return TRUE;
-- }
--
-- G_LOCK (hash_lock);
-- sub = (kqueue_sub *) g_hash_table_lookup (subs_hash_table, GINT_TO_POINTER (n.fd));
-- G_UNLOCK (hash_lock);
--
-- if (sub == NULL)
-- {
-- KH_W ("Got a notification for a deleted or non-existing subscription %d",
-- n.fd);
-- return TRUE;
-- }
--
-- source = sub->user_data;
-- g_assert (source != NULL);
--
-- if (n.flags & (NOTE_DELETE | NOTE_REVOKE))
-- {
-- if (sub->deps)
-- {
-- dl_free (sub->deps);
-- sub->deps = NULL;
-- }
-- _km_add_missing (sub);
--
-- if (!(n.flags & NOTE_REVOKE))
-- {
-- /* Note that NOTE_REVOKE is issued by the kqueue thread
-- * on EV_ERROR kevent. In this case, a file descriptor is
-- * already closed from the kqueue thread, no need to close
-- * it manually */
-- _kh_cancel_sub (sub);
-- }
-- }
--
-- if (sub->is_dir && n.flags & (NOTE_WRITE | NOTE_EXTEND))
-- {
-- _kh_dir_diff (sub, source);
-- n.flags &= ~(NOTE_WRITE | NOTE_EXTEND);
-- }
--
-- if (n.flags)
-- {
-- gboolean done = FALSE;
-- mask = convert_kqueue_events_to_gio (n.flags, &done);
-- if (done == TRUE)
-- g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, g_get_monotonic_time ());
-- }
--
-- return TRUE;
--}
--
--
--/*
-- * _kh_startup_impl:
-- * @unused: unused
-- *
-- * Kqueue backend startup code. Should be called only once.
-- *
-- * Returns: %TRUE on success, %FALSE otherwise.
-- **/
--static gpointer
--_kh_startup_impl (gpointer unused)
--{
-- GIOChannel *channel = NULL;
-- gboolean result = FALSE;
--
-- kqueue_descriptor = kqueue ();
-- result = (kqueue_descriptor != -1);
-- if (!result)
-- {
-- KH_W ("Failed to initialize kqueue\n!");
-- return GINT_TO_POINTER (FALSE);
-- }
--
-- result = socketpair (AF_UNIX, SOCK_STREAM, 0, kqueue_socket_pair);
-- if (result != 0)
-- {
-- KH_W ("Failed to create socket pair\n!");
-- return GINT_TO_POINTER (FALSE) ;
-- }
--
-- result = pthread_create (&kqueue_thread,
-- NULL,
-- _kqueue_thread_func,
-- &kqueue_socket_pair[1]);
-- if (result != 0)
-- {
-- KH_W ("Failed to run kqueue thread\n!");
-- return GINT_TO_POINTER (FALSE);
-- }
--
-- _km_init (_kh_file_appeared_cb);
--
-- channel = g_io_channel_unix_new (kqueue_socket_pair[0]);
-- g_io_add_watch (channel, G_IO_IN, process_kqueue_notifications, NULL);
--
-- subs_hash_table = g_hash_table_new (g_direct_hash, g_direct_equal);
--
-- KH_W ("started gio kqueue backend\n");
-- return GINT_TO_POINTER (TRUE);
--}
--
--
--/*
-- * _kh_startup:
-- * Kqueue backend initialization.
-- *
-- * Returns: %TRUE on success, %FALSE otherwise.
-- **/
--gboolean
--_kh_startup (void)
--{
-- static GOnce init_once = G_ONCE_INIT;
-- g_once (&init_once, _kh_startup_impl, NULL);
-- return GPOINTER_TO_INT (init_once.retval);
--}
--
--
--/**
-- * _kh_start_watching:
-- * @sub: a #kqueue_sub
-- *
-- * Starts watching on a subscription.
-- *
-- * Returns: %TRUE on success, %FALSE otherwise.
-- **/
--gboolean
--_kh_start_watching (kqueue_sub *sub)
--{
-- g_assert (kqueue_socket_pair[0] != -1);
-- g_assert (sub != NULL);
-- g_assert (sub->filename != NULL);
--
-- /* kqueue requires a file descriptor to monitor. Sad but true */
--#if defined (O_EVTONLY)
-- sub->fd = open (sub->filename, O_EVTONLY);
--#else
-- sub->fd = open (sub->filename, O_RDONLY);
--#endif
--
-- if (sub->fd == -1)
-- {
-- KH_W ("failed to open file %s (error %d)", sub->filename, errno);
-- return FALSE;
-- }
--
-- _ku_file_information (sub->fd, &sub->is_dir, NULL);
-- if (sub->is_dir)
-- {
-- /* I know, it is very bad to make such decisions in this way and here.
-- * We already do have an user_data at the #kqueue_sub, and it may point to
-- * GKqueueFileMonitor or GKqueueDirectoryMonitor. For a directory case,
-- * we need to scan in contents for the further diffs. Ideally this process
-- * should be delegated to the GKqueueDirectoryMonitor, but for now I will
-- * do it in a dirty way right here. */
-- if (sub->deps)
-- dl_free (sub->deps);
--
-- sub->deps = dl_listing (sub->filename);
-- }
--
-- G_LOCK (hash_lock);
-- g_hash_table_insert (subs_hash_table, GINT_TO_POINTER (sub->fd), sub);
-- G_UNLOCK (hash_lock);
--
-- _kqueue_thread_push_fd (sub->fd);
--
-- /* Bump the kqueue thread. It will pick up a new sub entry to monitor */
-- if (!_ku_write (kqueue_socket_pair[0], "A", 1))
-- KH_W ("Failed to bump the kqueue thread (add fd, error %d)", errno);
-- return TRUE;
--}
--
--
--/**
-- * _kh_add_sub:
-- * @sub: a #kqueue_sub
-- *
-- * Adds a subscription for monitoring.
-- *
-- * This funciton tries to start watching a subscription with
-- * _kh_start_watching(). On failure, i.e. when a file does not exist yet,
-- * the subscription will be added to a list of missing files to continue
-- * watching when the file will appear.
-- *
-- * Returns: %TRUE
-- **/
--gboolean
--_kh_add_sub (kqueue_sub *sub)
--{
-- g_assert (sub != NULL);
--
-- if (!_kh_start_watching (sub))
-- _km_add_missing (sub);
--
-- return TRUE;
--}
--
--
--/**
-- * _kh_cancel_sub:
-- * @sub a #kqueue_sub
-- *
-- * Stops monitoring on a subscription.
-- *
-- * Returns: %TRUE
-- **/
--gboolean
--_kh_cancel_sub (kqueue_sub *sub)
--{
-- gboolean missing = FALSE;
-- g_assert (kqueue_socket_pair[0] != -1);
-- g_assert (sub != NULL);
--
-- G_LOCK (hash_lock);
-- missing = !g_hash_table_remove (subs_hash_table, GINT_TO_POINTER (sub->fd));
-- G_UNLOCK (hash_lock);
--
-- if (missing)
-- {
-- /* If there were no fd for this subscription, file is still
-- * missing. */
-- KH_W ("Removing subscription from missing");
-- _km_remove (sub);
-- }
-- else
-- {
-- /* fd will be closed in the kqueue thread */
-- _kqueue_thread_remove_fd (sub->fd);
--
-- /* Bump the kqueue thread. It will pick up a new sub entry to remove*/
-- if (!_ku_write (kqueue_socket_pair[0], "R", 1))
-- KH_W ("Failed to bump the kqueue thread (remove fd, error %d)", errno);
-- }
--
-- return TRUE;
--}
--
--
--/**
-- * _kh_file_appeared_cb:
-- * @sub: a #kqueue_sub
-- *
-- * A callback function for kqueue-missing subsystem.
-- *
-- * Signals that a missing file has finally appeared in the filesystem.
-- * Emits %G_FILE_MONITOR_EVENT_CREATED.
-- **/
--void
--_kh_file_appeared_cb (kqueue_sub *sub)
--{
-- GFile* child;
--
-- g_assert (sub != NULL);
-- g_assert (sub->filename);
--
-- if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS))
-- return;
--
-- child = g_file_new_for_path (sub->filename);
--
-- g_file_monitor_emit_event (G_FILE_MONITOR (sub->user_data),
-- child,
-- NULL,
-- G_FILE_MONITOR_EVENT_CREATED);
--
-- g_object_unref (child);
--}
---- gio/kqueue/kqueue-helper.h.orig 2016-10-22 05:18:22 UTC
-+++ gio/kqueue/kqueue-helper.h
-@@ -23,16 +23,31 @@
- #ifndef __KQUEUE_HELPER_H
- #define __KQUEUE_HELPER_H
-
--#include "kqueue-sub.h"
- #include <gio/glocalfilemonitor.h>
- #include <gio/gfilemonitor.h>
-
--gboolean _kh_startup (void);
--gboolean _kh_add_sub (kqueue_sub *sub);
--gboolean _kh_cancel_sub (kqueue_sub *sub);
-+#include "dep-list.h"
-
--gboolean _kh_start_watching (kqueue_sub *sub);
-+/**
-+ * kqueue_sub:
-+ * @filename: a name of the file to monitor
-+ * @fd: the associated file descriptor (used by kqueue)
-+ *
-+ * Represents a subscription on a file or directory.
-+ */
-+typedef struct
-+{
-+ GLocalFileMonitor *mon;
-+ GFileMonitorSource *source;
-+ gchar* filename;
-+ int fd;
-+ dep_list* deps;
-+ int is_dir;
-+} kqueue_sub;
-
--void _kh_dir_diff (kqueue_sub *sub, GFileMonitorSource *source);
-+gboolean _kqsub_start_watching (kqueue_sub *sub);
-+void _kh_dir_diff (kqueue_sub *sub);
-+void _km_add_missing (kqueue_sub *sub);
-+void _km_remove (kqueue_sub *sub);
-
- #endif /* __KQUEUE_HELPER_H */
---- gio/kqueue/kqueue-missing.c.orig 2016-10-22 05:18:22 UTC
-+++ gio/kqueue/kqueue-missing.c
-@@ -23,12 +23,12 @@
- #include <glib.h>
-
- #include "kqueue-helper.h"
--#include "kqueue-sub.h"
--#include "kqueue-missing.h"
-
-
- #define SCAN_MISSING_TIME 4 /* 1/4 Hz */
-
-+void _kh_file_appeared_cb (kqueue_sub *sub);
-+
- static gboolean km_scan_missing (gpointer user_data);
-
- static gboolean km_debug_enabled = FALSE;
-@@ -38,21 +38,6 @@ static GSList *missing_subs_list = NULL;
- G_LOCK_DEFINE_STATIC (missing_lock);
-
- static volatile gboolean scan_missing_running = FALSE;
--static on_create_cb file_appeared_callback;
--
--
--/**
-- * _km_init:
-- * @cb: a callback function. It will be called when a watched file
-- * will appear.
-- *
-- * Initialize the kqueue-missing module (optional).
-- **/
--void
--_km_init (on_create_cb cb)
--{
-- file_appeared_callback = cb;
--}
-
-
- /**
-@@ -83,6 +68,35 @@ _km_add_missing (kqueue_sub *sub)
- }
- }
-
-+/**
-+ * _kh_file_appeared_cb:
-+ * @sub: a #kqueue_sub
-+ *
-+ * A callback function for kqueue-missing subsystem.
-+ *
-+ * Signals that a missing file has finally appeared in the filesystem.
-+ * Emits %G_FILE_MONITOR_EVENT_CREATED.
-+ **/
-+void
-+_kh_file_appeared_cb (kqueue_sub *sub)
-+{
-+ GFile *child;
-+
-+ g_assert (sub != NULL);
-+ g_assert (sub->filename);
-+
-+ if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS))
-+ return;
-+
-+ child = g_file_new_for_path (sub->filename);
-+
-+ g_file_monitor_emit_event (G_FILE_MONITOR (sub->mon),
-+ child,
-+ NULL,
-+ G_FILE_MONITOR_EVENT_CREATED);
-+
-+ g_object_unref (child);
-+}
-
- /**
- * km_scan_missing:
-@@ -114,11 +128,10 @@ km_scan_missing (gpointer user_data)
- g_assert (sub != NULL);
- g_assert (sub->filename != NULL);
-
-- if (_kh_start_watching (sub))
-+ if (_kqsub_start_watching (sub))
- {
- KM_W ("file %s now exists, starting watching", sub->filename);
-- if (file_appeared_callback)
-- file_appeared_callback (sub);
-+ _kh_file_appeared_cb (sub);
- not_missing = g_slist_prepend (not_missing, head);
- }
- }
diff --git a/devel/glib20/files/patch-gio_glib-compile-schemas.c b/devel/glib20/files/patch-gio_glib-compile-schemas.c
index e92fac5baff8..cdf50e71996a 100644
--- a/devel/glib20/files/patch-gio_glib-compile-schemas.c
+++ b/devel/glib20/files/patch-gio_glib-compile-schemas.c
@@ -1,6 +1,6 @@
---- gio/glib-compile-schemas.c.orig 2012-06-14 16:39:22.000000000 +0200
-+++ gio/glib-compile-schemas.c 2012-06-14 16:39:55.000000000 +0200
-@@ -1204,11 +1204,13 @@
+--- gio/glib-compile-schemas.c.orig 2017-08-07 16:58:31.000000000 +0200
++++ gio/glib-compile-schemas.c 2017-09-15 09:25:19.746310000 +0200
+@@ -1219,6 +1219,7 @@ parse_state_start_schema (ParseState *state,
return;
}
@@ -8,8 +8,10 @@
if (path && (g_str_has_prefix (path, "/apps/") ||
g_str_has_prefix (path, "/desktop/") ||
g_str_has_prefix (path, "/system/")))
- g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with "
- "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
+@@ -1231,6 +1232,7 @@ parse_state_start_schema (ParseState *state,
+ g_printerr ("%s\n", message);
+ g_free (message);
+ }
+#endif
state->schema_state = schema_state_new (path, gettext_domain,
diff --git a/devel/glib20/files/patch-gio_glocalfileoutputstream.c b/devel/glib20/files/patch-gio_glocalfileoutputstream.c
deleted file mode 100644
index 9a373188836e..000000000000
--- a/devel/glib20/files/patch-gio_glocalfileoutputstream.c
+++ /dev/null
@@ -1,38 +0,0 @@
-From 45d4b59e3f7ef7b41db08f0c11ee5000126cfedb Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Sun, 4 Dec 2016 15:02:54 +0800
-Subject: [PATCH] glocalfileoutputstream: Fix symlink writing on FreeBSD and
- NetBSD
-
-FreeBSD, DragonflyBSD and NetBSD support O_NOFOLLOW, but they use error
-numbers that are different from what POSIX standard specifies. They are
-not going to change the behavior, and existing programs on these systems
-already take advantage of this difference. To support them, we have to
-add a check in GIO to use different error numbers on these systems.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=775593
----
- gio/glocalfileoutputstream.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c
-index 81184a671..4b3733cce 100644
---- gio/glocalfileoutputstream.c
-+++ gio/glocalfileoutputstream.c
-@@ -763,7 +763,13 @@ handle_overwrite_open (const char *filename,
- #ifdef O_NOFOLLOW
- is_symlink = FALSE;
- fd = g_open (filename, open_flags | O_NOFOLLOW, mode);
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+ if (fd == -1 && errno == EMLINK)
-+#elif defined(__NetBSD__)
-+ if (fd == -1 && errno == EFTYPE)
-+#else
- if (fd == -1 && errno == ELOOP)
-+#endif
- {
- /* Could be a symlink, or it could be a regular ELOOP error,
- * but then the next open will fail too. */
---
-2.13.0
-
diff --git a/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c b/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c
new file mode 100644
index 000000000000..8cf553223e79
--- /dev/null
+++ b/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c
@@ -0,0 +1,93 @@
+--- gio/kqueue/kqueue-missing.c.orig 2018-04-09 22:48:45.637366000 +0200
++++ gio/kqueue/kqueue-missing.c 2018-04-09 22:48:55.840341000 +0200
+@@ -23,12 +23,12 @@
+ #include <glib.h>
+
+ #include "kqueue-helper.h"
+-#include "kqueue-sub.h"
+-#include "kqueue-missing.h"
+
+
+ #define SCAN_MISSING_TIME 4 /* 1/4 Hz */
+
++void _kh_file_appeared_cb (kqueue_sub *sub);
++
+ static gboolean km_scan_missing (gpointer user_data);
+
+ static gboolean km_debug_enabled = FALSE;
+@@ -38,24 +38,9 @@ static GSList *missing_subs_list = NULL;
+ G_LOCK_DEFINE_STATIC (missing_lock);
+
+ static volatile gboolean scan_missing_running = FALSE;
+-static on_create_cb file_appeared_callback;
+
+
+ /**
+- * _km_init:
+- * @cb: a callback function. It will be called when a watched file
+- * will appear.
+- *
+- * Initialize the kqueue-missing module (optional).
+- **/
+-void
+-_km_init (on_create_cb cb)
+-{
+- file_appeared_callback = cb;
+-}
+-
+-
+-/**
+ * _km_add_missing:
+ * @sub: a #kqueue_sub
+ *
+@@ -83,7 +68,36 @@ _km_add_missing (kqueue_sub *sub)
+ }
+ }
+
++/**
++ * _kh_file_appeared_cb:
++ * @sub: a #kqueue_sub
++ *
++ * A callback function for kqueue-missing subsystem.
++ *
++ * Signals that a missing file has finally appeared in the filesystem.
++ * Emits %G_FILE_MONITOR_EVENT_CREATED.
++ **/
++void
++_kh_file_appeared_cb (kqueue_sub *sub)
++{
++ GFile *child;
+
++ g_assert (sub != NULL);
++ g_assert (sub->filename);
++
++ if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS))
++ return;
++
++ child = g_file_new_for_path (sub->filename);
++
++ g_file_monitor_emit_event (G_FILE_MONITOR (sub->mon),
++ child,
++ NULL,
++ G_FILE_MONITOR_EVENT_CREATED);
++
++ g_object_unref (child);
++}
++
+ /**
+ * km_scan_missing:
+ * @user_data: unused
+@@ -114,11 +128,10 @@ km_scan_missing (gpointer user_data)
+ g_assert (sub != NULL);
+ g_assert (sub->filename != NULL);
+
+- if (_kh_start_watching (sub))
++ if (_kqsub_start_watching (sub))
+ {
+ KM_W ("file %s now exists, starting watching", sub->filename);
+- if (file_appeared_callback)
+- file_appeared_callback (sub);
++ _kh_file_appeared_cb (sub);
+ not_missing = g_slist_prepend (not_missing, head);
+ }
+ }
diff --git a/devel/glib20/files/patch-gio_kqueue_Makefile.in b/devel/glib20/files/patch-gio_kqueue_Makefile.in
new file mode 100644
index 000000000000..4e2a220ba9f7
--- /dev/null
+++ b/devel/glib20/files/patch-gio_kqueue_Makefile.in
@@ -0,0 +1,87 @@
+--- gio/kqueue/Makefile.in.orig 2018-04-09 23:09:21.018712000 +0200
++++ gio/kqueue/Makefile.in 2018-04-09 23:09:38.517739000 +0200
+@@ -183,9 +183,7 @@ LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_L
+ libkqueue_la_LIBADD =
+ am__objects_1 =
+ am_libkqueue_la_OBJECTS = libkqueue_la-gkqueuefilemonitor.lo \
+- libkqueue_la-kqueue-helper.lo libkqueue_la-kqueue-thread.lo \
+- libkqueue_la-kqueue-sub.lo libkqueue_la-kqueue-missing.lo \
+- libkqueue_la-kqueue-utils.lo libkqueue_la-kqueue-exclusions.lo \
++ libkqueue_la-kqueue-helper.lo libkqueue_la-kqueue-missing.lo \
+ libkqueue_la-dep-list.lo $(am__objects_1)
+ libkqueue_la_OBJECTS = $(am_libkqueue_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -777,19 +775,9 @@ all_test_ltlibs = $(test_ltlibraries) $(uninstalled_te
+ @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
+ libkqueue_la_SOURCES = \
+ gkqueuefilemonitor.c \
+- gkqueuefilemonitor.h \
+ kqueue-helper.c \
+ kqueue-helper.h \
+- kqueue-thread.c \
+- kqueue-thread.h \
+- kqueue-sub.c \
+- kqueue-sub.h \
+ kqueue-missing.c \
+- kqueue-missing.h \
+- kqueue-utils.c \
+- kqueue-utils.h \
+- kqueue-exclusions.c \
+- kqueue-exclusions.h \
+ dep-list.c \
+ dep-list.h \
+ $(NULL)
+@@ -1009,12 +997,8 @@ distclean-compile:
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-dep-list.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-gkqueuefilemonitor.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-exclusions.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-helper.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-missing.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-sub.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-thread.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-utils.Plo@am__quote@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@@ -1054,40 +1038,12 @@ libkqueue_la-kqueue-helper.lo: kqueue-helper.c
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-helper.lo `test -f 'kqueue-helper.c' || echo '$(srcdir)/'`kqueue-helper.c
+
+-libkqueue_la-kqueue-thread.lo: kqueue-thread.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-thread.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-thread.Tpo -c -o libkqueue_la-kqueue-thread.lo `test -f 'kqueue-thread.c' || echo '$(srcdir)/'`kqueue-thread.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-thread.Tpo $(DEPDIR)/libkqueue_la-kqueue-thread.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-thread.c' object='libkqueue_la-kqueue-thread.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-thread.lo `test -f 'kqueue-thread.c' || echo '$(srcdir)/'`kqueue-thread.c
+-
+-libkqueue_la-kqueue-sub.lo: kqueue-sub.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-sub.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-sub.Tpo -c -o libkqueue_la-kqueue-sub.lo `test -f 'kqueue-sub.c' || echo '$(srcdir)/'`kqueue-sub.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-sub.Tpo $(DEPDIR)/libkqueue_la-kqueue-sub.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-sub.c' object='libkqueue_la-kqueue-sub.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-sub.lo `test -f 'kqueue-sub.c' || echo '$(srcdir)/'`kqueue-sub.c
+-
+ libkqueue_la-kqueue-missing.lo: kqueue-missing.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-missing.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-missing.Tpo -c -o libkqueue_la-kqueue-missing.lo `test -f 'kqueue-missing.c' || echo '$(srcdir)/'`kqueue-missing.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-missing.Tpo $(DEPDIR)/libkqueue_la-kqueue-missing.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-missing.c' object='libkqueue_la-kqueue-missing.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-missing.lo `test -f 'kqueue-missing.c' || echo '$(srcdir)/'`kqueue-missing.c
+-
+-libkqueue_la-kqueue-utils.lo: kqueue-utils.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-utils.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-utils.Tpo -c -o libkqueue_la-kqueue-utils.lo `test -f 'kqueue-utils.c' || echo '$(srcdir)/'`kqueue-utils.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-utils.Tpo $(DEPDIR)/libkqueue_la-kqueue-utils.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-utils.c' object='libkqueue_la-kqueue-utils.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-utils.lo `test -f 'kqueue-utils.c' || echo '$(srcdir)/'`kqueue-utils.c
+-
+-libkqueue_la-kqueue-exclusions.lo: kqueue-exclusions.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-exclusions.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-exclusions.Tpo -c -o libkqueue_la-kqueue-exclusions.lo `test -f 'kqueue-exclusions.c' || echo '$(srcdir)/'`kqueue-exclusions.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-exclusions.Tpo $(DEPDIR)/libkqueue_la-kqueue-exclusions.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-exclusions.c' object='libkqueue_la-kqueue-exclusions.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-exclusions.lo `test -f 'kqueue-exclusions.c' || echo '$(srcdir)/'`kqueue-exclusions.c
+
+ libkqueue_la-dep-list.lo: dep-list.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-dep-list.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-dep-list.Tpo -c -o libkqueue_la-dep-list.lo `test -f 'dep-list.c' || echo '$(srcdir)/'`dep-list.c
diff --git a/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c b/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c
new file mode 100644
index 000000000000..e1166c9d71d1
--- /dev/null
+++ b/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c
@@ -0,0 +1,463 @@
+--- gio/kqueue/gkqueuefilemonitor.c.orig 2018-04-07 04:10:22.000000000 +0200
++++ gio/kqueue/gkqueuefilemonitor.c 2018-05-03 20:21:55.830634000 +0200
+@@ -22,33 +22,73 @@
+
+ #include "config.h"
+
+-#include "gkqueuefilemonitor.h"
+-#include "kqueue-helper.h"
+-#include "kqueue-exclusions.h"
++#include <sys/types.h>
++#include <sys/event.h>
++#include <sys/time.h>
++#include <sys/socket.h>
++#include <sys/stat.h>
++
++#include <errno.h>
++#include <fcntl.h>
++#include <string.h>
++
++#include <glib-object.h>
++#include <gio/gfilemonitor.h>
++#include <gio/glocalfilemonitor.h>
++#include <gio/giomodule.h>
+ #include <gio/gpollfilemonitor.h>
+ #include <gio/gfile.h>
+-#include <gio/giomodule.h>
++#include <glib-unix.h>
++#include "glib-private.h"
+
++#include "kqueue-helper.h"
++#include "dep-list.h"
+
+-struct _GKqueueFileMonitor
++G_LOCK_DEFINE_STATIC (kq_lock);
++static GSource *kq_source;
++static int kq_queue = -1;
++
++#define G_TYPE_KQUEUE_FILE_MONITOR (g_kqueue_file_monitor_get_type ())
++#define G_KQUEUE_FILE_MONITOR(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
++ G_TYPE_KQUEUE_FILE_MONITOR, GKqueueFileMonitor))
++
++typedef GLocalFileMonitorClass GKqueueFileMonitorClass;
++
++typedef struct
+ {
+ GLocalFileMonitor parent_instance;
+
+ kqueue_sub *sub;
+-
++#ifndef O_EVTONLY
+ GFileMonitor *fallback;
+ GFile *fbfile;
+-};
++#endif
++} GKqueueFileMonitor;
+
++GType g_kqueue_file_monitor_get_type (void);
++G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR,
++ g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME,
++ g_define_type_id,
++ "kqueue",
++ 20))
++
++#ifndef O_EVTONLY
++#define O_KQFLAG O_RDONLY
++#else
++#define O_KQFLAG O_EVTONLY
++#endif
++
++#define NOTE_ALL (NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_RENAME)
++
+ static gboolean g_kqueue_file_monitor_cancel (GFileMonitor* monitor);
++static gboolean g_kqueue_file_monitor_is_supported (void);
+
+-G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR,
+- g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME,
+- g_define_type_id,
+- "kqueue",
+- 20))
++static kqueue_sub *_kqsub_new (const gchar *, GLocalFileMonitor *, GFileMonitorSource *);
++static void _kqsub_free (kqueue_sub *);
++static gboolean _kqsub_cancel (kqueue_sub *);
+
+
++#ifndef O_EVTONLY
+ static void
+ _fallback_callback (GFileMonitor *unused,
+ GFile *first,
+@@ -57,22 +97,42 @@ _fallback_callback (GFileMonitor *unused,
+ gpointer udata)
+ {
+ GKqueueFileMonitor *kq_mon = G_KQUEUE_FILE_MONITOR (udata);
+- GFileMonitor *mon = G_FILE_MONITOR (kq_mon);
+- g_assert (kq_mon != NULL);
+- g_assert (mon != NULL);
+- (void) unused;
+
+- if (event == G_FILE_MONITOR_EVENT_CHANGED)
+- {
+- GLocalFileMonitor *local_monitor = G_LOCAL_FILE_MONITOR (kq_mon);
+-
+- _kh_dir_diff (kq_mon->sub, local_monitor->source);
+- }
+- else
+- g_file_monitor_emit_event (mon, first, second, event);
++ g_file_monitor_emit_event (G_FILE_MONITOR (kq_mon), first, second, event);
+ }
+
++/*
++ * _ke_is_excluded:
++ * @full_path - a path to file to check.
++ *
++ * Returns: TRUE if the file should be excluded from the kqueue-powered
++ * monitoring, FALSE otherwise.
++ **/
++gboolean
++_ke_is_excluded (const char *full_path)
++{
++ GFile *f = NULL;
++ GMount *mount = NULL;
+
++ f = g_file_new_for_path (full_path);
++
++ if (f != NULL) {
++ mount = g_file_find_enclosing_mount (f, NULL, NULL);
++ g_object_unref (f);
++ }
++
++ if ((mount != NULL && (g_mount_can_unmount (mount))) || g_str_has_prefix (full_path, "/mnt/"))
++ {
++ g_warning ("Excluding %s from kernel notification, falling back to poll", full_path);
++ if (mount)
++ g_object_unref (mount);
++ return TRUE;
++ }
++
++ return FALSE;
++}
++#endif /* !O_EVTONLY */
++
+ static void
+ g_kqueue_file_monitor_finalize (GObject *object)
+ {
+@@ -80,16 +140,18 @@ g_kqueue_file_monitor_finalize (GObject *object)
+
+ if (kqueue_monitor->sub)
+ {
+- _kh_cancel_sub (kqueue_monitor->sub);
+- _kh_sub_free (kqueue_monitor->sub);
++ _kqsub_cancel (kqueue_monitor->sub);
++ _kqsub_free (kqueue_monitor->sub);
+ kqueue_monitor->sub = NULL;
+ }
+
++#ifndef O_EVTONLY
+ if (kqueue_monitor->fallback)
+ g_object_unref (kqueue_monitor->fallback);
+
+ if (kqueue_monitor->fbfile)
+ g_object_unref (kqueue_monitor->fbfile);
++#endif
+
+ if (G_OBJECT_CLASS (g_kqueue_file_monitor_parent_class)->finalize)
+ (*G_OBJECT_CLASS (g_kqueue_file_monitor_parent_class)->finalize) (object);
+@@ -103,21 +165,25 @@ g_kqueue_file_monitor_start (GLocalFileMonitor *local_
+ GFileMonitorSource *source)
+ {
+ GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (local_monitor);
+- GObject *obj;
+- GKqueueFileMonitorClass *klass;
+- GObjectClass *parent_class;
+- kqueue_sub *sub = NULL;
+- gboolean ret_kh_startup = FALSE;
+- const gchar *path = NULL;
++ kqueue_sub *sub;
++ const gchar *path;
+
+-
+- ret_kh_startup = _kh_startup ();
+- g_assert (ret_kh_startup);
+-
+ path = filename;
+- if (!path)
++ if (path == NULL)
+ path = dirname;
+
++#ifndef O_EVTONLY
++ if (_ke_is_excluded (path))
++ {
++ GFile *file = g_file_new_for_path (path);
++ kqueue_monitor->fbfile = file;
++ kqueue_monitor->fallback = _g_poll_file_monitor_new (file);
++ g_signal_connect (kqueue_monitor->fallback, "changed",
++ G_CALLBACK (_fallback_callback), kqueue_monitor);
++ return;
++ }
++#endif
++
+ /* For a directory monitor, create a subscription object anyway.
+ * It will be used for directory diff calculation routines.
+ * Wait, directory diff in a GKqueueFileMonitor?
+@@ -125,35 +191,15 @@ g_kqueue_file_monitor_start (GLocalFileMonitor *local_
+ * file, GIO uses a GKqueueFileMonitor object for that. If a directory
+ * will be created under that path, GKqueueFileMonitor will have to
+ * handle the directory notifications. */
++ sub = _kqsub_new (path, local_monitor, source);
++ if (sub == NULL)
++ return;
+
+- sub = _kh_sub_new (path, TRUE, source);
+-
+- /* FIXME: what to do about errors here? we can't return NULL or another
+- * kind of error and an assertion is probably too hard (same issue as in
+- * the inotify backend) */
+- g_assert (sub != NULL);
+ kqueue_monitor->sub = sub;
+-
+- if (!_ke_is_excluded (path))
+- _kh_add_sub (sub);
+- else
+- {
+- GFile *file = g_file_new_for_path (path);
+- kqueue_monitor->fbfile = file;
+- kqueue_monitor->fallback = _g_poll_file_monitor_new (file);
+- g_signal_connect (kqueue_monitor->fallback,
+- "changed",
+- G_CALLBACK (_fallback_callback),
+- kqueue_monitor);
+- }
++ if (!_kqsub_start_watching (sub))
++ _km_add_missing (sub);
+ }
+
+-static gboolean
+-g_kqueue_file_monitor_is_supported (void)
+-{
+- return _kh_startup ();
+-}
+-
+ static void
+ g_kqueue_file_monitor_class_init (GKqueueFileMonitorClass *klass)
+ {
+@@ -175,24 +221,218 @@ g_kqueue_file_monitor_init (GKqueueFileMonitor *monito
+ }
+
+ static gboolean
++g_kqueue_file_monitor_callback (gint fd, GIOCondition condition, gpointer user_data)
++{
++ gint64 now = g_source_get_time (kq_source);
++ kqueue_sub *sub;
++ GFileMonitorSource *source;
++ struct kevent ev;
++ struct timespec ts;
++
++ memset (&ts, 0, sizeof(ts));
++ while (kevent(fd, NULL, 0, &ev, 1, &ts) > 0)
++ {
++ GFileMonitorEvent mask = 0;
++
++ if (ev.filter != EVFILT_VNODE || ev.udata == NULL)
++ continue;
++
++ sub = ev.udata;
++ source = sub->source;
++
++ if (ev.flags & EV_ERROR)
++ ev.fflags = NOTE_REVOKE;
++
++ if (ev.fflags & (NOTE_DELETE | NOTE_REVOKE))
++ {
++ _kqsub_cancel (sub);
++ _km_add_missing (sub);
++ }
++
++ if (sub->is_dir && ev.fflags & (NOTE_WRITE | NOTE_EXTEND))
++ {
++ _kh_dir_diff (sub);
++ ev.fflags &= ~(NOTE_WRITE | NOTE_EXTEND);
++ }
++
++ if (ev.fflags & NOTE_DELETE)
++ {
++ mask = G_FILE_MONITOR_EVENT_DELETED;
++ }
++ else if (ev.fflags & NOTE_ATTRIB)
++ {
++ mask = G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED;
++ }
++ else if (ev.fflags & (NOTE_WRITE | NOTE_EXTEND))
++ {
++ mask = G_FILE_MONITOR_EVENT_CHANGED;
++ }
++ else if (ev.fflags & NOTE_RENAME)
++ {
++ /* Since there’s apparently no way to get the new name of the
++ * file out of kqueue(), all we can do is say that this one has
++ * been deleted. */
++ mask = G_FILE_MONITOR_EVENT_DELETED;
++ }
++ else if (ev.fflags & NOTE_REVOKE)
++ {
++ mask = G_FILE_MONITOR_EVENT_UNMOUNTED;
++ }
++
++ if (mask)
++ g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, now);
++ }
++
++ return TRUE;
++}
++
++static gboolean
++g_kqueue_file_monitor_is_supported (void)
++{
++ int errsv;
++
++ G_LOCK (kq_lock);
++
++ if (kq_queue == -1)
++ {
++ kq_queue = kqueue ();
++ errsv = errno;
++
++ if (kq_queue == -1)
++ {
++ g_warning ("Unable to create a kqueue: %s", g_strerror (errsv));
++ G_UNLOCK (kq_lock);
++ return FALSE;
++ }
++
++ kq_source = g_unix_fd_source_new (kq_queue, G_IO_IN);
++ g_source_set_callback (kq_source, (GSourceFunc) g_kqueue_file_monitor_callback, NULL, NULL);
++ g_source_attach (kq_source, GLIB_PRIVATE_CALL (g_get_worker_context) ());
++ }
++
++ G_UNLOCK (kq_lock);
++
++ return TRUE;
++}
++
++static gboolean
+ g_kqueue_file_monitor_cancel (GFileMonitor *monitor)
+ {
+ GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (monitor);
+
+ if (kqueue_monitor->sub)
+ {
+- _kh_cancel_sub (kqueue_monitor->sub);
+- _kh_sub_free (kqueue_monitor->sub);
++ _kqsub_cancel (kqueue_monitor->sub);
++ _kqsub_free (kqueue_monitor->sub);
+ kqueue_monitor->sub = NULL;
+ }
++#ifndef O_EVTONLY
+ else if (kqueue_monitor->fallback)
+ {
+ g_signal_handlers_disconnect_by_func (kqueue_monitor->fallback, _fallback_callback, kqueue_monitor);
+ g_file_monitor_cancel (kqueue_monitor->fallback);
+ }
++#endif
+
+ if (G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel)
+ (*G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel) (monitor);
++
++ return TRUE;
++}
++
++static kqueue_sub *
++_kqsub_new (const gchar *filename, GLocalFileMonitor *mon, GFileMonitorSource *source)
++{
++ kqueue_sub *sub;
++
++ sub = g_slice_new (kqueue_sub);
++ sub->filename = g_strdup (filename);
++ sub->mon = mon;
++ g_source_ref ((GSource *) source);
++ sub->source = source;
++ sub->fd = -1;
++ sub->deps = NULL;
++ sub->is_dir = 0;
++
++ return sub;
++}
++
++static void
++_kqsub_free (kqueue_sub *sub)
++{
++ g_assert (sub->deps == NULL);
++ g_assert (sub->fd == -1);
++
++ g_source_unref ((GSource *) sub->source);
++ g_free (sub->filename);
++ g_slice_free (kqueue_sub, sub);
++}
++
++static gboolean
++_kqsub_cancel (kqueue_sub *sub)
++{
++ struct kevent ev;
++
++ /* Remove the event and close the file descriptor to automatically
++ * delete pending events. */
++ if (sub->fd != -1)
++ {
++ EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_DELETE, NOTE_ALL, 0, sub);
++ if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1)
++ {
++ g_warning ("Unable to remove event for %s: %s", sub->filename, g_strerror (errno));
++ return FALSE;
++ }
++ close (sub->fd);
++ sub->fd = -1;
++ }
++
++ _km_remove (sub);
++
++ if (sub->deps)
++ {
++ dl_free (sub->deps);
++ sub->deps = NULL;
++ }
++
++ return TRUE;
++}
++
++gboolean
++_kqsub_start_watching (kqueue_sub *sub)
++{
++ struct stat st;
++ struct kevent ev;
++
++ sub->fd = open (sub->filename, O_KQFLAG);
++ if (sub->fd == -1)
++ return FALSE;
++
++ if (fstat (sub->fd, &st) == -1)
++ {
++ g_warning ("fstat failed for %s: %s", sub->filename, g_strerror (errno));
++ close (sub->fd);
++ sub->fd = -1;
++ return FALSE;
++ }
++
++ sub->is_dir = (st.st_mode & S_IFDIR) ? 1 : 0;
++ if (sub->is_dir)
++ {
++ if (sub->deps)
++ dl_free (sub->deps);
++
++ sub->deps = dl_listing (sub->filename);
++ }
++
++ EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_ALL, 0, sub);
++ if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1)
++ {
++ g_warning ("Unable to add event for %s: %s", sub->filename, g_strerror (errno));
++ close (sub->fd);
++ sub->fd = -1;
++ return FALSE;
++ }
+
+ return TRUE;
+ }
diff --git a/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c b/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c
new file mode 100644
index 000000000000..1dbae54548bf
--- /dev/null
+++ b/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c
@@ -0,0 +1,409 @@
+--- gio/kqueue/kqueue-helper.c.orig 2018-01-08 21:00:49.000000000 +0100
++++ gio/kqueue/kqueue-helper.c 2018-04-09 22:46:58.181986000 +0200
+@@ -34,84 +34,7 @@
+ #include <errno.h>
+ #include <pthread.h>
+ #include "kqueue-helper.h"
+-#include "kqueue-utils.h"
+-#include "kqueue-thread.h"
+-#include "kqueue-missing.h"
+-#include "kqueue-exclusions.h"
+
+-static gboolean kh_debug_enabled = FALSE;
+-#define KH_W if (kh_debug_enabled) g_warning
+-
+-static GHashTable *subs_hash_table = NULL;
+-G_LOCK_DEFINE_STATIC (hash_lock);
+-
+-static int kqueue_descriptor = -1;
+-static int kqueue_socket_pair[] = {-1, -1};
+-static pthread_t kqueue_thread;
+-
+-
+-void _kh_file_appeared_cb (kqueue_sub *sub);
+-
+-/**
+- * accessor function for kqueue_descriptor
+- **/
+-int
+-get_kqueue_descriptor()
+-{
+- return kqueue_descriptor;
+-}
+-
+-/**
+- * convert_kqueue_events_to_gio:
+- * @flags: a set of kqueue filter flags
+- * @done: a pointer to #gboolean indicating that the
+- * conversion has been done (out)
+- *
+- * Translates kqueue filter flags into GIO event flags.
+- *
+- * Returns: a #GFileMonitorEvent
+- **/
+-static GFileMonitorEvent
+-convert_kqueue_events_to_gio (uint32_t flags, gboolean *done)
+-{
+- g_assert (done != NULL);
+- *done = FALSE;
+-
+- /* TODO: The following notifications should be emulated, if possible:
+- * - G_FILE_MONITOR_EVENT_PRE_UNMOUNT
+- */
+- if (flags & NOTE_DELETE)
+- {
+- *done = TRUE;
+- return G_FILE_MONITOR_EVENT_DELETED;
+- }
+- if (flags & NOTE_ATTRIB)
+- {
+- *done = TRUE;
+- return G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED;
+- }
+- if (flags & (NOTE_WRITE | NOTE_EXTEND))
+- {
+- *done = TRUE;
+- return G_FILE_MONITOR_EVENT_CHANGED;
+- }
+- if (flags & NOTE_RENAME)
+- {
+- /* Since there’s apparently no way to get the new name of the file out of
+- * kqueue(), all we can do is say that this one has been deleted. */
+- *done = TRUE;
+- return G_FILE_MONITOR_EVENT_DELETED;
+- }
+- if (flags & NOTE_REVOKE)
+- {
+- *done = TRUE;
+- return G_FILE_MONITOR_EVENT_UNMOUNTED;
+- }
+-
+- /* done is FALSE */
+- return 0;
+-}
+-
+ typedef struct {
+ kqueue_sub *sub;
+ GFileMonitorSource *source;
+@@ -238,318 +161,21 @@ static const traverse_cbs cbs = {
+
+
+ void
+-_kh_dir_diff (kqueue_sub *sub, GFileMonitorSource *source)
++_kh_dir_diff (kqueue_sub *sub)
+ {
+ dep_list *was;
+ handle_ctx ctx;
+
+- g_assert (sub != NULL);
+- g_assert (source != NULL);
+-
+ memset (&ctx, 0, sizeof (handle_ctx));
+ ctx.sub = sub;
+- ctx.source = source;
++ ctx.source = sub->source;
+
+ was = sub->deps;
+ sub->deps = dl_listing (sub->filename);
+-
++
+ dl_calculate (was, sub->deps, &cbs, &ctx);
+
+ dl_free (was);
+ }
+
+
+-/**
+- * process_kqueue_notifications:
+- * @gioc: unused.
+- * @cond: unused.
+- * @data: unused.
+- *
+- * Processes notifications, coming from the kqueue thread.
+- *
+- * Reads notifications from the command file descriptor, emits the
+- * "changed" event on the appropriate monitor.
+- *
+- * A typical GIO Channel callback function.
+- *
+- * Returns: %TRUE
+- **/
+-static gboolean
+-process_kqueue_notifications (GIOChannel *gioc,
+- GIOCondition cond,
+- gpointer data)
+-{
+- struct kqueue_notification n;
+- kqueue_sub *sub = NULL;
+- GFileMonitorSource *source = NULL;
+- GFileMonitorEvent mask = 0;
+-
+- g_assert (kqueue_socket_pair[0] != -1);
+- if (!_ku_read (kqueue_socket_pair[0], &n, sizeof (struct kqueue_notification)))
+- {
+- KH_W ("Failed to read a kqueue notification, error %d", errno);
+- return TRUE;
+- }
+-
+- G_LOCK (hash_lock);
+- sub = (kqueue_sub *) g_hash_table_lookup (subs_hash_table, GINT_TO_POINTER (n.fd));
+- G_UNLOCK (hash_lock);
+-
+- if (sub == NULL)
+- {
+- KH_W ("Got a notification for a deleted or non-existing subscription %d",
+- n.fd);
+- return TRUE;
+- }
+-
+- source = sub->user_data;
+- g_assert (source != NULL);
+-
+- if (n.flags & (NOTE_DELETE | NOTE_REVOKE))
+- {
+- if (sub->deps)
+- {
+- dl_free (sub->deps);
+- sub->deps = NULL;
+- }
+- _km_add_missing (sub);
+-
+- if (!(n.flags & NOTE_REVOKE))
+- {
+- /* Note that NOTE_REVOKE is issued by the kqueue thread
+- * on EV_ERROR kevent. In this case, a file descriptor is
+- * already closed from the kqueue thread, no need to close
+- * it manually */
+- _kh_cancel_sub (sub);
+- }
+- }
+-
+- if (sub->is_dir && n.flags & (NOTE_WRITE | NOTE_EXTEND))
+- {
+- _kh_dir_diff (sub, source);
+- n.flags &= ~(NOTE_WRITE | NOTE_EXTEND);
+- }
+-
+- if (n.flags)
+- {
+- gboolean done = FALSE;
+- mask = convert_kqueue_events_to_gio (n.flags, &done);
+- if (done == TRUE)
+- g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, g_get_monotonic_time ());
+- }
+-
+- return TRUE;
+-}
+-
+-
+-/*
+- * _kh_startup_impl:
+- * @unused: unused
+- *
+- * Kqueue backend startup code. Should be called only once.
+- *
+- * Returns: %TRUE on success, %FALSE otherwise.
+- **/
+-static gpointer
+-_kh_startup_impl (gpointer unused)
+-{
+- GIOChannel *channel = NULL;
+- gboolean result = FALSE;
+-
+- kqueue_descriptor = kqueue ();
+- result = (kqueue_descriptor != -1);
+- if (!result)
+- {
+- KH_W ("Failed to initialize kqueue\n!");
+- return GINT_TO_POINTER (FALSE);
+- }
+-
+- result = socketpair (AF_UNIX, SOCK_STREAM, 0, kqueue_socket_pair);
+- if (result != 0)
+- {
+- KH_W ("Failed to create socket pair\n!");
+- return GINT_TO_POINTER (FALSE) ;
+- }
+-
+- result = pthread_create (&kqueue_thread,
+- NULL,
+- _kqueue_thread_func,
+- &kqueue_socket_pair[1]);
+- if (result != 0)
+- {
+- KH_W ("Failed to run kqueue thread\n!");
+- return GINT_TO_POINTER (FALSE);
+- }
+-
+- _km_init (_kh_file_appeared_cb);
+-
+- channel = g_io_channel_unix_new (kqueue_socket_pair[0]);
+- g_io_add_watch (channel, G_IO_IN, process_kqueue_notifications, NULL);
+-
+- subs_hash_table = g_hash_table_new (g_direct_hash, g_direct_equal);
+-
+- KH_W ("started gio kqueue backend\n");
+- return GINT_TO_POINTER (TRUE);
+-}
+-
+-
+-/*
+- * _kh_startup:
+- * Kqueue backend initialization.
+- *
+- * Returns: %TRUE on success, %FALSE otherwise.
+- **/
+-gboolean
+-_kh_startup (void)
+-{
+- static GOnce init_once = G_ONCE_INIT;
+- g_once (&init_once, _kh_startup_impl, NULL);
+- return GPOINTER_TO_INT (init_once.retval);
+-}
+-
+-
+-/**
+- * _kh_start_watching:
+- * @sub: a #kqueue_sub
+- *
+- * Starts watching on a subscription.
+- *
+- * Returns: %TRUE on success, %FALSE otherwise.
+- **/
+-gboolean
+-_kh_start_watching (kqueue_sub *sub)
+-{
+- g_assert (kqueue_socket_pair[0] != -1);
+- g_assert (sub != NULL);
+- g_assert (sub->filename != NULL);
+-
+- /* kqueue requires a file descriptor to monitor. Sad but true */
+-#if defined (O_EVTONLY)
+- sub->fd = open (sub->filename, O_EVTONLY);
+-#else
+- sub->fd = open (sub->filename, O_RDONLY);
+-#endif
+-
+- if (sub->fd == -1)
+- {
+- KH_W ("failed to open file %s (error %d)", sub->filename, errno);
+- return FALSE;
+- }
+-
+- _ku_file_information (sub->fd, &sub->is_dir, NULL);
+- if (sub->is_dir)
+- {
+- /* I know, it is very bad to make such decisions in this way and here.
+- * We already do have an user_data at the #kqueue_sub, and it may point to
+- * GKqueueFileMonitor or GKqueueDirectoryMonitor. For a directory case,
+- * we need to scan in contents for the further diffs. Ideally this process
+- * should be delegated to the GKqueueDirectoryMonitor, but for now I will
+- * do it in a dirty way right here. */
+- if (sub->deps)
+- dl_free (sub->deps);
+-
+- sub->deps = dl_listing (sub->filename);
+- }
+-
+- G_LOCK (hash_lock);
+- g_hash_table_insert (subs_hash_table, GINT_TO_POINTER (sub->fd), sub);
+- G_UNLOCK (hash_lock);
+-
+- _kqueue_thread_push_fd (sub->fd);
+-
+- /* Bump the kqueue thread. It will pick up a new sub entry to monitor */
+- if (!_ku_write (kqueue_socket_pair[0], "A", 1))
+- KH_W ("Failed to bump the kqueue thread (add fd, error %d)", errno);
+- return TRUE;
+-}
+-
+-
+-/**
+- * _kh_add_sub:
+- * @sub: a #kqueue_sub
+- *
+- * Adds a subscription for monitoring.
+- *
+- * This funciton tries to start watching a subscription with
+- * _kh_start_watching(). On failure, i.e. when a file does not exist yet,
+- * the subscription will be added to a list of missing files to continue
+- * watching when the file will appear.
+- *
+- * Returns: %TRUE
+- **/
+-gboolean
+-_kh_add_sub (kqueue_sub *sub)
+-{
+- g_assert (sub != NULL);
+-
+- if (!_kh_start_watching (sub))
+- _km_add_missing (sub);
+-
+- return TRUE;
+-}
+-
+-
+-/**
+- * _kh_cancel_sub:
+- * @sub a #kqueue_sub
+- *
+- * Stops monitoring on a subscription.
+- *
+- * Returns: %TRUE
+- **/
+-gboolean
+-_kh_cancel_sub (kqueue_sub *sub)
+-{
+- gboolean removed = FALSE;
+- g_assert (kqueue_socket_pair[0] != -1);
+- g_assert (sub != NULL);
+-
+- _km_remove (sub);
+-
+- G_LOCK (hash_lock);
+- removed = g_hash_table_remove (subs_hash_table, GINT_TO_POINTER (sub->fd));
+- G_UNLOCK (hash_lock);
+-
+- if (removed)
+- {
+- /* fd will be closed in the kqueue thread */
+- _kqueue_thread_remove_fd (sub->fd);
+-
+- /* Bump the kqueue thread. It will pick up a new sub entry to remove*/
+- if (!_ku_write (kqueue_socket_pair[0], "R", 1))
+- KH_W ("Failed to bump the kqueue thread (remove fd, error %d)", errno);
+- }
+-
+- return TRUE;
+-}
+-
+-
+-/**
+- * _kh_file_appeared_cb:
+- * @sub: a #kqueue_sub
+- *
+- * A callback function for kqueue-missing subsystem.
+- *
+- * Signals that a missing file has finally appeared in the filesystem.
+- * Emits %G_FILE_MONITOR_EVENT_CREATED.
+- **/
+-void
+-_kh_file_appeared_cb (kqueue_sub *sub)
+-{
+- GFile* child;
+-
+- g_assert (sub != NULL);
+- g_assert (sub->filename);
+-
+- if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS))
+- return;
+-
+- child = g_file_new_for_path (sub->filename);
+-
+- g_file_monitor_emit_event (G_FILE_MONITOR (sub->user_data),
+- child,
+- NULL,
+- G_FILE_MONITOR_EVENT_CREATED);
+-
+- g_object_unref (child);
+-}
diff --git a/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h b/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h
new file mode 100644
index 000000000000..053e895488e7
--- /dev/null
+++ b/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h
@@ -0,0 +1,40 @@
+--- gio/kqueue/kqueue-helper.h.orig 2018-04-09 22:47:22.070991000 +0200
++++ gio/kqueue/kqueue-helper.h 2018-04-09 22:47:44.329479000 +0200
+@@ -23,16 +23,31 @@
+ #ifndef __KQUEUE_HELPER_H
+ #define __KQUEUE_HELPER_H
+
+-#include "kqueue-sub.h"
+ #include <gio/glocalfilemonitor.h>
+ #include <gio/gfilemonitor.h>
+
+-gboolean _kh_startup (void);
+-gboolean _kh_add_sub (kqueue_sub *sub);
+-gboolean _kh_cancel_sub (kqueue_sub *sub);
++#include "dep-list.h"
+
+-gboolean _kh_start_watching (kqueue_sub *sub);
++/**
++ * kqueue_sub:
++ * @filename: a name of the file to monitor
++ * @fd: the associated file descriptor (used by kqueue)
++ *
++ * Represents a subscription on a file or directory.
++ */
++typedef struct
++{
++ GLocalFileMonitor *mon;
++ GFileMonitorSource *source;
++ gchar* filename;
++ int fd;
++ dep_list* deps;
++ int is_dir;
++} kqueue_sub;
+
+-void _kh_dir_diff (kqueue_sub *sub, GFileMonitorSource *source);
++gboolean _kqsub_start_watching (kqueue_sub *sub);
++void _kh_dir_diff (kqueue_sub *sub);
++void _km_add_missing (kqueue_sub *sub);
++void _km_remove (kqueue_sub *sub);
+
+ #endif /* __KQUEUE_HELPER_H */
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 36680c32ac60..dbd16babc670 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -13,9 +13,6 @@ bin/gresource
bin/gsettings
bin/gtester
bin/gtester-report
-share/bash-completion/completions/gdbus
-share/bash-completion/completions/gsettings
-share/bash-completion/completions/gresource
include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixconnection.h
@@ -251,6 +248,7 @@ include/glib-2.0/glib/gtypes.h
include/glib-2.0/glib/gunicode.h
include/glib-2.0/glib/gurifuncs.h
include/glib-2.0/glib/gutils.h
+include/glib-2.0/glib/guuid.h
include/glib-2.0/glib/gvariant.h
include/glib-2.0/glib/gvarianttype.h
include/glib-2.0/glib/gversion.h
@@ -310,6 +308,7 @@ man/man1/gapplication.1.gz
man/man1/gdbus-codegen.1.gz
man/man1/gdbus.1.gz
man/man1/gio-querymodules.1.gz
+man/man1/gio.1.gz
man/man1/glib-compile-resources.1.gz
man/man1/glib-compile-schemas.1.gz
man/man1/glib-genmarshal.1.gz
@@ -324,38 +323,42 @@ share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
share/aclocal/gsettings.m4
share/bash-completion/completions/gapplication
+share/bash-completion/completions/gdbus
+share/bash-completion/completions/gresource
+share/bash-completion/completions/gsettings
share/gdb/auto-load%%RESETPREFIX%%/lib/libglib-2.0.so.%%LIBVERSION%%-gdb.py
share/gdb/auto-load%%RESETPREFIX%%/lib/libgobject-2.0.so.%%LIBVERSION%%-gdb.py
share/gettext/its/gschema.its
share/gettext/its/gschema.loc
-share/glib-2.0/codegen/__init__.py
-share/glib-2.0/codegen/__init__.pyc
-share/glib-2.0/codegen/__init__.pyo
-share/glib-2.0/codegen/codegen.py
-share/glib-2.0/codegen/codegen.pyc
-share/glib-2.0/codegen/codegen.pyo
-share/glib-2.0/codegen/codegen_docbook.py
-share/glib-2.0/codegen/codegen_docbook.pyc
-share/glib-2.0/codegen/codegen_docbook.pyo
-share/glib-2.0/codegen/codegen_main.py
-share/glib-2.0/codegen/codegen_main.pyc
-share/glib-2.0/codegen/codegen_main.pyo
-share/glib-2.0/codegen/config.py
-share/glib-2.0/codegen/config.pyc
-share/glib-2.0/codegen/config.pyo
-share/glib-2.0/codegen/dbustypes.py
-share/glib-2.0/codegen/dbustypes.pyc
-share/glib-2.0/codegen/dbustypes.pyo
-share/glib-2.0/codegen/parser.py
-share/glib-2.0/codegen/parser.pyc
-share/glib-2.0/codegen/parser.pyo
-share/glib-2.0/codegen/utils.py
-share/glib-2.0/codegen/utils.pyc
-share/glib-2.0/codegen/utils.pyo
-share/glib-2.0/gdb/glib_gdb.py
-share/glib-2.0/gdb/gobject_gdb.py
-share/glib-2.0/gettext/po/Makefile.in.in
-share/glib-2.0/schemas/gschema.dtd
+%%DATADIR%%-2.0/codegen/__init__.py
+%%DATADIR%%-2.0/codegen/__init__.pyc
+%%DATADIR%%-2.0/codegen/__init__.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%-2.0/codegen/codegen.py
+%%DATADIR%%-2.0/codegen/codegen.pyc
+%%DATADIR%%-2.0/codegen/codegen.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%-2.0/codegen/codegen_docbook.py
+%%DATADIR%%-2.0/codegen/codegen_docbook.pyc
+%%DATADIR%%-2.0/codegen/codegen_docbook.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%-2.0/codegen/codegen_main.py
+%%DATADIR%%-2.0/codegen/codegen_main.pyc
+%%DATADIR%%-2.0/codegen/codegen_main.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%-2.0/codegen/config.py
+%%DATADIR%%-2.0/codegen/config.pyc
+%%DATADIR%%-2.0/codegen/config.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%-2.0/codegen/dbustypes.py
+%%DATADIR%%-2.0/codegen/dbustypes.pyc
+%%DATADIR%%-2.0/codegen/dbustypes.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%-2.0/codegen/parser.py
+%%DATADIR%%-2.0/codegen/parser.pyc
+%%DATADIR%%-2.0/codegen/parser.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%-2.0/codegen/utils.py
+%%DATADIR%%-2.0/codegen/utils.pyc
+%%DATADIR%%-2.0/codegen/utils.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%-2.0/gdb/glib_gdb.py
+%%DATADIR%%-2.0/gdb/gobject_gdb.py
+%%DATADIR%%-2.0/gettext/po/Makefile.in.in
+%%DATADIR%%-2.0/schemas/gschema.dtd
+%%DATADIR%%-2.0/valgrind/glib.supp
%%NLS%%share/locale/af/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/am/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/an/LC_MESSAGES/glib20.mo
@@ -387,6 +390,7 @@ share/glib-2.0/schemas/gschema.dtd
%%NLS%%share/locale/fa/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/fi/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/fr/LC_MESSAGES/glib20.mo
+%%NLS%%share/locale/fur/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/ga/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/gd/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/gl/LC_MESSAGES/glib20.mo
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index e03f624fed39..28c19fd7fa59 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= glibmm
-PORTVERSION= 2.50.1
-PORTREVISION= 2
+PORTVERSION= 2.56.0
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 86cab145a27f..03f702dd3b3b 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491335750
-SHA256 (gnome2/glibmm-2.50.1.tar.xz) = 1fd85051da9cb402cc8348cec72dfe4d79f9345df4a1dbf68703a4ded45846a4
-SIZE (gnome2/glibmm-2.50.1.tar.xz) = 6444576
+TIMESTAMP = 1523034335
+SHA256 (gnome2/glibmm-2.56.0.tar.xz) = 6e74fcba0d245451c58fc8a196e9d103789bc510e1eee1a9b1e816c5209e79a9
+SIZE (gnome2/glibmm-2.56.0.tar.xz) = 6859520
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 18a31fb635cc..34b8580e8384 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -371,6 +371,7 @@ include/glibmm-%%VERSION%%/glibmm/value_custom.h
include/glibmm-%%VERSION%%/glibmm/valuearray.h
include/glibmm-%%VERSION%%/glibmm/variant.h
include/glibmm-%%VERSION%%/glibmm/variant_basictypes.h
+include/glibmm-%%VERSION%%/glibmm/variantdbusstring.h
include/glibmm-%%VERSION%%/glibmm/variantdict.h
include/glibmm-%%VERSION%%/glibmm/variantiter.h
include/glibmm-%%VERSION%%/glibmm/varianttype.h
diff --git a/devel/gnome-builder/Makefile b/devel/gnome-builder/Makefile
index 71a9bfe97ca9..c7f921a0cdc1 100644
--- a/devel/gnome-builder/Makefile
+++ b/devel/gnome-builder/Makefile
@@ -1,47 +1,85 @@
# $FreeBSD$
PORTNAME= gnome-builder
-PORTVERSION= 3.16.2
-PORTREVISION= 1
+PORTVERSION= 3.28.3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
-MAINTAINER= rm@FreeBSD.org
+MAINTAINER= gnome@FreeBSD.org
COMMENT= IDE for writing software for GNOME
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= intltool-update:textproc/intltool \
- llvm-config35:devel/llvm35 \
- clang35:lang/clang35
-LIB_DEPENDS= libgit2-glib-1.0.so:devel/libgit2-glib \
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libjson-glib-1.0.so:devel/json-glib \
libpeas-1.0.so:devel/libpeas \
+ libjsonrpc-glib-1.0.so:devel/jsonrpc-glib \
+ libtemplate_glib-1.0.so:devel/template-glib \
+ libdazzle-1.0.so:x11-toolkits/libdazzle \
+ libenchant-2.so:textproc/enchant2 \
+ libgspell-1.so:textproc/gspell \
+ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
libdevhelp-3.so:devel/devhelp \
- libgjs.so:lang/gjs \
- libpcre.so:devel/pcre
+ libgit2-glib-1.0.so:devel/libgit2-glib \
+ libpcre.so:devel/pcre \
+ libvala-0.40.so:lang/vala
PORTSCOUT= limitw:1,even
PORTDOCS= *
-USES= cpe gettext gmake libtool pathfix python:3.4+ pkgconfig tar:xz
-USE_GNOME= glib20 gtk30 gtksourceview3 gtk-update-icon-cache pygobject3
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--disable-debug \
- ac_cv_path_PYTHON3_CONFIG=${PYTHON_CMD}-config
+CONFLICTS_BUILD= gnome-builder-3.16.*
+
+USES= compiler:c++11-lang cpe desktop-file-utils gettext gnome meson pkgconfig python:3.6+,build tar:xz
+USE_GNOME= cairo gtksourceview3 introspection libxml2 vte3
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-INSTALL_TARGET= install-strip
CPE_VENDOR= gnome
+BINARY_ALIAS= python3=${PYTHON_VERSION}
+
+MESON_ARGS= -Dwith_flatpak=false \
+ -Dwith_sysprof=false \
+ -Dwith_qemu=false \
+ -Dwith_jhbuild=false
+
+PLIST_SUB+= PORTVER=${PORTVERSION}
-GLIB_SCHEMAS= org.gnome.builder.editor.gschema.xml \
+GLIB_SCHEMAS= org.gnome.builder.build.gschema.xml \
+ org.gnome.builder.code-insight.gschema.xml \
+ org.gnome.builder.editor.gschema.xml \
org.gnome.builder.editor.language.gschema.xml \
- org.gnome.builder.experimental.gschema.xml \
- org.gnome.builder.project-tree.gschema.xml
+ org.gnome.builder.extension-type.gschema.xml \
+ org.gnome.builder.gnome-code-assistance.gschema.xml \
+ org.gnome.builder.gschema.xml \
+ org.gnome.builder.plugin.gschema.xml \
+ org.gnome.builder.plugins.color_picker_plugin.gschema.xml \
+ org.gnome.builder.plugins.eslint.gschema.xml \
+ org.gnome.builder.project-tree.gschema.xml \
+ org.gnome.builder.project.gschema.xml \
+ org.gnome.builder.terminal.gschema.xml \
+ org.gnome.builder.workbench.gschema.xml
+
+OPTIONS_SUB= YES
+OPTIONS_DEFINE= CLANG DOCS
+OPTIONS_DEFAULT= CLANG
+
+# track the latest llvm/clang version, the config script picks the newest available
+LLVM_VER= 60
+CLANG_DESC= Build the clang plugin
+CLANG_MESON_TRUE= with_clang
+CLANG_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
+CLANG_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
+
+# jedi plugin with dependancies doesn't work
+MESON_ARGS+= -Dwith_jedi=false
+#RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+# ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+# ${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR}
-OPTIONS_DEFINE= DOCS
+# 11.1 and older has issues with vala generated code.
+post-patch:
+ ${REINPLACE_CMD} -e '/-Werror=return-type/d' \
+ ${WRKSRC}/meson.build
.include <bsd.port.mk>
diff --git a/devel/gnome-builder/distinfo b/devel/gnome-builder/distinfo
index a8c3cc15b4f5..df4903bb685f 100644
--- a/devel/gnome-builder/distinfo
+++ b/devel/gnome-builder/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-builder-3.16.2.tar.xz) = 29bce3b39a0745c8ad538ee5051754b14d6d946f382bcc149a44ee53557cbbfd
-SIZE (gnome3/gnome-builder-3.16.2.tar.xz) = 1683324
+TIMESTAMP = 1529614786
+SHA256 (gnome3/gnome-builder-3.28.3.tar.xz) = a62b72efebf0080c6899824edcfaaa1e1e1c5d05e8b4390414a7dc78a30b726f
+SIZE (gnome3/gnome-builder-3.28.3.tar.xz) = 9309888
diff --git a/devel/gnome-builder/files/patch-libide_git_ide-git-buffer-change-monitor.c b/devel/gnome-builder/files/patch-libide_git_ide-git-buffer-change-monitor.c
deleted file mode 100644
index 540a2e4bdad7..000000000000
--- a/devel/gnome-builder/files/patch-libide_git_ide-git-buffer-change-monitor.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream patch to fix build with more fresh libgit2 library we have in ports.
-Should be removed after updating to 3.18.0
-
---- libide/git/ide-git-buffer-change-monitor.c.orig 2015-04-08 06:43:25 UTC
-+++ libide/git/ide-git-buffer-change-monitor.c
-@@ -621,7 +621,7 @@ ide_git_buffer_change_monitor_calculate_
- data = g_bytes_get_data (diff->content, &data_len);
-
- ggit_diff_blob_to_buffer (diff->blob, relative_path, data, data_len, relative_path,
-- NULL, NULL, NULL, diff_line_cb, (gpointer)diff->state, error);
-+ NULL, NULL, NULL, NULL, diff_line_cb, (gpointer)diff->state, error);
-
- return ((*error) == NULL);
- }
diff --git a/devel/gnome-builder/files/patch-src_dialogs_gb-new-project-dialog.c b/devel/gnome-builder/files/patch-src_dialogs_gb-new-project-dialog.c
deleted file mode 100644
index 531b5ec8e227..000000000000
--- a/devel/gnome-builder/files/patch-src_dialogs_gb-new-project-dialog.c
+++ /dev/null
@@ -1,46 +0,0 @@
-Upstream patch to fix build with more fresh libgit2 library we have in ports.
-Should be removed after updating to 3.18.0
-
---- src/dialogs/gb-new-project-dialog.c.orig 2015-04-08 20:10:45 UTC
-+++ src/dialogs/gb-new-project-dialog.c
-@@ -188,6 +188,7 @@ gb_new_project_dialog__clone_worker (GTa
- g_autoptr(GFile) workdir = NULL;
- CloneRequest *req = task_data;
- GgitCloneOptions *clone_options;
-+ GgitFetchOptions *fetch_options;
- GgitRemoteCallbacks *callbacks;
- IdeProgress *progress;
- GError *error = NULL;
-@@ -197,21 +198,25 @@ gb_new_project_dialog__clone_worker (GTa
- g_assert (req != NULL);
- g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
-
-- clone_options = ggit_clone_options_new ();
-- ggit_clone_options_set_is_bare (clone_options, FALSE);
-- ggit_clone_options_set_checkout_branch (clone_options, "master");
--
- callbacks = g_object_new (IDE_TYPE_GIT_REMOTE_CALLBACKS, NULL);
- progress = ide_git_remote_callbacks_get_progress (IDE_GIT_REMOTE_CALLBACKS (callbacks));
- g_object_bind_property (progress, "fraction",
- self->clone_progress, "fraction",
- G_BINDING_SYNC_CREATE);
-- ggit_clone_options_set_remote_callbacks (clone_options, callbacks);
-+
-+ fetch_options = ggit_fetch_options_new ();
-+ ggit_fetch_options_set_remote_callbacks (fetch_options, callbacks);
-+
-+ clone_options = ggit_clone_options_new ();
-+ ggit_clone_options_set_is_bare (clone_options, FALSE);
-+ ggit_clone_options_set_checkout_branch (clone_options, "master");
-+ ggit_clone_options_set_fetch_options (clone_options, fetch_options);
-+ g_clear_pointer (&fetch_options, ggit_fetch_options_free);
-
- repository = ggit_repository_clone (req->uri, req->location, clone_options, &error);
-
-- g_object_unref (callbacks);
-- ggit_clone_options_free (clone_options);
-+ g_clear_object (&callbacks);
-+ g_clear_object (&clone_options);
-
- if (repository == NULL)
- {
diff --git a/devel/gnome-builder/files/patch-src_libide_meson.build b/devel/gnome-builder/files/patch-src_libide_meson.build
new file mode 100644
index 000000000000..74b2828c3e9f
--- /dev/null
+++ b/devel/gnome-builder/files/patch-src_libide_meson.build
@@ -0,0 +1,10 @@
+--- src/libide/meson.build.orig 2018-05-10 18:55:17.502214000 +0200
++++ src/libide/meson.build 2018-05-10 18:55:58.276485000 +0200
+@@ -206,6 +206,7 @@
+ libtemplate_glib_dep,
+ libvte_dep,
+ libxml2_dep,
++ cc.find_library('m', required: true),
+ ]
+
+ if get_option('with_webkit')
diff --git a/devel/gnome-builder/pkg-plist b/devel/gnome-builder/pkg-plist
index 595a8d6a97ca..fcfc4c67a648 100644
--- a/devel/gnome-builder/pkg-plist
+++ b/devel/gnome-builder/pkg-plist
@@ -1,34 +1,403 @@
bin/gnome-builder
-lib/libide-1.0.so
-lib/girepository-1.0/Ide-1.0.typelib
-libdata/pkgconfig/libide-1.0.pc
-share/appdata/org.gnome.Builder.appdata.xml
+include/gnome-builder/gstyle/gstyle-animation.h
+include/gnome-builder/gstyle/gstyle-cielab.h
+include/gnome-builder/gstyle/gstyle-color-component.h
+include/gnome-builder/gstyle/gstyle-color-convert.h
+include/gnome-builder/gstyle/gstyle-color-filter.h
+include/gnome-builder/gstyle/gstyle-color-item.h
+include/gnome-builder/gstyle/gstyle-color-panel-actions.h
+include/gnome-builder/gstyle/gstyle-color-panel-private.h
+include/gnome-builder/gstyle/gstyle-color-panel.h
+include/gnome-builder/gstyle/gstyle-color-plane.h
+include/gnome-builder/gstyle/gstyle-color-predefined.h
+include/gnome-builder/gstyle/gstyle-color-scale.h
+include/gnome-builder/gstyle/gstyle-color-widget-actions.h
+include/gnome-builder/gstyle/gstyle-color-widget.h
+include/gnome-builder/gstyle/gstyle-color.h
+include/gnome-builder/gstyle/gstyle-colorlexer.h
+include/gnome-builder/gstyle/gstyle-css-provider.h
+include/gnome-builder/gstyle/gstyle-eyedropper.h
+include/gnome-builder/gstyle/gstyle-hsv.h
+include/gnome-builder/gstyle/gstyle-palette-widget.h
+include/gnome-builder/gstyle/gstyle-palette.h
+include/gnome-builder/gstyle/gstyle-private.h
+include/gnome-builder/gstyle/gstyle-rename-popover.h
+include/gnome-builder/gstyle/gstyle-revealer.h
+include/gnome-builder/gstyle/gstyle-slidein.h
+include/gnome-builder/gstyle/gstyle-types.h
+include/gnome-builder/gstyle/gstyle-utils.h
+include/gnome-builder/gstyle/gstyle-xyz.h
+include/gnome-builder/libide/application/ide-application-addin.h
+include/gnome-builder/libide/application/ide-application-credits.h
+include/gnome-builder/libide/application/ide-application-tool.h
+include/gnome-builder/libide/application/ide-application.h
+include/gnome-builder/libide/buffers/ide-buffer-addin.h
+include/gnome-builder/libide/buffers/ide-buffer-change-monitor.h
+include/gnome-builder/libide/buffers/ide-buffer-manager.h
+include/gnome-builder/libide/buffers/ide-buffer.h
+include/gnome-builder/libide/buffers/ide-unsaved-file.h
+include/gnome-builder/libide/buffers/ide-unsaved-files.h
+include/gnome-builder/libide/buildconfig/ide-buildconfig-configuration-provider.h
+include/gnome-builder/libide/buildconfig/ide-buildconfig-configuration.h
+include/gnome-builder/libide/buildsystem/ide-build-log.h
+include/gnome-builder/libide/buildsystem/ide-build-manager.h
+include/gnome-builder/libide/buildsystem/ide-build-pipeline-addin.h
+include/gnome-builder/libide/buildsystem/ide-build-pipeline.h
+include/gnome-builder/libide/buildsystem/ide-build-stage-launcher.h
+include/gnome-builder/libide/buildsystem/ide-build-stage-mkdirs.h
+include/gnome-builder/libide/buildsystem/ide-build-stage-transfer.h
+include/gnome-builder/libide/buildsystem/ide-build-stage.h
+include/gnome-builder/libide/buildsystem/ide-build-system-discovery.h
+include/gnome-builder/libide/buildsystem/ide-build-system.h
+include/gnome-builder/libide/buildsystem/ide-build-target-provider.h
+include/gnome-builder/libide/buildsystem/ide-build-target.h
+include/gnome-builder/libide/buildsystem/ide-build-utils.h
+include/gnome-builder/libide/buildsystem/ide-compile-commands.h
+include/gnome-builder/libide/buildsystem/ide-dependency-updater.h
+include/gnome-builder/libide/buildsystem/ide-environment-variable.h
+include/gnome-builder/libide/buildsystem/ide-environment.h
+include/gnome-builder/libide/config/ide-configuration-manager.h
+include/gnome-builder/libide/config/ide-configuration-provider.h
+include/gnome-builder/libide/config/ide-configuration.h
+include/gnome-builder/libide/debugger/ide-debug-manager.h
+include/gnome-builder/libide/debugger/ide-debugger-breakpoint.h
+include/gnome-builder/libide/debugger/ide-debugger-breakpoints.h
+include/gnome-builder/libide/debugger/ide-debugger-frame.h
+include/gnome-builder/libide/debugger/ide-debugger-instruction.h
+include/gnome-builder/libide/debugger/ide-debugger-library.h
+include/gnome-builder/libide/debugger/ide-debugger-register.h
+include/gnome-builder/libide/debugger/ide-debugger-thread-group.h
+include/gnome-builder/libide/debugger/ide-debugger-thread.h
+include/gnome-builder/libide/debugger/ide-debugger-types.h
+include/gnome-builder/libide/debugger/ide-debugger-variable.h
+include/gnome-builder/libide/debugger/ide-debugger.h
+include/gnome-builder/libide/devices/ide-deploy-strategy.h
+include/gnome-builder/libide/devices/ide-device-info.h
+include/gnome-builder/libide/devices/ide-device-manager.h
+include/gnome-builder/libide/devices/ide-device-provider.h
+include/gnome-builder/libide/devices/ide-device.h
+include/gnome-builder/libide/diagnostics/ide-diagnostic-provider.h
+include/gnome-builder/libide/diagnostics/ide-diagnostic.h
+include/gnome-builder/libide/diagnostics/ide-diagnostics-manager.h
+include/gnome-builder/libide/diagnostics/ide-diagnostics.h
+include/gnome-builder/libide/diagnostics/ide-fixit.h
+include/gnome-builder/libide/diagnostics/ide-source-location.h
+include/gnome-builder/libide/diagnostics/ide-source-range.h
+include/gnome-builder/libide/directory/ide-directory-build-system.h
+include/gnome-builder/libide/directory/ide-directory-vcs.h
+include/gnome-builder/libide/doap/ide-doap-person.h
+include/gnome-builder/libide/doap/ide-doap.h
+include/gnome-builder/libide/documentation/ide-documentation-info.h
+include/gnome-builder/libide/documentation/ide-documentation-proposal.h
+include/gnome-builder/libide/documentation/ide-documentation-provider.h
+include/gnome-builder/libide/documentation/ide-documentation.h
+include/gnome-builder/libide/editor/ide-editor-addin.h
+include/gnome-builder/libide/editor/ide-editor-perspective.h
+include/gnome-builder/libide/editor/ide-editor-search.h
+include/gnome-builder/libide/editor/ide-editor-sidebar.h
+include/gnome-builder/libide/editor/ide-editor-utilities.h
+include/gnome-builder/libide/editor/ide-editor-view-addin.h
+include/gnome-builder/libide/editor/ide-editor-view.h
+include/gnome-builder/libide/files/ide-file-settings.defs
+include/gnome-builder/libide/files/ide-file-settings.h
+include/gnome-builder/libide/files/ide-file.h
+include/gnome-builder/libide/files/ide-indent-style.h
+include/gnome-builder/libide/files/ide-spaces-style.h
+include/gnome-builder/libide/formatting/ide-formatter-options.h
+include/gnome-builder/libide/formatting/ide-formatter.h
+include/gnome-builder/libide/genesis/ide-genesis-addin.h
+include/gnome-builder/libide/greeter/ide-greeter-section.h
+include/gnome-builder/libide/highlighting/ide-highlight-engine.h
+include/gnome-builder/libide/highlighting/ide-highlight-index.h
+include/gnome-builder/libide/highlighting/ide-highlighter.h
+include/gnome-builder/libide/ide-context.h
+include/gnome-builder/libide/ide-debug.h
+include/gnome-builder/libide/ide-enums.h
+include/gnome-builder/libide/ide-global.h
+include/gnome-builder/libide/ide-object.h
+include/gnome-builder/libide/ide-pausable.h
+include/gnome-builder/libide/ide-service.h
+include/gnome-builder/libide/ide-types.h
+include/gnome-builder/libide/ide-version-macros.h
+include/gnome-builder/libide/ide-version.h
+include/gnome-builder/libide/ide.h
+include/gnome-builder/libide/langserv/ide-langserv-client.h
+include/gnome-builder/libide/langserv/ide-langserv-completion-provider.h
+include/gnome-builder/libide/langserv/ide-langserv-diagnostic-provider.h
+include/gnome-builder/libide/langserv/ide-langserv-formatter.h
+include/gnome-builder/libide/langserv/ide-langserv-highlighter.h
+include/gnome-builder/libide/langserv/ide-langserv-rename-provider.h
+include/gnome-builder/libide/langserv/ide-langserv-symbol-node.h
+include/gnome-builder/libide/langserv/ide-langserv-symbol-resolver.h
+include/gnome-builder/libide/langserv/ide-langserv-symbol-tree.h
+include/gnome-builder/libide/langserv/ide-langserv-util.h
+include/gnome-builder/libide/layout/ide-layout-grid-column.h
+include/gnome-builder/libide/layout/ide-layout-grid.h
+include/gnome-builder/libide/layout/ide-layout-pane.h
+include/gnome-builder/libide/layout/ide-layout-stack-addin.h
+include/gnome-builder/libide/layout/ide-layout-stack-header.h
+include/gnome-builder/libide/layout/ide-layout-stack.h
+include/gnome-builder/libide/layout/ide-layout-transient-sidebar.h
+include/gnome-builder/libide/layout/ide-layout-view.h
+include/gnome-builder/libide/layout/ide-layout.h
+include/gnome-builder/libide/local/ide-local-device.h
+include/gnome-builder/libide/logging/ide-log.h
+include/gnome-builder/libide/plugins/ide-extension-adapter.h
+include/gnome-builder/libide/plugins/ide-extension-set-adapter.h
+include/gnome-builder/libide/preferences/ide-preferences-addin.h
+include/gnome-builder/libide/preferences/ide-preferences-perspective.h
+include/gnome-builder/libide/preferences/ide-preferences-window.h
+include/gnome-builder/libide/projects/ide-project-edit.h
+include/gnome-builder/libide/projects/ide-project-info.h
+include/gnome-builder/libide/projects/ide-project-item.h
+include/gnome-builder/libide/projects/ide-project.h
+include/gnome-builder/libide/projects/ide-recent-projects.h
+include/gnome-builder/libide/rename/ide-rename-provider.h
+include/gnome-builder/libide/runner/ide-run-button.h
+include/gnome-builder/libide/runner/ide-run-manager.h
+include/gnome-builder/libide/runner/ide-runner-addin.h
+include/gnome-builder/libide/runner/ide-runner.h
+include/gnome-builder/libide/runtimes/ide-runtime-manager.h
+include/gnome-builder/libide/runtimes/ide-runtime-provider.h
+include/gnome-builder/libide/runtimes/ide-runtime.h
+include/gnome-builder/libide/search/ide-search-engine.h
+include/gnome-builder/libide/search/ide-search-entry.h
+include/gnome-builder/libide/search/ide-search-provider.h
+include/gnome-builder/libide/search/ide-search-reducer.h
+include/gnome-builder/libide/search/ide-search-result.h
+include/gnome-builder/libide/search/ide-tagged-entry.h
+include/gnome-builder/libide/snippets/ide-source-snippet-chunk.h
+include/gnome-builder/libide/snippets/ide-source-snippet-context.h
+include/gnome-builder/libide/snippets/ide-source-snippet.h
+include/gnome-builder/libide/snippets/ide-source-snippets-manager.h
+include/gnome-builder/libide/snippets/ide-source-snippets.h
+include/gnome-builder/libide/sourceview/ide-completion-item.h
+include/gnome-builder/libide/sourceview/ide-completion-provider.h
+include/gnome-builder/libide/sourceview/ide-completion-results.h
+include/gnome-builder/libide/sourceview/ide-cursor.h
+include/gnome-builder/libide/sourceview/ide-indenter.h
+include/gnome-builder/libide/sourceview/ide-language.h
+include/gnome-builder/libide/sourceview/ide-source-map.h
+include/gnome-builder/libide/sourceview/ide-source-style-scheme.h
+include/gnome-builder/libide/sourceview/ide-source-view-mode.h
+include/gnome-builder/libide/sourceview/ide-source-view.h
+include/gnome-builder/libide/subprocess/ide-subprocess-launcher.h
+include/gnome-builder/libide/subprocess/ide-subprocess-supervisor.h
+include/gnome-builder/libide/subprocess/ide-subprocess.h
+include/gnome-builder/libide/symbols/ide-code-index-entries.h
+include/gnome-builder/libide/symbols/ide-code-index-entry.h
+include/gnome-builder/libide/symbols/ide-code-indexer.h
+include/gnome-builder/libide/symbols/ide-symbol-node.h
+include/gnome-builder/libide/symbols/ide-symbol-resolver.h
+include/gnome-builder/libide/symbols/ide-symbol-tree.h
+include/gnome-builder/libide/symbols/ide-symbol.h
+include/gnome-builder/libide/symbols/ide-tags-builder.h
+include/gnome-builder/libide/template/ide-project-template.h
+include/gnome-builder/libide/template/ide-template-base.h
+include/gnome-builder/libide/template/ide-template-provider.h
+include/gnome-builder/libide/terminal/ide-terminal-search.h
+include/gnome-builder/libide/terminal/ide-terminal-util.h
+include/gnome-builder/libide/terminal/ide-terminal.h
+include/gnome-builder/libide/testing/ide-test-manager.h
+include/gnome-builder/libide/testing/ide-test-provider.h
+include/gnome-builder/libide/testing/ide-test.h
+include/gnome-builder/libide/threading/ide-task.h
+include/gnome-builder/libide/threading/ide-thread-pool.h
+include/gnome-builder/libide/transfers/ide-pkcon-transfer.h
+include/gnome-builder/libide/transfers/ide-transfer-button.h
+include/gnome-builder/libide/transfers/ide-transfer-manager.h
+include/gnome-builder/libide/transfers/ide-transfer-row.h
+include/gnome-builder/libide/transfers/ide-transfer.h
+include/gnome-builder/libide/transfers/ide-transfers-button.h
+include/gnome-builder/libide/transfers/ide-transfers-progress-icon.h
+include/gnome-builder/libide/util/ide-cell-renderer-fancy.h
+include/gnome-builder/libide/util/ide-fancy-tree-view.h
+include/gnome-builder/libide/util/ide-flatpak.h
+include/gnome-builder/libide/util/ide-glib.h
+include/gnome-builder/libide/util/ide-gtk.h
+include/gnome-builder/libide/util/ide-line-reader.h
+include/gnome-builder/libide/util/ide-list-inline.h
+include/gnome-builder/libide/util/ide-posix.h
+include/gnome-builder/libide/util/ide-progress.h
+include/gnome-builder/libide/util/ide-ref-ptr.h
+include/gnome-builder/libide/util/ide-settings.h
+include/gnome-builder/libide/util/ide-uri.h
+include/gnome-builder/libide/vcs/ide-vcs-config.h
+include/gnome-builder/libide/vcs/ide-vcs-file-info.h
+include/gnome-builder/libide/vcs/ide-vcs-initializer.h
+include/gnome-builder/libide/vcs/ide-vcs-monitor.h
+include/gnome-builder/libide/vcs/ide-vcs-uri.h
+include/gnome-builder/libide/vcs/ide-vcs.h
+include/gnome-builder/libide/workbench/ide-omni-bar.h
+include/gnome-builder/libide/workbench/ide-perspective.h
+include/gnome-builder/libide/workbench/ide-workbench-addin.h
+include/gnome-builder/libide/workbench/ide-workbench-header-bar.h
+include/gnome-builder/libide/workbench/ide-workbench-message.h
+include/gnome-builder/libide/workbench/ide-workbench.h
+include/gnome-builder/libide/workers/ide-worker.h
+lib/gnome-builder/girepository-1.0/Gstyle-1.0.typelib
+lib/gnome-builder/girepository-1.0/Ide-1.0.typelib
+lib/gnome-builder/libgnome-builder-plugins.so
+lib/gnome-builder/libgstyle-private.so
+lib/gnome-builder/libgstyle-private.so.0
+lib/gnome-builder/libgstyle-private.so.0.0.0
+lib/gnome-builder/libide-1.0.so
+lib/gnome-builder/pkgconfig/libide-1.0.pc
+lib/gnome-builder/plugins/cargo.plugin
+lib/gnome-builder/plugins/cargo_plugin.py
+lib/gnome-builder/plugins/eslint.plugin
+lib/gnome-builder/plugins/eslint_plugin.py
+lib/gnome-builder/plugins/find-other-file.plugin
+lib/gnome-builder/plugins/find_other_file.py
+lib/gnome-builder/plugins/gjs_symbols.plugin
+lib/gnome-builder/plugins/gjs_symbols.py
+lib/gnome-builder/plugins/go-langserv.plugin
+lib/gnome-builder/plugins/go_langserver_plugin.py
+lib/gnome-builder/plugins/html-preview.plugin
+lib/gnome-builder/plugins/html_preview.gresource
+lib/gnome-builder/plugins/html_preview.py
+lib/gnome-builder/plugins/libvala-pack-plugin.so
+lib/gnome-builder/plugins/make.plugin
+lib/gnome-builder/plugins/make_plugin.gresource
+lib/gnome-builder/plugins/make_plugin.py
+lib/gnome-builder/plugins/meson-templates.plugin
+lib/gnome-builder/plugins/meson_templates.gresource
+lib/gnome-builder/plugins/meson_templates.py
+lib/gnome-builder/plugins/mono.plugin
+lib/gnome-builder/plugins/mono_plugin.py
+lib/gnome-builder/plugins/npm.plugin
+lib/gnome-builder/plugins/npm_plugin.py
+lib/gnome-builder/plugins/phpize.plugin
+lib/gnome-builder/plugins/phpize_plugin.py
+lib/gnome-builder/plugins/python-gi-imports-completion.plugin
+lib/gnome-builder/plugins/python_gi_imports_completion.py
+lib/gnome-builder/plugins/rust-langserv.plugin
+lib/gnome-builder/plugins/rust_langserv_plugin.py
+lib/gnome-builder/plugins/rustup.plugin
+lib/gnome-builder/plugins/rustup_plugin.gresource
+lib/gnome-builder/plugins/rustup_plugin.py
+lib/gnome-builder/plugins/vala-pack.plugin
+lib/gnome-builder/plugins/valgrind.plugin
+lib/gnome-builder/plugins/valgrind_plugin.gresource
+lib/gnome-builder/plugins/valgrind_plugin.py
+%%PYTHON_SITELIBDIR%%/gi/overrides/Ide.py
share/applications/org.gnome.Builder.desktop
share/dbus-1/services/org.gnome.Builder.service
-share/gir-1.0/Ide-1.0.gir
+%%DATADIR%%/fonts/BuilderBlocks.ttf
+%%DATADIR%%/gir-1.0/Gstyle-1.0.gir
+%%DATADIR%%/gir-1.0/Ide-1.0.gir
+%%DATADIR%%/vapi/gstyle-private.deps
+%%DATADIR%%/vapi/gstyle-private.vapi
+%%DATADIR%%/vapi/libide-1.0.deps
+%%DATADIR%%/vapi/libide-1.0.vapi
share/gtksourceview-3.0/styles/builder-dark.xml
share/gtksourceview-3.0/styles/builder.xml
-share/icons/hicolor/16x16/apps/builder.png
-share/icons/hicolor/24x24/apps/builder.png
-share/icons/hicolor/256x256/apps/builder.png
-share/icons/hicolor/32x32/apps/builder.png
-share/icons/hicolor/48x48/apps/builder.png
-share/icons/hicolor/512x512/apps/builder.png
-share/icons/hicolor/scalable/apps/builder-symbolic.svg
+share/icons/hicolor/16x16/actions/builder-build-configure-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-build-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-debugger-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-documentation-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-editor-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-move-left-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-move-right-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-split-tab-left-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-split-tab-right-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-split-tab-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-unit-tests-fail-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-unit-tests-pass-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-unit-tests-running-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-unit-tests-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-vcs-git-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-view-bottom-pane-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-view-left-pane-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/builder-view-right-pane-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/debug-breakpoint-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/debug-continue-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/debug-execute-from-cursor-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/debug-execute-to-cursor-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/debug-step-in-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/debug-step-out-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/debug-step-over-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/gesture-two-finger-swipe-left.symbolic.png
+share/icons/hicolor/16x16/actions/gesture-two-finger-swipe-right.symbolic.png
+share/icons/hicolor/16x16/actions/lang-class-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-define-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-enum-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-enum-value-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-function-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-include-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-method-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-namespace-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-struct-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-typedef-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-union-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/lang-variable-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/struct-field-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-attributes-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-child-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-item-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-menu-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-object-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-packing-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-property-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-section-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-signal-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-style-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-submenu-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/ui-template-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/xml-attribute-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/xml-cdata-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/xml-comment-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/xml-declaration-symbolic.symbolic.png
+share/icons/hicolor/16x16/actions/xml-element-symbolic.symbolic.png
+share/icons/hicolor/16x16/apps/org.gnome.Builder-symbolic.symbolic.png
+share/icons/hicolor/16x16/apps/org.gnome.Builder.png
+share/icons/hicolor/24x24/apps/org.gnome.Builder.png
+share/icons/hicolor/256x256/apps/org.gnome.Builder.png
+share/icons/hicolor/32x32/apps/org.gnome.Builder.png
+share/icons/hicolor/48x48/apps/org.gnome.Builder.png
+share/icons/hicolor/512x512/apps/org.gnome.Builder-symbolic.symbolic.png
+share/icons/hicolor/512x512/apps/org.gnome.Builder.png
share/locale/bs/LC_MESSAGES/gnome-builder.mo
+share/locale/ca/LC_MESSAGES/gnome-builder.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-builder.mo
share/locale/cs/LC_MESSAGES/gnome-builder.mo
+share/locale/da/LC_MESSAGES/gnome-builder.mo
share/locale/de/LC_MESSAGES/gnome-builder.mo
+share/locale/el/LC_MESSAGES/gnome-builder.mo
+share/locale/en_GB/LC_MESSAGES/gnome-builder.mo
+share/locale/eo/LC_MESSAGES/gnome-builder.mo
share/locale/es/LC_MESSAGES/gnome-builder.mo
+share/locale/fi/LC_MESSAGES/gnome-builder.mo
share/locale/fr/LC_MESSAGES/gnome-builder.mo
+share/locale/fur/LC_MESSAGES/gnome-builder.mo
share/locale/gl/LC_MESSAGES/gnome-builder.mo
share/locale/he/LC_MESSAGES/gnome-builder.mo
+share/locale/hu/LC_MESSAGES/gnome-builder.mo
share/locale/id/LC_MESSAGES/gnome-builder.mo
+share/locale/it/LC_MESSAGES/gnome-builder.mo
+share/locale/ja/LC_MESSAGES/gnome-builder.mo
+share/locale/kk/LC_MESSAGES/gnome-builder.mo
share/locale/ko/LC_MESSAGES/gnome-builder.mo
+share/locale/lt/LC_MESSAGES/gnome-builder.mo
+share/locale/lv/LC_MESSAGES/gnome-builder.mo
+share/locale/ml/LC_MESSAGES/gnome-builder.mo
+share/locale/nb/LC_MESSAGES/gnome-builder.mo
+share/locale/ne/LC_MESSAGES/gnome-builder.mo
+share/locale/nl/LC_MESSAGES/gnome-builder.mo
+share/locale/oc/LC_MESSAGES/gnome-builder.mo
share/locale/pl/LC_MESSAGES/gnome-builder.mo
+share/locale/pt/LC_MESSAGES/gnome-builder.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-builder.mo
+share/locale/ro/LC_MESSAGES/gnome-builder.mo
+share/locale/ru/LC_MESSAGES/gnome-builder.mo
+share/locale/sk/LC_MESSAGES/gnome-builder.mo
share/locale/sl/LC_MESSAGES/gnome-builder.mo
share/locale/sr/LC_MESSAGES/gnome-builder.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-builder.mo
+share/locale/sv/LC_MESSAGES/gnome-builder.mo
share/locale/tr/LC_MESSAGES/gnome-builder.mo
share/locale/uk/LC_MESSAGES/gnome-builder.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-builder.mo
share/locale/zh_TW/LC_MESSAGES/gnome-builder.mo
-@postexec /usr/local/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || /usr/bin/true
-@postunexec /usr/local/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || /usr/bin/true
+share/metainfo/org.gnome.Builder.appdata.xml
+@dir share/icons/hicolor/symbolic
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 70404cdf6bc8..f28e5edeaab5 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -2,18 +2,19 @@
# $FreeBSD$
PORTNAME= gobject-introspection
-PORTVERSION= 1.50.0
-PORTREVISION= 1
+PORTVERSION= 1.56.1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Generate interface introspection data for GObject libraries
LICENSE= GPLv2+ LGPL20+
-LICENSE_COMB= dual
+LICENSE_COMB= multi
+LICENSE_FILE_LGPL2+= ${WRKSRC}/COPYING.LGPL
+LICENSE_FILE_GPLv2+= ${WRKSRC}/COPYING.GPL
# we need cairo otherwise the generated Cairo gir is broken
BUILD_DEPENDS= cairo-trace:graphics/cairo
@@ -22,7 +23,7 @@ LIB_DEPENDS= libffi.so:devel/libffi
PORTSCOUT= limitw:1,even
USES= bison gettext gmake gnome libtool localbase pathfix \
- pkgconfig python:2.7 tar:xz
+ pkgconfig python:3.4+ tar:xz
GNU_CONFIGURE= yes
USE_GNOME= glib20
USE_LDCONFIG= yes
@@ -32,8 +33,4 @@ INSTALL_TARGET= install-strip
# Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260
MAKE_ENV= HOME=${WRKDIR}
-post-patch:
- @${REINPLACE_CMD} -e 's|'gcc'|'cc'|g' \
- ${WRKSRC}/giscanner/dumper.py
-
.include <bsd.port.mk>
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index 8774b86d809f..1c74755dca5a 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491127543
-SHA256 (gnome3/gobject-introspection-1.50.0.tar.xz) = 1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5
-SIZE (gnome3/gobject-introspection-1.50.0.tar.xz) = 1415700
+TIMESTAMP = 1525378740
+SHA256 (gnome/gobject-introspection-1.56.1.tar.xz) = 5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b
+SIZE (gnome/gobject-introspection-1.56.1.tar.xz) = 1397812
diff --git a/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l b/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l
deleted file mode 100644
index 178293f90c0d..000000000000
--- a/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l
+++ /dev/null
@@ -1,11 +0,0 @@
---- giscanner/scannerlexer.l.orig 2017-04-17 10:01:31 UTC
-+++ giscanner/scannerlexer.l
-@@ -164,6 +164,8 @@ stringtext ([^\\\"])|(\\.)
- "__inline__" { return INLINE; }
- "__inline" { return INLINE; }
- "__nonnull" { if (!parse_ignored_macro()) REJECT; }
-+"_Nonnull" { /* Ignore */ }
-+"_Nullable" { /* Ignore */ }
- "_Noreturn" { /* Ignore */ }
- "__signed" { return SIGNED; }
- "__signed__" { return SIGNED; }
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index 8337d1c7ca55..e3487dfb9d61 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -42,40 +42,76 @@ lib/girepository-1.0/xft-2.0.typelib
lib/girepository-1.0/xlib-2.0.typelib
lib/girepository-1.0/xrandr-1.3.typelib
lib/gobject-introspection/giscanner/__init__.py
-lib/gobject-introspection/giscanner/__init__.pyc
-lib/gobject-introspection/giscanner/__init__.pyo
+lib/gobject-introspection/giscanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/annotationmain.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/annotationmain.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/annotationparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/annotationparser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/ast.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/ast.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/cachestore.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/cachestore.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/ccompiler.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/ccompiler.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/codegen.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/codegen.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/docmain.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/docmain.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/docwriter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/docwriter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/dumper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/dumper.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/gdumpparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/gdumpparser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/girparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/girparser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/girwriter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/girwriter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/introspectablepass.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/introspectablepass.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/libtoolimporter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/libtoolimporter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/maintransformer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/maintransformer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/msvccompiler.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/msvccompiler.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/scannermain.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/scannermain.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/sectionparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/sectionparser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/shlibs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/shlibs.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/sourcescanner.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/sourcescanner.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/testcodegen.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/testcodegen.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/transformer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/transformer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gobject-introspection/giscanner/_giscanner.a
lib/gobject-introspection/giscanner/_giscanner.so
lib/gobject-introspection/giscanner/annotationmain.py
-lib/gobject-introspection/giscanner/annotationmain.pyc
-lib/gobject-introspection/giscanner/annotationmain.pyo
lib/gobject-introspection/giscanner/annotationparser.py
-lib/gobject-introspection/giscanner/annotationparser.pyc
-lib/gobject-introspection/giscanner/annotationparser.pyo
lib/gobject-introspection/giscanner/ast.py
-lib/gobject-introspection/giscanner/ast.pyc
-lib/gobject-introspection/giscanner/ast.pyo
lib/gobject-introspection/giscanner/cachestore.py
-lib/gobject-introspection/giscanner/cachestore.pyc
-lib/gobject-introspection/giscanner/cachestore.pyo
lib/gobject-introspection/giscanner/ccompiler.py
-lib/gobject-introspection/giscanner/ccompiler.pyc
-lib/gobject-introspection/giscanner/ccompiler.pyo
lib/gobject-introspection/giscanner/codegen.py
-lib/gobject-introspection/giscanner/codegen.pyc
-lib/gobject-introspection/giscanner/codegen.pyo
lib/gobject-introspection/giscanner/collections/__init__.py
-lib/gobject-introspection/giscanner/collections/__init__.pyc
-lib/gobject-introspection/giscanner/collections/__init__.pyo
+lib/gobject-introspection/giscanner/collections/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/collections/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/collections/__pycache__/counter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/collections/__pycache__/counter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gobject-introspection/giscanner/collections/__pycache__/ordereddict.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gobject-introspection/giscanner/collections/__pycache__/ordereddict.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gobject-introspection/giscanner/collections/counter.py
-lib/gobject-introspection/giscanner/collections/counter.pyc
-lib/gobject-introspection/giscanner/collections/counter.pyo
lib/gobject-introspection/giscanner/collections/ordereddict.py
-lib/gobject-introspection/giscanner/collections/ordereddict.pyc
-lib/gobject-introspection/giscanner/collections/ordereddict.pyo
lib/gobject-introspection/giscanner/docmain.py
-lib/gobject-introspection/giscanner/docmain.pyc
-lib/gobject-introspection/giscanner/docmain.pyo
lib/gobject-introspection/giscanner/doctemplates/C/callback.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl
lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl
@@ -122,59 +158,23 @@ lib/gobject-introspection/giscanner/doctemplates/base.tmpl
lib/gobject-introspection/giscanner/doctemplates/class.tmpl
lib/gobject-introspection/giscanner/doctemplates/namespace.tmpl
lib/gobject-introspection/giscanner/docwriter.py
-lib/gobject-introspection/giscanner/docwriter.pyc
-lib/gobject-introspection/giscanner/docwriter.pyo
lib/gobject-introspection/giscanner/dumper.py
-lib/gobject-introspection/giscanner/dumper.pyc
-lib/gobject-introspection/giscanner/dumper.pyo
lib/gobject-introspection/giscanner/gdumpparser.py
-lib/gobject-introspection/giscanner/gdumpparser.pyc
-lib/gobject-introspection/giscanner/gdumpparser.pyo
lib/gobject-introspection/giscanner/girparser.py
-lib/gobject-introspection/giscanner/girparser.pyc
-lib/gobject-introspection/giscanner/girparser.pyo
lib/gobject-introspection/giscanner/girwriter.py
-lib/gobject-introspection/giscanner/girwriter.pyc
-lib/gobject-introspection/giscanner/girwriter.pyo
lib/gobject-introspection/giscanner/introspectablepass.py
-lib/gobject-introspection/giscanner/introspectablepass.pyc
-lib/gobject-introspection/giscanner/introspectablepass.pyo
lib/gobject-introspection/giscanner/libtoolimporter.py
-lib/gobject-introspection/giscanner/libtoolimporter.pyc
-lib/gobject-introspection/giscanner/libtoolimporter.pyo
lib/gobject-introspection/giscanner/maintransformer.py
-lib/gobject-introspection/giscanner/maintransformer.pyc
-lib/gobject-introspection/giscanner/maintransformer.pyo
lib/gobject-introspection/giscanner/message.py
-lib/gobject-introspection/giscanner/message.pyc
-lib/gobject-introspection/giscanner/message.pyo
lib/gobject-introspection/giscanner/msvccompiler.py
-lib/gobject-introspection/giscanner/msvccompiler.pyc
-lib/gobject-introspection/giscanner/msvccompiler.pyo
lib/gobject-introspection/giscanner/scannermain.py
-lib/gobject-introspection/giscanner/scannermain.pyc
-lib/gobject-introspection/giscanner/scannermain.pyo
lib/gobject-introspection/giscanner/sectionparser.py
-lib/gobject-introspection/giscanner/sectionparser.pyc
-lib/gobject-introspection/giscanner/sectionparser.pyo
lib/gobject-introspection/giscanner/shlibs.py
-lib/gobject-introspection/giscanner/shlibs.pyc
-lib/gobject-introspection/giscanner/shlibs.pyo
lib/gobject-introspection/giscanner/sourcescanner.py
-lib/gobject-introspection/giscanner/sourcescanner.pyc
-lib/gobject-introspection/giscanner/sourcescanner.pyo
lib/gobject-introspection/giscanner/testcodegen.py
-lib/gobject-introspection/giscanner/testcodegen.pyc
-lib/gobject-introspection/giscanner/testcodegen.pyo
lib/gobject-introspection/giscanner/transformer.py
-lib/gobject-introspection/giscanner/transformer.pyc
-lib/gobject-introspection/giscanner/transformer.pyo
lib/gobject-introspection/giscanner/utils.py
-lib/gobject-introspection/giscanner/utils.pyc
-lib/gobject-introspection/giscanner/utils.pyo
lib/gobject-introspection/giscanner/xmlwriter.py
-lib/gobject-introspection/giscanner/xmlwriter.pyc
-lib/gobject-introspection/giscanner/xmlwriter.pyo
lib/libgirepository-1.0.a
lib/libgirepository-1.0.so
lib/libgirepository-1.0.so.1
@@ -196,6 +196,7 @@ share/gir-1.0/Gio-2.0.gir
share/gir-1.0/cairo-1.0.gir
share/gir-1.0/fontconfig-2.0.gir
share/gir-1.0/freetype2-2.0.gir
+share/gir-1.0/gir-1.2.rnc
share/gir-1.0/libxml2-2.0.gir
share/gir-1.0/win32-1.0.gir
share/gir-1.0/xfixes-4.0.gir
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index 1236b9ff9628..78512fb71655 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gsettings-desktop-schemas
-PORTVERSION= 3.18.1
+PORTVERSION= 3.28.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,17 +11,14 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Collection of globally shared GSetting schemas
LICENSE= LGPL21
-
-RUN_DEPENDS= ${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:x11-fonts/cantarell-fonts
+LICENSE_FILE= ${WRKSRC}/COPYING
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome pathfix perl5 pkgconfig tar:xz
+USES= gettext gmake gnome localbase pathfix perl5 pkgconfig tar:xz
USE_PERL5= build
USE_GNOME= intltool glib20 introspection:build
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \
org.gnome.desktop.a11y.gschema.xml \
@@ -30,6 +27,7 @@ GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \
org.gnome.desktop.a11y.mouse.gschema.xml \
org.gnome.desktop.app-folders.gschema.xml \
org.gnome.desktop.background.gschema.xml \
+ org.gnome.desktop.calendar.gschema.xml \
org.gnome.desktop.default-applications.gschema.xml \
org.gnome.desktop.datetime.gschema.xml \
org.gnome.desktop.enums.xml \
diff --git a/devel/gsettings-desktop-schemas/distinfo b/devel/gsettings-desktop-schemas/distinfo
index 6889cd98b960..d6636ab9950f 100644
--- a/devel/gsettings-desktop-schemas/distinfo
+++ b/devel/gsettings-desktop-schemas/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gsettings-desktop-schemas-3.18.1.tar.xz) = 258713b2a3dc6b6590971bcfc81f98d78ea9827d60e2f55ffbe40d9cd0f99a1a
-SIZE (gnome3/gsettings-desktop-schemas-3.18.1.tar.xz) = 573792
+TIMESTAMP = 1524854589
+SHA256 (gnome3/gsettings-desktop-schemas-3.28.0.tar.xz) = 4cb4cd7790b77e5542ec75275237613ad22f3a1f2f41903a298cf6cc996a9167
+SIZE (gnome3/gsettings-desktop-schemas-3.28.0.tar.xz) = 648296
diff --git a/devel/gsettings-desktop-schemas/pkg-plist b/devel/gsettings-desktop-schemas/pkg-plist
index e770fadc2947..92a4172e89af 100644
--- a/devel/gsettings-desktop-schemas/pkg-plist
+++ b/devel/gsettings-desktop-schemas/pkg-plist
@@ -19,12 +19,15 @@ share/locale/es/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/eu/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/fi/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/fr/LC_MESSAGES/gsettings-desktop-schemas.mo
+share/locale/fur/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/gl/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/gu/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/he/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/hi/LC_MESSAGES/gsettings-desktop-schemas.mo
+share/locale/hr/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/hu/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/id/LC_MESSAGES/gsettings-desktop-schemas.mo
+share/locale/is/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/it/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/ja/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/kk/LC_MESSAGES/gsettings-desktop-schemas.mo
@@ -32,20 +35,23 @@ share/locale/lt/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/lv/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/ml/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/nb/LC_MESSAGES/gsettings-desktop-schemas.mo
+share/locale/ne/LC_MESSAGES/gsettings-desktop-schemas.mo
+share/locale/nl/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/oc/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/or/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/pa/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/pl/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/pt/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/pt_BR/LC_MESSAGES/gsettings-desktop-schemas.mo
+share/locale/ro/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/ru/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/sk/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/sl/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/sr/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/sr@latin/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/sv/LC_MESSAGES/gsettings-desktop-schemas.mo
-share/locale/tr/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/tg/LC_MESSAGES/gsettings-desktop-schemas.mo
+share/locale/tr/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/ug/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/uk/LC_MESSAGES/gsettings-desktop-schemas.mo
share/locale/vi/LC_MESSAGES/gsettings-desktop-schemas.mo
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index f18c7669f2e4..cd72a7b68d14 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gtranslator
PORTVERSION= 2.91.7
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
@@ -32,6 +33,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-debug \
--with-gda=5.0 \
+ --without-dictionary \
--enable-compile-warnings=no
INSTALL_TARGET= install-strip
@@ -40,22 +42,4 @@ GLIB_SCHEMAS= org.gnome.gtranslator.gschema.xml \
org.gnome.gtranslator.plugins.open-tran.gschema.xml \
org.gnome.gtranslator.plugins.translation-memory.gschema.xml
-OPTIONS_DEFINE= DICT
-OPTIONS_DEFAULT=DICT
-DICT_DESC= Build dictionary plugin
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDICT}
-BUILD_DEPENDS+= gnome-dictionary>=3.4.0:deskutils/gnome-dictionary
-LIB_DEPENDS+= libgdict-1.0.so:deskutils/gnome-dictionary
-RUN_DEPENDS+= gnome-dictionary>=3.4.0:deskutils/gnome-dictionary
-GLIB_SCHEMAS+= org.gnome.gtranslator.plugins.dictionary.gschema.xml
-CONFIGURE_ARGS+=--with-dictionary
-PLIST_SUB+= DICT=""
-.else
-CONFIGURE_ARGS+=--without-dictionary
-PLIST_SUB+= DICT="@comment "
-.endif
-
.include <bsd.port.mk>
diff --git a/devel/gtranslator/pkg-plist b/devel/gtranslator/pkg-plist
index 82605493ff92..2747c479a46f 100644
--- a/devel/gtranslator/pkg-plist
+++ b/devel/gtranslator/pkg-plist
@@ -27,15 +27,12 @@ lib/gtranslator/plugins/charmap/panel.pyo
lib/gtranslator/plugins/gtr-alternate-language.plugin
lib/gtranslator/plugins/gtr-charmap.plugin
lib/gtranslator/plugins/gtr-codeview.plugin
-%%DICT%%lib/gtranslator/plugins/gtr-dict.plugin
lib/gtranslator/plugins/gtr-fullscreen.plugin
lib/gtranslator/plugins/gtr-insert-params.plugin
lib/gtranslator/plugins/gtr-open-tran.plugin
lib/gtranslator/plugins/gtr-translation-memory.plugin
lib/gtranslator/plugins/libalternatelang.a
lib/gtranslator/plugins/libalternatelang.so
-%%DICT%%lib/gtranslator/plugins/libdict.a
-%%DICT%%lib/gtranslator/plugins/libdict.so
lib/gtranslator/plugins/libfullscreen.a
lib/gtranslator/plugins/libfullscreen.so
lib/gtranslator/plugins/libinsertparams.a
@@ -86,7 +83,6 @@ share/applications/gtranslator.desktop
%%DATADIR%%/gir-1.0/Gtranslator-3.0.gir
%%DATADIR%%/pixmaps/debian.png
%%DATADIR%%/pixmaps/fedora.png
-%%DATADIR%%/pixmaps/gnome-dictionary.png
%%DATADIR%%/pixmaps/gnome.png
%%DATADIR%%/pixmaps/gtranslator-fuzzy-next.png
%%DATADIR%%/pixmaps/gtranslator-fuzzy-prev.png
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 062bf12442ba..d49783ab2b7b 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -2,32 +2,35 @@
# $FreeBSD$
PORTNAME= gvfs
-PORTVERSION= 1.26.3
-PORTREVISION= 10
+PORTVERSION= 1.30.4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME virtual file system
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libsoup-gnome-2.4.so:devel/libsoup-gnome \
+ libsoup-2.4.so:devel/libsoup \
libgcrypt.so:security/libgcrypt \
libgcr-base-3.so:security/gcr \
- libsecret-1.so:security/libsecret
-
+ libsecret-1.so:security/libsecret \
+ libp11-kit.so:security/p11-kit \
+ libgpg-error.so:security/libgpg-error \
+ libcdio.so:sysutils/libcdio \
+ libjson-glib-1.0.so:devel/json-glib
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libarchive libtool pathfix pkgconfig tar:xz
+USES= gettext gmake gnome libarchive libtool localbase \
+ pathfix pkgconfig tar:xz
USE_GNOME= glib20 intlhack libxslt:build
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --disable-bluray
-
-CONFIGURE_ARGS+=\
+CONFIGURE_ARGS= --disable-bluray \
--disable-gudev \
--disable-libsystemd-login \
--disable-udisks2 \
@@ -35,7 +38,9 @@ CONFIGURE_ARGS+=\
--disable-udev \
--disable-goa \
--disable-libmtp \
- --disable-gtk
+ --disable-gtk \
+ --disable-libsystemd-login \
+ --disable-admin
INSTALL_TARGET= install-strip
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 0f0dc0da8099..1cb5d0655c7a 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gvfs-1.26.3.tar.xz) = a70f75fa60d66f3f478c0c8aec43d0e43455a8cc75a4dfa8029e51c816401b4a
-SIZE (gnome3/gvfs-1.26.3.tar.xz) = 1682264
+TIMESTAMP = 1526113308
+SHA256 (gnome/gvfs-1.30.4.tar.xz) = 981e0aca7f4e2e99860137f9fd99c335fa72a764156d253caf1069380a8e3afa
+SIZE (gnome/gvfs-1.30.4.tar.xz) = 1895304
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index b31c4192c149..d7dfe16c40b0 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -79,6 +79,7 @@ share/bash-completion/completions/gvfs-ls
share/bash-completion/completions/gvfs-mkdir
share/bash-completion/completions/gvfs-monitor-dir
share/bash-completion/completions/gvfs-monitor-file
+share/bash-completion/completions/gvfs-mount
share/bash-completion/completions/gvfs-move
share/bash-completion/completions/gvfs-open
share/bash-completion/completions/gvfs-rename
@@ -89,6 +90,8 @@ share/bash-completion/completions/gvfs-trash
share/bash-completion/completions/gvfs-tree
share/dbus-1/services/org.gtk.vfs.Daemon.service
share/dbus-1/services/org.gtk.vfs.Metadata.service
+share/polkit-1/actions/org.gtk.vfs.file-operations.policy
+share/polkit-1/rules.d/org.gtk.vfs.file-operations.rules
%%AFC%%share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service
%%GPHOTO2%%share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service
%%HAL%%share/dbus-1/services/org.gtk.vfs.HalVolumeMonitor.service
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index da03803008a1..f84b7343829c 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= json-glib
-PORTVERSION= 1.2.8
+PORTVERSION= 1.4.2
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -10,22 +10,24 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= JSON (RFC 4627) interface for Glib
LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USES= gettext localbase meson pkgconfig tar:xz
+USE_GNOME= glib20
+USE_LDCONFIG= yes
+
+PORTDOCS= *
OPTIONS_DEFINE= GIR DOCS
OPTIONS_DEFAULT=GIR
OPTIONS_SUB= yes
+
GIR_DESC= Build introspection data
GIR_USE= gnome=introspection
-GIR_CONFIGURE_ENABLE=introspection
-
-USES= gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= glib20 gnomeprefix
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-INSTALL_TARGET= install-strip
+GIR_MESON_TRUE= introspection
-PORTDOCS= *
+post-install:
+ @${RM} -r ${STAGEDIR}${PREFIX}/libexec/installed-tests
+ @${RM} -r ${STAGEDIR}${PREFIX}/share/installed-tests
.include <bsd.port.mk>
diff --git a/devel/json-glib/distinfo b/devel/json-glib/distinfo
index c40049e51324..2de7a8e90f25 100644
--- a/devel/json-glib/distinfo
+++ b/devel/json-glib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491082169
-SHA256 (json-glib-1.2.8.tar.xz) = fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a
-SIZE (json-glib-1.2.8.tar.xz) = 604336
+TIMESTAMP = 1506973453
+SHA256 (json-glib-1.4.2.tar.xz) = 2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8
+SIZE (json-glib-1.4.2.tar.xz) = 163576
diff --git a/devel/json-glib/pkg-plist b/devel/json-glib/pkg-plist
index 0790fb3a03c5..7eb2fb7d2bdc 100644
--- a/devel/json-glib/pkg-plist
+++ b/devel/json-glib/pkg-plist
@@ -17,7 +17,7 @@ include/json-glib-1.0/json-glib/json-version.h
%%GIR%%share/gir-1.0/Json-1.0.gir
lib/libjson-glib-1.0.so
lib/libjson-glib-1.0.so.0
-lib/libjson-glib-1.0.so.0.200.8
+lib/libjson-glib-1.0.so.0.400.2
libdata/pkgconfig/json-glib-1.0.pc
share/locale/as/LC_MESSAGES/json-glib-1.0.mo
share/locale/bg/LC_MESSAGES/json-glib-1.0.mo
@@ -49,6 +49,7 @@ share/locale/lt/LC_MESSAGES/json-glib-1.0.mo
share/locale/lv/LC_MESSAGES/json-glib-1.0.mo
share/locale/ml/LC_MESSAGES/json-glib-1.0.mo
share/locale/nb/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ne/LC_MESSAGES/json-glib-1.0.mo
share/locale/oc/LC_MESSAGES/json-glib-1.0.mo
share/locale/or/LC_MESSAGES/json-glib-1.0.mo
share/locale/pa/LC_MESSAGES/json-glib-1.0.mo
diff --git a/devel/jsonrpc-glib/Makefile b/devel/jsonrpc-glib/Makefile
new file mode 100644
index 000000000000..5caf1bd1413d
--- /dev/null
+++ b/devel/jsonrpc-glib/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME= jsonrpc-glib
+PORTVERSION= 3.28.1
+CATEGORIES= devel
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Staging and stabilizing for facy Glib and Gtk+ features
+
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= valac:lang/vala
+LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib
+
+USES= gnome meson pkgconfig tar:xz
+USE_GNOME= glib20 introspection:build
+
+.include <bsd.port.mk>
diff --git a/devel/jsonrpc-glib/distinfo b/devel/jsonrpc-glib/distinfo
new file mode 100644
index 000000000000..8cb13c6d71c5
--- /dev/null
+++ b/devel/jsonrpc-glib/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1529614407
+SHA256 (jsonrpc-glib-3.28.1.tar.xz) = cf2ac25944c3990904d63999deea3add38d99ea2fad16f335a996fd9a8706e2b
+SIZE (jsonrpc-glib-3.28.1.tar.xz) = 40328
diff --git a/devel/jsonrpc-glib/pkg-descr b/devel/jsonrpc-glib/pkg-descr
new file mode 100644
index 000000000000..7157ba386428
--- /dev/null
+++ b/devel/jsonrpc-glib/pkg-descr
@@ -0,0 +1,2 @@
+
+WWW:
diff --git a/devel/jsonrpc-glib/pkg-plist b/devel/jsonrpc-glib/pkg-plist
new file mode 100644
index 000000000000..463adf009ca7
--- /dev/null
+++ b/devel/jsonrpc-glib/pkg-plist
@@ -0,0 +1,17 @@
+include/jsonrpc-glib-1.0/jsonrpc-client.h
+include/jsonrpc-glib-1.0/jsonrpc-glib.h
+include/jsonrpc-glib-1.0/jsonrpc-input-stream-private.h
+include/jsonrpc-glib-1.0/jsonrpc-input-stream.h
+include/jsonrpc-glib-1.0/jsonrpc-message.h
+include/jsonrpc-glib-1.0/jsonrpc-output-stream.h
+include/jsonrpc-glib-1.0/jsonrpc-server.h
+include/jsonrpc-glib-1.0/jsonrpc-version-macros.h
+include/jsonrpc-glib-1.0/jsonrpc-version.h
+lib/girepository-1.0/Jsonrpc-1.0.typelib
+lib/libjsonrpc-glib-1.0.so
+lib/libjsonrpc-glib-1.0.so.1
+lib/libjsonrpc-glib-1.0.so.1.2800.1
+libdata/pkgconfig/jsonrpc-glib-1.0.pc
+share/gir-1.0/Jsonrpc-1.0.gir
+share/vala/vapi/jsonrpc-glib-1.0.deps
+share/vala/vapi/jsonrpc-glib-1.0.vapi
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index e874b0085def..0d9f0c19e232 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libgdata
-PORTVERSION= 0.17.8
+PORTVERSION= 0.17.9
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -12,7 +12,8 @@ COMMENT= GLib based implimentation of the GData protocol
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= uhttpmock>0:net/uhttpmock
+BUILD_DEPENDS= uhttpmock>0:net/uhttpmock \
+ valac:lang/vala
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libjson-glib-1.0.so:devel/json-glib \
libp11-kit.so:security/p11-kit \
diff --git a/devel/libgdata/distinfo b/devel/libgdata/distinfo
index 84eba8a01c2d..d3529e9c5bd5 100644
--- a/devel/libgdata/distinfo
+++ b/devel/libgdata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495263502
-SHA256 (libgdata-0.17.8.tar.xz) = e5e735bfac219c6cbe4a14df481cb3cb4b1c4b8b5e70f9a105a884035bc3a161
-SIZE (libgdata-0.17.8.tar.xz) = 1464812
+TIMESTAMP = 1506774542
+SHA256 (libgdata-0.17.9.tar.xz) = 85c4f7674c0098ffaf060ae01b6b832cb277b3673d54ace3bdedaad6b127453a
+SIZE (libgdata-0.17.9.tar.xz) = 1434700
diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist
index 2a2afd65e132..fc88d3178a4e 100644
--- a/devel/libgdata/pkg-plist
+++ b/devel/libgdata/pkg-plist
@@ -66,6 +66,7 @@ include/libgdata/gdata/services/documents/gdata-documents-entry.h
include/libgdata/gdata/services/documents/gdata-documents-enums.h
include/libgdata/gdata/services/documents/gdata-documents-feed.h
include/libgdata/gdata/services/documents/gdata-documents-folder.h
+include/libgdata/gdata/services/documents/gdata-documents-metadata.h
include/libgdata/gdata/services/documents/gdata-documents-pdf.h
include/libgdata/gdata/services/documents/gdata-documents-presentation.h
include/libgdata/gdata/services/documents/gdata-documents-query.h
@@ -107,7 +108,7 @@ lib/girepository-1.0/GData-0.0.typelib
lib/libgdata.a
lib/libgdata.so
lib/libgdata.so.22
-lib/libgdata.so.22.2.1
+lib/libgdata.so.22.3.0
libdata/pkgconfig/libgdata.pc
share/doc/gdata/GDataAPPCategories.html
share/doc/gdata/GDataAccessHandler.html
@@ -138,6 +139,7 @@ share/doc/gdata/GDataDocumentsDrawing.html
share/doc/gdata/GDataDocumentsEntry.html
share/doc/gdata/GDataDocumentsFeed.html
share/doc/gdata/GDataDocumentsFolder.html
+share/doc/gdata/GDataDocumentsMetadata.html
share/doc/gdata/GDataDocumentsPdf.html
share/doc/gdata/GDataDocumentsPresentation.html
share/doc/gdata/GDataDocumentsQuery.html
@@ -234,30 +236,6 @@ share/doc/gdata/gdata-running.html
share/doc/gdata/gdata.devhelp2
share/doc/gdata/home.png
share/doc/gdata/index.html
-share/doc/gdata/ix01.html
-share/doc/gdata/ix02.html
-share/doc/gdata/ix03.html
-share/doc/gdata/ix04.html
-share/doc/gdata/ix05.html
-share/doc/gdata/ix06.html
-share/doc/gdata/ix07.html
-share/doc/gdata/ix08.html
-share/doc/gdata/ix09.html
-share/doc/gdata/ix10.html
-share/doc/gdata/ix11.html
-share/doc/gdata/ix12.html
-share/doc/gdata/ix13.html
-share/doc/gdata/ix14.html
-share/doc/gdata/ix15.html
-share/doc/gdata/ix16.html
-share/doc/gdata/ix17.html
-share/doc/gdata/ix18.html
-share/doc/gdata/ix19.html
-share/doc/gdata/ix20.html
-share/doc/gdata/ix21.html
-share/doc/gdata/ix22.html
-share/doc/gdata/ix23.html
-share/doc/gdata/ix24.html
share/doc/gdata/left-insensitive.png
share/doc/gdata/left.png
share/doc/gdata/pt01.html
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index 97ae8c19ef60..1e41fe45504a 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libgee
-PORTVERSION= 0.18.1
+PORTVERSION= 0.20.1
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/libgee/distinfo b/devel/libgee/distinfo
index bc929ceb9b10..a49b83afe245 100644
--- a/devel/libgee/distinfo
+++ b/devel/libgee/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479643330
-SHA256 (libgee-0.18.1.tar.xz) = 99686bbe5a9c89ba9502c25f61314ee8efa0dd2a1159c9a639afc1458c2839a2
-SIZE (libgee-0.18.1.tar.xz) = 677908
+TIMESTAMP = 1525759866
+SHA256 (libgee-0.20.1.tar.xz) = bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630
+SIZE (libgee-0.20.1.tar.xz) = 681464
diff --git a/devel/libgee/pkg-plist b/devel/libgee/pkg-plist
index 7d2fbc42be40..6b0de67578e3 100644
--- a/devel/libgee/pkg-plist
+++ b/devel/libgee/pkg-plist
@@ -2,7 +2,7 @@ include/gee-0.8/gee.h
lib/girepository-1.0/Gee-0.8.typelib
lib/libgee-0.8.so
lib/libgee-0.8.so.2
-lib/libgee-0.8.so.2.5.1
+lib/libgee-0.8.so.2.6.1
libdata/pkgconfig/gee-0.8.pc
share/gir-1.0/Gee-0.8.gir
share/vala/vapi/gee-0.8.vapi
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 056258f8bcae..f0c8916520f6 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libgtop
-PORTVERSION= 2.32.0
+PORTVERSION= 2.38.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -10,7 +10,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME top library
-BROKEN_aarch64= Fails to link: missing sbrk
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_PERL5= build
USE_XORG= xau
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 954f99efeb8f..11c09d538669 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome2/libgtop-2.32.0.tar.xz) = 8443246332f22b33e389f565825b58cd9623fb7625bf874d404354b705ad178e
-SIZE (gnome2/libgtop-2.32.0.tar.xz) = 665224
+TIMESTAMP = 1505473610
+SHA256 (gnome2/libgtop-2.38.0.tar.xz) = 4f6c0e62bb438abfd16b4559cd2eca0251de19e291c888cdc4dc88e5ffebb612
+SIZE (gnome2/libgtop-2.38.0.tar.xz) = 729700
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_netload.c b/devel/libgtop/files/patch-sysdeps_freebsd_netload.c
deleted file mode 100644
index 455774b37ebc..000000000000
--- a/devel/libgtop/files/patch-sysdeps_freebsd_netload.c
+++ /dev/null
@@ -1,332 +0,0 @@
---- sysdeps/freebsd/netload.c.orig 2015-08-17 20:59:37.000000000 +0200
-+++ sysdeps/freebsd/netload.c 2015-08-28 09:50:02.522090000 +0200
-@@ -1,7 +1,9 @@
- /* Copyright (C) 1998-99 Martin Baulig
-+ Copyright (C) 2014 Gleb Smirnoff
- This file is part of LibGTop 1.0.
-
- Contributed by Martin Baulig <martin@home-of-linux.org>, October 1998.
-+ Contributed by Gleb Smirnoff <glebius@FreeBSD.org>, September 2014
-
- LibGTop is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
-@@ -26,22 +28,12 @@
-
- #include <glibtop_suid.h>
-
--#include <string.h>
--
--#include <sys/types.h>
--#include <sys/socket.h>
- #include <sys/ioctl.h>
--
-+#include <sys/sockio.h>
-+#include <netinet/in.h>
- #include <net/if.h>
- #include <net/if_dl.h>
--#include <net/if_types.h>
--
--#ifdef HAVE_NET_IF_VAR_H
--#include <net/if_var.h>
--#endif
--
--#include <netinet/in.h>
--#include <netinet/in_var.h>
-+#include <ifaddrs.h>
-
- static const unsigned long _glibtop_sysdeps_netload =
- (1L << GLIBTOP_NETLOAD_IF_FLAGS) +
-@@ -64,24 +56,11 @@ static const unsigned long _glibtop_sysd
- (1L << GLIBTOP_NETLOAD_ADDRESS6) +
- (1L << GLIBTOP_NETLOAD_SCOPE6);
-
--/* nlist structure for kernel access */
--static struct nlist nlst [] =
-- {
-- { "_ifnet"
-- },
-- { 0 }
-- };
--
- /* Init function. */
-
- void
- _glibtop_init_netload_p (glibtop *server)
- {
-- if (kvm_nlist (server->machine->kd, nlst) < 0) {
-- glibtop_warn_io_r (server, "kvm_nlist");
-- return;
-- }
--
- server->sysdeps.netload = _glibtop_sysdeps_netload;
- }
-
-@@ -91,154 +70,125 @@ void
- glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
- const char *interface)
- {
-- struct ifnet ifnet;
-- u_long ifnetaddr;
-- struct sockaddr *sa = NULL;
--
-- union {
-- struct ifaddr ifa;
-- struct in_ifaddr in;
-- } ifaddr;
-+ struct ifaddrs *ifap, *ifa;
-
- memset (buf, 0, sizeof (glibtop_netload));
-
-- if (server->sysdeps.netload == 0) return;
-+ if (server->sysdeps.netload == 0)
-+ return;
-+
-+ if (getifaddrs(&ifap) != 0) {
-+ glibtop_warn_io_r (server, "getifaddrs");
-+ return;
-+ }
-
-- if (kvm_read (server->machine->kd, nlst [0].n_value,
-- &ifnetaddr, sizeof (ifnetaddr)) != sizeof (ifnetaddr)) {
-- glibtop_warn_io_r (server, "kvm_read (ifnet)");
-- return;
-- }
--
-- for (/* NOP */; ifnetaddr; ifnetaddr = (u_long) ifnet.if_link.tqe_next)
-- {
-- struct sockaddr_in *sin;
-- register char *cp;
-- u_long ifaddraddr;
--
-- if (kvm_read (server->machine->kd, ifnetaddr, &ifnet,
-- sizeof (ifnet)) != sizeof (ifnet)) {
-- glibtop_warn_io_r (server,
-- "kvm_read (ifnetaddr)");
-- break;
-- }
-+#define IFA_STAT(s) (((struct if_data *)ifa->ifa_data)->ifi_ ## s)
-
-- if (strcmp (ifnet.if_xname, interface) != 0)
-+ for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-+ if (strcmp (ifa->ifa_name, interface) != 0)
- continue;
--
-- if (ifnet.if_flags & IFF_UP)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
-- if (ifnet.if_flags & IFF_BROADCAST)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
-- if (ifnet.if_flags & IFF_DEBUG)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
-- if (ifnet.if_flags & IFF_LOOPBACK)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
-- if (ifnet.if_flags & IFF_POINTOPOINT)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
--#ifdef IFF_DRV_RUNNING
-- if (ifnet.if_drv_flags & IFF_DRV_RUNNING)
--#else
-- if (ifnet.if_flags & IFF_RUNNING)
--#endif
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
-- if (ifnet.if_flags & IFF_NOARP)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
-- if (ifnet.if_flags & IFF_PROMISC)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
-- if (ifnet.if_flags & IFF_ALLMULTI)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
--#ifdef IFF_DRV_OACTIVE
-- if (ifnet.if_drv_flags & IFF_DRV_OACTIVE)
--#else
-- if (ifnet.if_flags & IFF_OACTIVE)
--#endif
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
-- if (ifnet.if_flags & IFF_SIMPLEX)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
-- if (ifnet.if_flags & IFF_LINK0)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
-- if (ifnet.if_flags & IFF_LINK1)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
-- if (ifnet.if_flags & IFF_LINK2)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
-- if (ifnet.if_flags & IFF_ALTPHYS)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
-- if (ifnet.if_flags & IFF_MULTICAST)
-- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
--
-- buf->packets_in = ifnet.if_ipackets;
-- buf->packets_out = ifnet.if_opackets;
-- buf->packets_total = buf->packets_in + buf->packets_out;
--
-- buf->bytes_in = ifnet.if_ibytes;
-- buf->bytes_out = ifnet.if_obytes;
-- buf->bytes_total = buf->bytes_in + buf->bytes_out;
--
-- buf->errors_in = ifnet.if_ierrors;
-- buf->errors_out = ifnet.if_oerrors;
-- buf->errors_total = buf->errors_in + buf->errors_out;
--
-- buf->collisions = ifnet.if_collisions;
-- buf->flags = _glibtop_sysdeps_netload;
--
-- for (ifaddraddr = (u_long) ifnet.if_addrhead.tqh_first; ifaddraddr; ifaddraddr = (u_long) ifaddr.ifa.ifa_link.tqe_next) {
-- if ((kvm_read (server->machine->kd, ifaddraddr, &ifaddr,
-- sizeof (ifaddr)) != sizeof (ifaddr))) {
-- glibtop_warn_io_r (server,
-- "kvm_read (ifaddraddr)");
-- break;
-- }
--
--#define CP(x) ((char *)(x))
-- cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) +
-- CP(&ifaddr);
-- sa = (struct sockaddr *)cp;
--
-- if (sa->sa_family == AF_LINK) {
-- struct sockaddr_dl *dl = (struct sockaddr_dl *) sa;
--
-- memcpy (buf->hwaddress, LLADDR (dl),
-- sizeof (buf->hwaddress));
-- buf->flags |= GLIBTOP_NETLOAD_HWADDRESS;
-- } else if (sa->sa_family == AF_INET) {
-- sin = (struct sockaddr_in *)sa;
-- /* Commenting out to "fix" #13345. */
-- buf->subnet = htonl (ifaddr.in.ia_subnet);
-- buf->address = sin->sin_addr.s_addr;
-- buf->mtu = ifnet.if_mtu;
--
-- buf->flags |= _glibtop_sysdeps_netload_data;
-- } else if (sa->sa_family == AF_INET6) {
-- struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa;
-- int in6fd;
--
-- memcpy (buf->address6, &sin6->sin6_addr,
-- sizeof (buf->address6));
-- buf->scope6 = (guint8) sin6->sin6_scope_id;
-- buf->flags |= _glibtop_sysdeps_netload6;
--
-- in6fd = socket (AF_INET6, SOCK_DGRAM, 0);
-- if (in6fd >= 0) {
-- struct in6_ifreq ifr;
--
-- memset (&ifr, 0, sizeof (ifr));
-- ifr.ifr_addr = *sin6;
-- g_strlcpy (ifr.ifr_name, interface,
-- sizeof (ifr.ifr_name));
-- if (ioctl (in6fd, SIOCGIFNETMASK_IN6,
-- (char *) &ifr) >= 0) {
-- memcpy (buf->prefix6,
-- &ifr.ifr_addr.sin6_addr,
-- sizeof (buf->prefix6));
-- buf->flags |= GLIBTOP_NETLOAD_PREFIX6;
-- }
-- close (in6fd);
-- }
-- }
-- } /* end of for ( ifaddraddr ) */
-
-- /* found the interface anyway */
-- break;
-- } /* end of for ( ifnetaddr ) */
-+ switch (ifa->ifa_addr->sa_family) {
-+ case AF_LINK: {
-+ struct sockaddr_dl *sdl;
-+ struct ifreq ifr;
-+ int s, flags;
-+
-+ s = socket(AF_INET, SOCK_DGRAM, 0);
-+ if (s < 0) {
-+ glibtop_warn_io_r(server, "socket(AF_INET)");
-+ break;
-+ }
-+ memset(&ifr, 0, sizeof(ifr));
-+ (void)strlcpy(ifr.ifr_name, ifa->ifa_name,
-+ sizeof(ifr.ifr_name));
-+ if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
-+ glibtop_warn_io_r(server, "ioctl(SIOCGIFFLAGS)");
-+ close(s);
-+ break;
-+ }
-+ close(s);
-+
-+ flags = (ifr.ifr_flags & 0xffff) | (ifr.ifr_flagshigh << 16);
-+
-+ if (flags & IFF_UP)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
-+ if (flags & IFF_BROADCAST)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
-+ if (flags & IFF_DEBUG)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
-+ if (flags & IFF_LOOPBACK)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
-+ if (flags & IFF_POINTOPOINT)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
-+ if (flags & IFF_RUNNING)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
-+ if (flags & IFF_NOARP)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
-+ if (flags & IFF_PROMISC)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
-+ if (flags & IFF_ALLMULTI)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
-+ if (flags & IFF_SIMPLEX)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
-+ if (flags & IFF_LINK0)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
-+ if (flags & IFF_LINK1)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
-+ if (flags & IFF_LINK2)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
-+ if (flags & IFF_ALTPHYS)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
-+ if (flags & IFF_MULTICAST)
-+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
-+
-+ buf->packets_in = IFA_STAT(ipackets);
-+ buf->packets_out = IFA_STAT(opackets);
-+ buf->packets_total = buf->packets_in + buf->packets_out;
-+
-+ buf->bytes_in = IFA_STAT(ibytes);
-+ buf->bytes_out = IFA_STAT(obytes);
-+ buf->bytes_total = buf->bytes_in + buf->bytes_out;
-+
-+ buf->errors_in = IFA_STAT(ierrors);
-+ buf->errors_out = IFA_STAT(oerrors);
-+ buf->errors_total = buf->errors_in + buf->errors_out;
-+
-+ buf->collisions = IFA_STAT(collisions);
-+ buf->flags = _glibtop_sysdeps_netload;
-+
-+ sdl = (struct sockaddr_dl *)ifa->ifa_addr;
-+ memcpy(buf->hwaddress, LLADDR(sdl),
-+ sizeof(buf->hwaddress));
-+ buf->mtu = IFA_STAT(mtu);
-+ buf->flags |= GLIBTOP_NETLOAD_HWADDRESS;
-+ break;
-+ }
-+ case AF_INET: {
-+ struct sockaddr_in *sin;
-+
-+ sin = (struct sockaddr_in *)ifa->ifa_addr;
-+ buf->address = sin->sin_addr.s_addr;
-+ sin = (struct sockaddr_in *)ifa->ifa_netmask;
-+ buf->subnet = sin->sin_addr.s_addr & buf->address;
-+ buf->flags |= _glibtop_sysdeps_netload_data;
-+ break;
-+ }
-+ case AF_INET6: {
-+ struct sockaddr_in6 *sin6;
-+
-+ sin6 = (struct sockaddr_in6 *)ifa->ifa_addr;
-+ memcpy(buf->address6, &sin6->sin6_addr,
-+ sizeof(buf->address6));
-+ buf->scope6 = (guint8 )sin6->sin6_scope_id;
-+ buf->flags |= _glibtop_sysdeps_netload6;
-+ sin6 = (struct sockaddr_in6 *)ifa->ifa_netmask;
-+ memcpy(buf->prefix6, &sin6->sin6_addr,
-+ sizeof(buf->prefix6));
-+ buf->flags |= GLIBTOP_NETLOAD_PREFIX6;
-+ break;
-+ }
-+ } // switch() end
-+ }
-+ freeifaddrs(ifap);
- }
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index 306440256e77..6c57a56a0190 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -18,6 +18,7 @@ include/libgtop-2.0/glibtop/parameter.h
include/libgtop-2.0/glibtop/ppp.h
include/libgtop-2.0/glibtop/procaffinity.h
include/libgtop-2.0/glibtop/procargs.h
+include/libgtop-2.0/glibtop/procio.h
include/libgtop-2.0/glibtop/prockernel.h
include/libgtop-2.0/glibtop/proclist.h
include/libgtop-2.0/glibtop/procmap.h
@@ -44,12 +45,11 @@ include/libgtop-2.0/libgtopconfig.h
lib/girepository-1.0/GTop-2.0.typelib
lib/libgtop-2.0.a
lib/libgtop-2.0.so
-lib/libgtop-2.0.so.10
-lib/libgtop-2.0.so.10.0.0
+lib/libgtop-2.0.so.11
+lib/libgtop-2.0.so.11.0.0
libdata/pkgconfig/libgtop-2.0.pc
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/left-insensitive.png
%%DOCSDIR%%/left.png
%%DOCSDIR%%/libgtop-Close.html
@@ -97,89 +97,89 @@ libdata/pkgconfig/libgtop-2.0.pc
%%DOCSDIR%%/up-insensitive.png
%%DOCSDIR%%/up.png
share/gir-1.0/GTop-2.0.gir
-share/locale/am/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
-share/locale/as/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ast/LC_MESSAGES/libgtop-2.0.mo
-share/locale/az/LC_MESSAGES/libgtop-2.0.mo
-share/locale/be/LC_MESSAGES/libgtop-2.0.mo
-share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
-share/locale/bn/LC_MESSAGES/libgtop-2.0.mo
-share/locale/bn_IN/LC_MESSAGES/libgtop-2.0.mo
-share/locale/bs/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ca/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ca@valencia/LC_MESSAGES/libgtop-2.0.mo
-share/locale/cs/LC_MESSAGES/libgtop-2.0.mo
-share/locale/cy/LC_MESSAGES/libgtop-2.0.mo
-share/locale/da/LC_MESSAGES/libgtop-2.0.mo
-share/locale/de/LC_MESSAGES/libgtop-2.0.mo
-share/locale/dz/LC_MESSAGES/libgtop-2.0.mo
-share/locale/el/LC_MESSAGES/libgtop-2.0.mo
-share/locale/en@shaw/LC_MESSAGES/libgtop-2.0.mo
-share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
-share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
-share/locale/eo/LC_MESSAGES/libgtop-2.0.mo
-share/locale/es/LC_MESSAGES/libgtop-2.0.mo
-share/locale/et/LC_MESSAGES/libgtop-2.0.mo
-share/locale/eu/LC_MESSAGES/libgtop-2.0.mo
-share/locale/fa/LC_MESSAGES/libgtop-2.0.mo
-share/locale/fi/LC_MESSAGES/libgtop-2.0.mo
-share/locale/fr/LC_MESSAGES/libgtop-2.0.mo
-share/locale/fur/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ga/LC_MESSAGES/libgtop-2.0.mo
-share/locale/gl/LC_MESSAGES/libgtop-2.0.mo
-share/locale/gu/LC_MESSAGES/libgtop-2.0.mo
-share/locale/he/LC_MESSAGES/libgtop-2.0.mo
-share/locale/hi/LC_MESSAGES/libgtop-2.0.mo
-share/locale/hr/LC_MESSAGES/libgtop-2.0.mo
-share/locale/hu/LC_MESSAGES/libgtop-2.0.mo
-share/locale/id/LC_MESSAGES/libgtop-2.0.mo
-share/locale/it/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ja/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ka/LC_MESSAGES/libgtop-2.0.mo
-share/locale/kn/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ku/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ky/LC_MESSAGES/libgtop-2.0.mo
-share/locale/la/LC_MESSAGES/libgtop-2.0.mo
-share/locale/lt/LC_MESSAGES/libgtop-2.0.mo
-share/locale/lv/LC_MESSAGES/libgtop-2.0.mo
-share/locale/mai/LC_MESSAGES/libgtop-2.0.mo
-share/locale/mg/LC_MESSAGES/libgtop-2.0.mo
-share/locale/mi/LC_MESSAGES/libgtop-2.0.mo
-share/locale/mk/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ml/LC_MESSAGES/libgtop-2.0.mo
-share/locale/mn/LC_MESSAGES/libgtop-2.0.mo
-share/locale/mr/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ms/LC_MESSAGES/libgtop-2.0.mo
-share/locale/nb/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ne/LC_MESSAGES/libgtop-2.0.mo
-share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
-share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
-share/locale/oc/LC_MESSAGES/libgtop-2.0.mo
-share/locale/or/LC_MESSAGES/libgtop-2.0.mo
-share/locale/pa/LC_MESSAGES/libgtop-2.0.mo
-share/locale/pl/LC_MESSAGES/libgtop-2.0.mo
-share/locale/pt/LC_MESSAGES/libgtop-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ro/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ru/LC_MESSAGES/libgtop-2.0.mo
-share/locale/rw/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sk/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sl/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sq/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sr/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sr@latin/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sv/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ta/LC_MESSAGES/libgtop-2.0.mo
-share/locale/te/LC_MESSAGES/libgtop-2.0.mo
-share/locale/tg/LC_MESSAGES/libgtop-2.0.mo
-share/locale/th/LC_MESSAGES/libgtop-2.0.mo
-share/locale/tr/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ug/LC_MESSAGES/libgtop-2.0.mo
-share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
-share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
-share/locale/xh/LC_MESSAGES/libgtop-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/libgtop-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
+share/locale/am/LC_MESSAGES/libgtop.mo
+share/locale/ar/LC_MESSAGES/libgtop.mo
+share/locale/as/LC_MESSAGES/libgtop.mo
+share/locale/ast/LC_MESSAGES/libgtop.mo
+share/locale/az/LC_MESSAGES/libgtop.mo
+share/locale/be/LC_MESSAGES/libgtop.mo
+share/locale/bg/LC_MESSAGES/libgtop.mo
+share/locale/bn/LC_MESSAGES/libgtop.mo
+share/locale/bn_IN/LC_MESSAGES/libgtop.mo
+share/locale/bs/LC_MESSAGES/libgtop.mo
+share/locale/ca/LC_MESSAGES/libgtop.mo
+share/locale/ca@valencia/LC_MESSAGES/libgtop.mo
+share/locale/cs/LC_MESSAGES/libgtop.mo
+share/locale/cy/LC_MESSAGES/libgtop.mo
+share/locale/da/LC_MESSAGES/libgtop.mo
+share/locale/de/LC_MESSAGES/libgtop.mo
+share/locale/dz/LC_MESSAGES/libgtop.mo
+share/locale/el/LC_MESSAGES/libgtop.mo
+share/locale/en@shaw/LC_MESSAGES/libgtop.mo
+share/locale/en_CA/LC_MESSAGES/libgtop.mo
+share/locale/en_GB/LC_MESSAGES/libgtop.mo
+share/locale/eo/LC_MESSAGES/libgtop.mo
+share/locale/es/LC_MESSAGES/libgtop.mo
+share/locale/et/LC_MESSAGES/libgtop.mo
+share/locale/eu/LC_MESSAGES/libgtop.mo
+share/locale/fa/LC_MESSAGES/libgtop.mo
+share/locale/fi/LC_MESSAGES/libgtop.mo
+share/locale/fr/LC_MESSAGES/libgtop.mo
+share/locale/fur/LC_MESSAGES/libgtop.mo
+share/locale/ga/LC_MESSAGES/libgtop.mo
+share/locale/gl/LC_MESSAGES/libgtop.mo
+share/locale/gu/LC_MESSAGES/libgtop.mo
+share/locale/he/LC_MESSAGES/libgtop.mo
+share/locale/hi/LC_MESSAGES/libgtop.mo
+share/locale/hr/LC_MESSAGES/libgtop.mo
+share/locale/hu/LC_MESSAGES/libgtop.mo
+share/locale/id/LC_MESSAGES/libgtop.mo
+share/locale/it/LC_MESSAGES/libgtop.mo
+share/locale/ja/LC_MESSAGES/libgtop.mo
+share/locale/ka/LC_MESSAGES/libgtop.mo
+share/locale/kn/LC_MESSAGES/libgtop.mo
+share/locale/ko/LC_MESSAGES/libgtop.mo
+share/locale/ku/LC_MESSAGES/libgtop.mo
+share/locale/ky/LC_MESSAGES/libgtop.mo
+share/locale/la/LC_MESSAGES/libgtop.mo
+share/locale/lt/LC_MESSAGES/libgtop.mo
+share/locale/lv/LC_MESSAGES/libgtop.mo
+share/locale/mai/LC_MESSAGES/libgtop.mo
+share/locale/mg/LC_MESSAGES/libgtop.mo
+share/locale/mi/LC_MESSAGES/libgtop.mo
+share/locale/mk/LC_MESSAGES/libgtop.mo
+share/locale/ml/LC_MESSAGES/libgtop.mo
+share/locale/mn/LC_MESSAGES/libgtop.mo
+share/locale/mr/LC_MESSAGES/libgtop.mo
+share/locale/ms/LC_MESSAGES/libgtop.mo
+share/locale/nb/LC_MESSAGES/libgtop.mo
+share/locale/ne/LC_MESSAGES/libgtop.mo
+share/locale/nl/LC_MESSAGES/libgtop.mo
+share/locale/nn/LC_MESSAGES/libgtop.mo
+share/locale/oc/LC_MESSAGES/libgtop.mo
+share/locale/or/LC_MESSAGES/libgtop.mo
+share/locale/pa/LC_MESSAGES/libgtop.mo
+share/locale/pl/LC_MESSAGES/libgtop.mo
+share/locale/pt/LC_MESSAGES/libgtop.mo
+share/locale/pt_BR/LC_MESSAGES/libgtop.mo
+share/locale/ro/LC_MESSAGES/libgtop.mo
+share/locale/ru/LC_MESSAGES/libgtop.mo
+share/locale/rw/LC_MESSAGES/libgtop.mo
+share/locale/sk/LC_MESSAGES/libgtop.mo
+share/locale/sl/LC_MESSAGES/libgtop.mo
+share/locale/sq/LC_MESSAGES/libgtop.mo
+share/locale/sr/LC_MESSAGES/libgtop.mo
+share/locale/sr@latin/LC_MESSAGES/libgtop.mo
+share/locale/sv/LC_MESSAGES/libgtop.mo
+share/locale/ta/LC_MESSAGES/libgtop.mo
+share/locale/te/LC_MESSAGES/libgtop.mo
+share/locale/tg/LC_MESSAGES/libgtop.mo
+share/locale/th/LC_MESSAGES/libgtop.mo
+share/locale/tr/LC_MESSAGES/libgtop.mo
+share/locale/ug/LC_MESSAGES/libgtop.mo
+share/locale/uk/LC_MESSAGES/libgtop.mo
+share/locale/vi/LC_MESSAGES/libgtop.mo
+share/locale/xh/LC_MESSAGES/libgtop.mo
+share/locale/zh_CN/LC_MESSAGES/libgtop.mo
+share/locale/zh_HK/LC_MESSAGES/libgtop.mo
+share/locale/zh_TW/LC_MESSAGES/libgtop.mo
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 4d19005e2907..98f71071e6fd 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -2,25 +2,31 @@
# $FreeBSD$
PORTNAME= libical
-PORTVERSION= 2.0.0
-DISTVERSIONPREFIX= v
-PORTREVISION= 6
+PORTVERSION= 3.0.3
CATEGORIES= devel
+MASTER_SITES= https://github.com/libical/libical/releases/download/v${PORTVERSION}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Implementation of the IETF Calendaring and Scheduling protocols
-LICENSE= LGPL21 MPL10
+LICENSE= LGPL21 MPL20
LICENSE_COMB= dual
LIB_DEPENDS= libicuuc.so:devel/icu
CFLAGS_amd64= -fPIC
-USES= cmake compiler:c++11-lib pathfix perl5
-USE_GITHUB= yes
-USE_GNOME= introspection:build
+USES= cmake compiler:c++11-lib gnome pathfix perl5 pkgconfig
USE_PERL5= build
USE_LDCONFIG= yes
+MAKE_JOBS_UNSAFE= yes
+
+BUILD_DEPENDS= valac:lang/vala \
+ gtkdoc-scan:textproc/gtk-doc
+USE_GNOME= introspection:build glib20 libxml2
+CMAKE_ARGS+= -DGOBJECT_INTROSPECTION=true \
+ -DICAL_GLIB_VAPI=true \
+ -DICAL_BUILD_DOCS=false
+
.include <bsd.port.mk>
diff --git a/devel/libical/distinfo b/devel/libical/distinfo
index 57f59d50b79c..a3020c1eacf4 100644
--- a/devel/libical/distinfo
+++ b/devel/libical/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490973722
-SHA256 (libical-libical-v2.0.0_GH0.tar.gz) = 20f4a98475052e1200d2691ba50b27969e4bedc6e50bffd5e2fa81f4ac90de9a
-SIZE (libical-libical-v2.0.0_GH0.tar.gz) = 699099
+TIMESTAMP = 1522599892
+SHA256 (libical-3.0.3.tar.gz) = 5b91eb8ad2d2dcada39d2f81d5e3ac15895823611dc7df91df39a35586f39241
+SIZE (libical-3.0.3.tar.gz) = 866624
diff --git a/devel/libical/files/patch-src_libical_icaltz-util.c b/devel/libical/files/patch-src_libical_icaltz-util.c
deleted file mode 100644
index 1f36e84e6e26..000000000000
--- a/devel/libical/files/patch-src_libical_icaltz-util.c
+++ /dev/null
@@ -1,520 +0,0 @@
---- src/libical/icaltz-util.c.orig 2018-03-09 22:23:47 UTC
-+++ src/libical/icaltz-util.c
-@@ -4,20 +4,18 @@
- *
- * Copyright 2007, Novell, Inc.
- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of version 2 of the GNU Lesser General Public
-- * License as published by the Free Software Foundation.
-+ * This library is free software; you can redistribute it and/or modify
-+ * it under the terms of either:
- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU Lesser General Public License for more details.
-+ * The LGPL as published by the Free Software Foundation, version
-+ * 2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
- *
-- * * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-+ * Or:
-+ *
-+ * The Mozilla Public License Version 2.0. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
- */
-+//krazy:excludeall=cpp
-
- #ifdef HAVE_CONFIG_H
- #include <config.h>
-@@ -93,9 +91,9 @@ typedef struct
- char charcnt[4];
- } tzinfo;
-
--static char *zdir = NULL;
-+static const char *zdir = NULL;
-
--static char *search_paths[] = {
-+static const char *search_paths[] = {
- "/usr/share/zoneinfo",
- "/usr/lib/zoneinfo",
- "/etc/zoneinfo",
-@@ -144,6 +142,7 @@ static int decode(const void *ptr)
- const unsigned char *p = ptr;
- int result = *p & (1 << (CHAR_BIT - 1)) ? ~0 : 0;
-
-+ /* cppcheck-suppress shiftNegative */
- result = (result << 8) | *p++;
- result = (result << 8) | *p++;
- result = (result << 8) | *p++;
-@@ -153,9 +152,9 @@ static int decode(const void *ptr)
- }
- }
-
--static char *zname_from_stridx(char *str, long idx)
-+static char *zname_from_stridx(char *str, size_t idx)
- {
-- long i;
-+ size_t i;
- size_t size;
- char *ret;
-
-@@ -164,7 +163,7 @@ static char *zname_from_stridx(char *str
- i++;
- }
-
-- size = (size_t)(i - idx);
-+ size = i - idx;
- str += idx;
- ret = (char *)malloc(size + 1);
- ret = strncpy(ret, str, size);
-@@ -197,45 +196,6 @@ const char *icaltzutil_get_zone_director
- return zdir;
- }
-
--static void find_transidx(time_t *transitions, ttinfo *types,
-- int *trans_idx, long int num_trans,
-- int *stdidx, int *dstidx)
--{
-- time_t now, year_start;
-- int i, found = 0;
-- struct icaltimetype itime;
--
-- now = time(NULL);
-- itime = icaltime_from_timet(now, 0);
-- itime.month = itime.day = 1;
-- itime.hour = itime.minute = itime.second = 0;
-- year_start = icaltime_as_timet(itime);
--
-- /* Set this by default */
-- *stdidx = (num_trans - 1);
--
-- for (i = (num_trans - 1); i >= 0; --i) {
-- if (year_start < transitions[i]) {
-- int idx;
-- found = 1;
-- idx = trans_idx[i];
-- (types[idx].isdst) ? (*dstidx = i) : (*stdidx = i);
-- }
-- }
--
-- /* If the transition found is the last among the list, prepare to use the last two transtions.
-- * Using this will most likely throw the DTSTART of the resulting component off by 1 or 2 days
-- * but it would set right by the adjustment made.
-- * NOTE: We need to use the last two transitions only because there is no data for the future
-- * transitions.
-- */
-- if (found && (*dstidx == -1)) {
-- *dstidx = ((*stdidx) - 1);
-- }
--
-- return;
--}
--
- static int calculate_pos(icaltimetype icaltime)
- {
- static int r_pos[] = {1, 2, 3, -2, -1};
-@@ -251,22 +211,6 @@ static int calculate_pos(icaltimetype ic
- return r_pos[pos];
- }
-
--#if defined(USE_INTEROPERABLE_VTIMEZONES)
--static int _s_use_exact_timezones = 0;
--#else
--static int _s_use_exact_timezones = 1;
--#endif
--
--void icaltzutil_set_exact_vtimezones_support(int on)
--{
-- _s_use_exact_timezones = (on != 0);
--}
--
--int icaltzutil_get_exact_vtimezones_support(void)
--{
-- return _s_use_exact_timezones;
--}
--
- static void adjust_dtstart_day_to_rrule(icalcomponent *comp, struct icalrecurrencetype rule)
- {
- time_t now, year_start;
-@@ -274,13 +218,13 @@ static void adjust_dtstart_day_to_rrule(
- icalrecur_iterator *iter;
-
- now = time(NULL);
-- itime = icaltime_from_timet(now, 0);
-+ itime = icaltime_from_timet_with_zone(now, 0, NULL);
- itime.month = itime.day = 1;
- itime.hour = itime.minute = itime.second = 0;
- year_start = icaltime_as_timet(itime);
-
- comp_start = icalcomponent_get_dtstart(comp);
-- start = icaltime_from_timet(year_start, 0);
-+ start = icaltime_from_timet_with_zone(year_start, 0, NULL);
-
- iter = icalrecur_iterator_new(rule, start);
- iter_start = icalrecur_iterator_next(iter);
-@@ -298,9 +242,8 @@ icalcomponent *icaltzutil_fetch_timezone
- size_t i, num_trans, num_chars, num_leaps, num_isstd, num_isgmt;
- size_t num_types = 0;
- size_t size;
-- time_t trans;
-- int dstidx = -1, stdidx = -1, pos, sign, zidx, zp_idx;
-- icalcomponent *std_comp = NULL;
-+ int pos, sign;
-+ time_t now = time(NULL);
-
- const char *zonedir;
- FILE *f = NULL;
-@@ -313,12 +256,22 @@ icalcomponent *icaltzutil_fetch_timezone
- leap *leaps = NULL;
- char *tzid = NULL;
-
-- time_t start, end;
- int idx, prev_idx;
-- icalcomponent *tz_comp = NULL, *comp = NULL, *dst_comp;
-+ icalcomponent *tz_comp = NULL, *comp = NULL;
- icalproperty *icalprop;
-- icaltimetype dtstart, icaltime;
-- struct icalrecurrencetype ical_recur;
-+ icaltimetype icaltime;
-+ struct icalrecurrencetype standard_recur;
-+ struct icalrecurrencetype daylight_recur;
-+ icaltimetype prev_standard_time = icaltime_null_time();
-+ icaltimetype prev_daylight_time = icaltime_null_time();
-+ icaltimetype prev_prev_standard_time;
-+ icaltimetype prev_prev_daylight_time;
-+ long prev_standard_gmtoff;
-+ long prev_daylight_gmtoff;
-+ icalcomponent *cur_standard_comp = NULL;
-+ icalcomponent *cur_daylight_comp = NULL;
-+ icalproperty *cur_standard_rrule_property;
-+ icalproperty *cur_daylight_rrule_property;
-
- if (icaltimezone_get_builtin_tzdata()) {
- goto error;
-@@ -448,15 +401,8 @@ icalcomponent *icaltzutil_fetch_timezone
- /* Read all the contents now */
-
- for (i = 0; i < num_types; i++) {
-- types[i].zname = zname_from_stridx(znames, (long)types[i].abbr);
-- }
--
-- if (!_s_use_exact_timezones) {
-- if (num_trans != 0) {
-- find_transidx(transitions, types, trans_idx, (long int)num_trans, &stdidx, &dstidx);
-- } else {
-- stdidx = 0;
-- }
-+ /* coverity[tainted_data] */
-+ types[i].zname = zname_from_stridx(znames, types[i].abbr);
- }
-
- tz_comp = icalcomponent_new(ICAL_VTIMEZONE_COMPONENT);
-@@ -476,140 +422,202 @@ icalcomponent *icaltzutil_fetch_timezone
- icalproperty_set_x_name(icalprop, "X-LIC-LOCATION");
- icalcomponent_add_property(tz_comp, icalprop);
-
-- if (!_s_use_exact_timezones) {
-- if (stdidx != -1) {
-- if (num_trans != 0) {
-- zidx = trans_idx[stdidx];
-+ prev_idx = 0;
-+ if (num_trans == 0) {
-+ prev_idx = idx = 0;
-+ } else {
-+ idx = trans_idx[0];
-+ }
-+
-+ for (i = 1; i < num_trans; i++) {
-+ int by_day;
-+ int is_new_comp = 0;
-+ time_t start;
-+ struct icalrecurrencetype *recur;
-+
-+ prev_idx = idx;
-+ idx = trans_idx[i];
-+ start = transitions[i] + types[prev_idx].gmtoff;
-+
-+ icaltime = icaltime_from_timet_with_zone(start, 0, NULL);
-+ pos = calculate_pos(icaltime);
-+ pos < 0 ? (sign = -1): (sign = 1);
-+ by_day = sign * ((abs(pos) * 8) + icaltime_day_of_week(icaltime));
-+
-+ // Figure out if the rule has changed since the previous year
-+ // If it has, update the recurrence rule of the current component and create a new component
-+ // If it the current component was only valid for one year then remove the recurrence rule
-+ if (types[idx].isdst) {
-+ if (cur_daylight_comp) {
-+ // Check if the pattern for daylight has changed
-+ // If it has, create a new component and update UNTIL of previous component's RRULE
-+ if (daylight_recur.by_month[0] != icaltime.month ||
-+ daylight_recur.by_day[0] != by_day ||
-+ types[prev_idx].gmtoff != prev_daylight_gmtoff) {
-+ // Set UNTIL of the previous component's recurrence
-+ icaltime_adjust(&prev_daylight_time, 0, 0, 0, -types[prev_idx].gmtoff);
-+ prev_daylight_time.is_utc = 1;
-+
-+ daylight_recur.until = prev_daylight_time;
-+ icalproperty_set_rrule(cur_daylight_rrule_property, daylight_recur);
-+
-+ cur_daylight_comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT);
-+ is_new_comp = 1;
-+ }
- } else {
-- zidx = 0;
-+ cur_daylight_comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT);
-+ is_new_comp = 1;
- }
-
-- std_comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT);
-- icalprop = icalproperty_new_tzname(types[zidx].zname);
-- icalcomponent_add_property(std_comp, icalprop);
-+ comp = cur_daylight_comp;
-+ recur = &daylight_recur;
-
-- if (dstidx != -1) {
-- zp_idx = trans_idx[stdidx-1];
-+ if (icaltime_is_null_time(prev_daylight_time)) {
-+ prev_prev_daylight_time = icaltime;
- } else {
-- zp_idx = zidx;
-+ prev_prev_daylight_time = prev_daylight_time;
- }
-- /* DTSTART localtime uses TZOFFSETFROM UTC offset */
-- if (num_trans != 0) {
-- trans = transitions[stdidx] + types[zp_idx].gmtoff;
-+
-+ prev_daylight_time = icaltime;
-+ prev_daylight_gmtoff = types[prev_idx].gmtoff;
-+ } else {
-+ if (cur_standard_comp) {
-+ // Check if the pattern for standard has changed
-+ // If it has, create a new component and update UNTIL
-+ // of the previous component's RRULE
-+ if (standard_recur.by_month[0] != icaltime.month ||
-+ standard_recur.by_day[0] != by_day ||
-+ types[prev_idx].gmtoff != prev_standard_gmtoff) {
-+ icaltime_adjust(&prev_standard_time, 0, 0, 0, -types[prev_idx].gmtoff);
-+ prev_standard_time.is_utc = 1;
-+
-+ standard_recur.until = prev_standard_time;
-+ icalproperty_set_rrule(cur_standard_rrule_property, standard_recur);
-+
-+ cur_standard_comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT);
-+ is_new_comp = 1;
-+
-+ // Are we transitioning on the daylight date?
-+ // If so, that means the time zone is switching off of DST
-+ // We need to set UNTIL for the daylight component
-+ if (cur_daylight_comp && daylight_recur.by_month[0] == icaltime.month &&
-+ daylight_recur.by_day[0] == by_day) {
-+ icaltime_adjust(&prev_daylight_time, 0, 0, 0, -types[prev_idx].gmtoff);
-+ prev_daylight_time.is_utc = 1;
-+
-+ daylight_recur.until = prev_daylight_time;
-+ icalproperty_set_rrule(cur_daylight_rrule_property, daylight_recur);
-+ }
-+ }
- } else {
-- trans = (time_t)types[zp_idx].gmtoff;
-+ cur_standard_comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT);
-+ is_new_comp = 1;
- }
-- icaltime = icaltime_from_timet(trans, 0);
-- dtstart = icaltime;
-- dtstart.year = 1970;
-- dtstart.minute = dtstart.second = 0;
-- icalprop = icalproperty_new_dtstart(dtstart);
-- icalcomponent_add_property(std_comp, icalprop);
-
-- /* If DST changes are present use RRULE */
-- if (dstidx != -1) {
-- icalrecurrencetype_clear(&ical_recur);
-- ical_recur.freq = ICAL_YEARLY_RECURRENCE;
-- ical_recur.by_month[0] = icaltime.month;
-- pos = calculate_pos(icaltime);
-- pos < 0 ? (sign = -1): (sign = 1);
-- ical_recur.by_day[0] = sign * ((abs(pos) * 8) + icaltime_day_of_week(icaltime));
-- icalprop = icalproperty_new_rrule(ical_recur);
-- icalcomponent_add_property(std_comp, icalprop);
-+ comp = cur_standard_comp;
-+ recur = &standard_recur;
-
-- adjust_dtstart_day_to_rrule(std_comp, ical_recur);
-+ if (icaltime_is_null_time(prev_standard_time)) {
-+ prev_prev_standard_time = icaltime;
-+ } else {
-+ prev_prev_standard_time = prev_standard_time;
- }
-- icalprop = icalproperty_new_tzoffsetfrom(types[zp_idx].gmtoff);
-- icalcomponent_add_property(std_comp, icalprop);
-- icalprop = icalproperty_new_tzoffsetto(types[zidx].gmtoff);
-- icalcomponent_add_property(std_comp, icalprop);
-- icalcomponent_add_component(tz_comp, std_comp);
-- } else {
-- icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-+
-+ prev_standard_time = icaltime;
-+ prev_standard_gmtoff = types[prev_idx].gmtoff;
- }
-
-- if (dstidx != -1) {
-- zidx = trans_idx[dstidx];
-- zp_idx = trans_idx[dstidx-1];
-- dst_comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT);
-- icalprop = icalproperty_new_tzname(types[zidx].zname);
-- icalcomponent_add_property(dst_comp, icalprop);
-+ if (is_new_comp) {
-+ icalprop = icalproperty_new_tzname(types[idx].zname);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalprop = icalproperty_new_dtstart(icaltime);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalprop = icalproperty_new_tzoffsetfrom(types[prev_idx].gmtoff);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalprop = icalproperty_new_tzoffsetto(types[idx].gmtoff);
-+ icalcomponent_add_property(comp, icalprop);
-
-- /* DTSTART localtime uses TZOFFSETFROM UTC offset */
-- if (num_trans != 0) {
-- trans = transitions[dstidx] + types[zp_idx].gmtoff;
-+ // Determine the recurrence rule for the current set of changes
-+ icalrecurrencetype_clear(recur);
-+ recur->freq = ICAL_YEARLY_RECURRENCE;
-+ recur->by_month[0] = icaltime.month;
-+ recur->by_day[0] = by_day;
-+ icalprop = icalproperty_new_rrule(*recur);
-+ icalcomponent_add_property(comp, icalprop);
-+
-+ if (types[idx].isdst) {
-+ cur_daylight_rrule_property = icalprop;
- } else {
-- trans = (time_t)types[zp_idx].gmtoff;
-+ cur_standard_rrule_property = icalprop;
- }
-
-- icaltime = icaltime_from_timet(trans, 0);
-- dtstart = icaltime;
-- dtstart.year = 1970;
-- dtstart.minute = dtstart.second = 0;
-- icalprop = icalproperty_new_dtstart(dtstart);
-- icalcomponent_add_property(dst_comp, icalprop);
-+ adjust_dtstart_day_to_rrule(comp, *recur);
-
-- icalrecurrencetype_clear(&ical_recur);
-- ical_recur.freq = ICAL_YEARLY_RECURRENCE;
-- ical_recur.by_month[0] = icaltime.month;
-- pos = calculate_pos(icaltime);
-- pos < 0 ? (sign = -1): (sign = 1);
-- ical_recur.by_day[0] = sign * ((abs(pos) * 8) + icaltime_day_of_week(icaltime));
-- icalprop = icalproperty_new_rrule(ical_recur);
-- icalcomponent_add_property(dst_comp, icalprop);
-+ icalcomponent_add_component(tz_comp, comp);
-+ }
-+ }
-
-- adjust_dtstart_day_to_rrule(dst_comp, ical_recur);
-+ // Check if the last daylight or standard date was before now
-+ // If so, set the UNTIL date to the second-to-last transition date
-+ // and then insert a new component to indicate the time zone doesn't transition anymore
-+ if (cur_daylight_comp && icaltime_as_timet(prev_daylight_time) < now) {
-+ icaltime_adjust(&prev_prev_daylight_time, 0, 0, 0, -prev_daylight_gmtoff);
-+ prev_prev_daylight_time.is_utc = 1;
-
-- icalprop = icalproperty_new_tzoffsetfrom(types[zp_idx].gmtoff);
-- icalcomponent_add_property(dst_comp, icalprop);
-+ daylight_recur.until = prev_prev_daylight_time;
-+ icalproperty_set_rrule(cur_daylight_rrule_property, daylight_recur);
-
-- icalprop = icalproperty_new_tzoffsetto(types[zidx].gmtoff);
-- icalcomponent_add_property(dst_comp, icalprop);
-+ comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT);
-+ icalprop = icalproperty_new_tzname(types[idx].zname);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalprop = icalproperty_new_dtstart(prev_daylight_time);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalprop = icalproperty_new_tzoffsetfrom(types[prev_idx].gmtoff);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalprop = icalproperty_new_tzoffsetto(types[idx].gmtoff);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalcomponent_add_component(tz_comp, comp);
-+ }
-
-- icalcomponent_add_component(tz_comp, dst_comp);
-- }
-- } else { /*exact vtimezones*/
-- prev_idx = 0;
-- if (num_trans == 0) {
-- prev_idx = idx = 0;
-+ if (cur_standard_comp && icaltime_as_timet(prev_standard_time) < now) {
-+ icaltime_adjust(&prev_prev_standard_time, 0, 0, 0, -prev_standard_gmtoff);
-+ prev_prev_standard_time.is_utc = 1;
-+
-+ standard_recur.until = prev_prev_standard_time;
-+ icalproperty_set_rrule(cur_standard_rrule_property, standard_recur);
-+
-+ comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT);
-+ icalprop = icalproperty_new_tzname(types[idx].zname);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalprop = icalproperty_new_dtstart(prev_standard_time);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalprop = icalproperty_new_tzoffsetfrom(types[prev_idx].gmtoff);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalprop = icalproperty_new_tzoffsetto(types[idx].gmtoff);
-+ icalcomponent_add_property(comp, icalprop);
-+ icalcomponent_add_component(tz_comp, comp);
-+ }
-+
-+ if (num_trans <= 1) {
-+ time_t start;
-+
-+ if (num_trans == 1) {
-+ start = transitions[0] + types[prev_idx].gmtoff;
- } else {
-- idx = trans_idx[0];
-+ start = 0;
- }
-- start = 0;
-- for (i = 1; i < num_trans; i++, start = end) {
-- prev_idx = idx;
-- idx = trans_idx[i];
-- end = transitions[i] + types[prev_idx].gmtoff;
-- /* don't bother starting until the epoch */
-- if (0 > end)
-- continue;
-
-- if (types[prev_idx].isdst) {
-- comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT);
-- } else {
-- comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT);
-- }
-- icalprop = icalproperty_new_tzname(types[prev_idx].zname);
-- icalcomponent_add_property(comp, icalprop);
-- dtstart = icaltime_from_timet(start, 0);
-- icalprop = icalproperty_new_dtstart(dtstart);
-- icalcomponent_add_property(comp, icalprop);
-- icalprop = icalproperty_new_tzoffsetfrom(types[idx].gmtoff);
-- icalcomponent_add_property(comp, icalprop);
-- icalprop = icalproperty_new_tzoffsetto(types[prev_idx].gmtoff);
-- icalcomponent_add_property(comp, icalprop);
-- icalcomponent_add_component(tz_comp, comp);
-- }
-- /* finally, add a last zone with no end date */
-+ // This time zone doesn't transition, insert a single VTIMEZONE component
- if (types[idx].isdst) {
- comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT);
- } else {
- comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT);
- }
-+
- icalprop = icalproperty_new_tzname(types[idx].zname);
- icalcomponent_add_property(comp, icalprop);
-- dtstart = icaltime_from_timet(start, 0);
-- icalprop = icalproperty_new_dtstart(dtstart);
-+ icaltime = icaltime_from_timet_with_zone(start, 0, NULL);
-+ icalprop = icalproperty_new_dtstart(icaltime);
- icalcomponent_add_property(comp, icalprop);
- icalprop = icalproperty_new_tzoffsetfrom(types[prev_idx].gmtoff);
- icalcomponent_add_property(comp, icalprop);
diff --git a/devel/libical/files/patch-src_libical_icaltz-util.h b/devel/libical/files/patch-src_libical_icaltz-util.h
deleted file mode 100644
index a7f08285e907..000000000000
--- a/devel/libical/files/patch-src_libical_icaltz-util.h
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/libical/icaltz-util.h.orig 2018-03-09 22:29:13 UTC
-+++ src/libical/icaltz-util.h
-@@ -4,19 +4,16 @@
- *
- * Copyright 2007, Novell, Inc.
- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of version 2 of the GNU Lesser General Public
-- * License as published by the Free Software Foundation.
-+ * This library is free software; you can redistribute it and/or modify
-+ * it under the terms of either:
- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU Lesser General Public License for more details.
-+ * The LGPL as published by the Free Software Foundation, version
-+ * 2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-+ * Or:
-+ *
-+ * The Mozilla Public License Version 2.0. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
- */
-
- #ifndef ICALTZUTIL_H
-@@ -35,10 +32,4 @@ LIBICAL_ICAL_EXPORT const char *icaltzut
-
- LIBICAL_ICAL_EXPORT icalcomponent *icaltzutil_fetch_timezone(const char *location);
-
--/* set @p on to 0 if inter-operable vtimezones are desired; else exact timezones are in-effect */
--LIBICAL_ICAL_EXPORT void icaltzutil_set_exact_vtimezones_support(int on);
--
--/* return 1 if exact vtimezones are in-effect; else inter-operable vtimezones are in-effect */
--LIBICAL_ICAL_EXPORT int icaltzutil_get_exact_vtimezones_support(void);
--
- #endif
diff --git a/devel/libical/files/patch-src_test_timezones.c b/devel/libical/files/patch-src_test_timezones.c
deleted file mode 100644
index 40dd7d43b172..000000000000
--- a/devel/libical/files/patch-src_test_timezones.c
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/test/timezones.c.orig 2018-03-09 22:35:51 UTC
-+++ src/test/timezones.c
-@@ -1,15 +1,16 @@
- /*
- ======================================================================
-
-- The contents of this file are subject to the Mozilla Public License
-- Version 1.0 (the "License"); you may not use this file except in
-- compliance with the License. You may obtain a copy of the License at
-- http://www.mozilla.org/MPL/
-+ This library is free software; you can redistribute it and/or modify
-+ it under the terms of either:
-
-- Software distributed under the License is distributed on an "AS IS"
-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-- the License for the specific language governing rights and
-- limitations under the License.
-+ The LGPL as published by the Free Software Foundation, version
-+ 2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html
-+
-+ Or:
-+
-+ The Mozilla Public License Version 2.0. You may obtain a copy of
-+ the License at http://www.mozilla.org/MPL/
-
- ======================================================================*/
-
-@@ -56,6 +57,9 @@ int main()
- for (i = 0; i < timezones->num_elements; i++) {
- zone = (icaltimezone *)icalarray_element_at(timezones, i);
- zone_location = (char *)icaltimezone_get_location(zone);
-+ zonedef_printed = 0;
-+ if (!zone_location)
-+ continue;
-
- /*
- * select this location for glibc: needs support for TZ=<location>
-@@ -66,7 +70,7 @@ int main()
- #else
- new_tz[0] = '\0';
- strncat(new_tz, "TZ=", 255);
-- strncat(new_tz, zone_location, 255);
-+ strncat(new_tz, zone_location, 255 - strlen(new_tz));
- putenv(new_tz);
- #endif
- tzset();
-@@ -106,7 +110,9 @@ int main()
- if (verbose || curr_failed != failed) {
- struct tm utc_tm;
-
-- gmtime_r(&curr_time, &utc_tm);
-+ if (!gmtime_r(&curr_time, &utc_tm))
-+ memset(&utc_tm, 0, sizeof(utc_tm));
-+
- printf(
- "%s: day %03d: %s: %04d-%02d-%02d %02d:%02d:%02d UTC = "
- "libc %04d-%02d-%02d %02d:%02d:%02d dst %d",
-@@ -131,7 +137,7 @@ int main()
- printf("\n");
- failed = curr_failed;
-
-- if (!zonedef_printed) {
-+ if (failed && !zonedef_printed) {
- icalcomponent *comp = icaltimezone_get_component(zone);
-
- if (comp) {
-@@ -153,14 +159,8 @@ int main()
- percent_failed = total_failed * 100 / (total_failed + total_okay);
- printf(" *** Summary: %lu zones tested, %u days failed, %u okay => %u%% failed ***\n",
- (unsigned long)timezones->num_elements, total_failed, total_okay, percent_failed);
--
-- if (!icaltzutil_get_exact_vtimezones_support()) {
-- if (!percent_failed) {
-- ret = 0;
-- printf(" *** Expect some small error rate with inter-operable vtimezones *** \n");
-- }
-- }
- }
-
-+ icaltimezone_free_builtin_timezones();
- return ret;
- }
diff --git a/devel/libical/pkg-plist b/devel/libical/pkg-plist
index 3d6ab68fc976..252368efc2db 100644
--- a/devel/libical/pkg-plist
+++ b/devel/libical/pkg-plist
@@ -1,3 +1,39 @@
+include/libical-glib/i-cal-array.h
+include/libical-glib/i-cal-attach.h
+include/libical-glib/i-cal-comp-iter.h
+include/libical-glib/i-cal-component.h
+include/libical-glib/i-cal-datetimeperiod-type.h
+include/libical-glib/i-cal-derived-parameter.h
+include/libical-glib/i-cal-derived-property.h
+include/libical-glib/i-cal-derived-value.h
+include/libical-glib/i-cal-duration-type.h
+include/libical-glib/i-cal-enums.h
+include/libical-glib/i-cal-error.h
+include/libical-glib/i-cal-forward-declarations.h
+include/libical-glib/i-cal-geo-type.h
+include/libical-glib/i-cal-langbind.h
+include/libical-glib/i-cal-memory.h
+include/libical-glib/i-cal-mime.h
+include/libical-glib/i-cal-object.h
+include/libical-glib/i-cal-parameter.h
+include/libical-glib/i-cal-parser.h
+include/libical-glib/i-cal-period-type.h
+include/libical-glib/i-cal-property.h
+include/libical-glib/i-cal-recur-iterator.h
+include/libical-glib/i-cal-recur.h
+include/libical-glib/i-cal-recurrence-type.h
+include/libical-glib/i-cal-reqstat-type.h
+include/libical-glib/i-cal-restriction.h
+include/libical-glib/i-cal-time-span.h
+include/libical-glib/i-cal-time.h
+include/libical-glib/i-cal-timetype.h
+include/libical-glib/i-cal-timezone-phase.h
+include/libical-glib/i-cal-timezone.h
+include/libical-glib/i-cal-timezonetype.h
+include/libical-glib/i-cal-trigger-type.h
+include/libical-glib/i-cal-unknowntokenhandling.h
+include/libical-glib/i-cal-value.h
+include/libical-glib/libical-glib.h
include/libical/ical.h
include/libical/icalarray.h
include/libical/icalattach.h
@@ -55,24 +91,34 @@ lib/cmake/LibIcal/LibIcalConfig.cmake
lib/cmake/LibIcal/LibIcalConfigVersion.cmake
lib/cmake/LibIcal/LibIcalTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/LibIcal/LibIcalTargets.cmake
+lib/girepository-1.0/ICalGLib-3.0.typelib
+lib/girepository-1.0/libical-3.0.3.typelib
+lib/libical-glib.a
+lib/libical-glib.so
+lib/libical-glib.so.3
+lib/libical-glib.so.3.0.3
lib/libical.a
lib/libical.so
-lib/libical.so.2
-lib/libical.so.2.0.0
+lib/libical.so.3
+lib/libical.so.3.0.3
lib/libical_cxx.a
lib/libical_cxx.so
-lib/libical_cxx.so.2
-lib/libical_cxx.so.2.0.0
+lib/libical_cxx.so.3
+lib/libical_cxx.so.3.0.3
lib/libicalss.a
lib/libicalss.so
-lib/libicalss.so.2
-lib/libicalss.so.2.0.0
+lib/libicalss.so.3
+lib/libicalss.so.3.0.3
lib/libicalss_cxx.a
lib/libicalss_cxx.so
-lib/libicalss_cxx.so.2
-lib/libicalss_cxx.so.2.0.0
+lib/libicalss_cxx.so.3
+lib/libicalss_cxx.so.3.0.3
lib/libicalvcal.a
lib/libicalvcal.so
-lib/libicalvcal.so.2
-lib/libicalvcal.so.2.0.0
+lib/libicalvcal.so.3
+lib/libicalvcal.so.3.0.3
+libdata/pkgconfig/libical-glib.pc
libdata/pkgconfig/libical.pc
+share/gir-1.0/ICalGLib-3.0.gir
+share/gir-1.0/libical-3.0.3.gir
+share/vala/vapi/libical-glib.vapi
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 575d0c5a9760..689c94f308d6 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libpeas
-PORTVERSION= 1.20.0
+PORTVERSION= 1.22.0
PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
@@ -30,8 +30,6 @@ USE_GNOME= cairo gtk30 intlhack introspection
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
CONFIGURE_ARGS+=--disable-glade-catalog
PLIST= ${.CURDIR}/pkg-plist
diff --git a/devel/libpeas/distinfo b/devel/libpeas/distinfo
index ff275de3961f..718f5645e1b5 100644
--- a/devel/libpeas/distinfo
+++ b/devel/libpeas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496672649
-SHA256 (gnome3/libpeas-1.20.0.tar.xz) = f392fffe2dc00072a51bb2a1b274224a06bdc5f9c3b3c0ac4816909e9933d354
-SIZE (gnome3/libpeas-1.20.0.tar.xz) = 557872
+TIMESTAMP = 1516305648
+SHA256 (gnome3/libpeas-1.22.0.tar.xz) = 5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962
+SIZE (gnome3/libpeas-1.22.0.tar.xz) = 561332
diff --git a/devel/libpeas/pkg-plist b/devel/libpeas/pkg-plist
index e7a1841467e7..94334b7cc9ad 100644
--- a/devel/libpeas/pkg-plist
+++ b/devel/libpeas/pkg-plist
@@ -5,22 +5,22 @@ include/libpeas-1.0/libpeas-gtk/peas-gtk-plugin-manager-view.h
include/libpeas-1.0/libpeas-gtk/peas-gtk-plugin-manager.h
include/libpeas-1.0/libpeas-gtk/peas-gtk.h
include/libpeas-1.0/libpeas/peas-activatable.h
+include/libpeas-1.0/libpeas/peas-autocleanups.h
include/libpeas-1.0/libpeas/peas-engine.h
include/libpeas-1.0/libpeas/peas-extension-base.h
include/libpeas-1.0/libpeas/peas-extension-set.h
include/libpeas-1.0/libpeas/peas-extension.h
include/libpeas-1.0/libpeas/peas-object-module.h
-include/libpeas-1.0/libpeas/peas-autocleanups.h
include/libpeas-1.0/libpeas/peas-plugin-info.h
include/libpeas-1.0/libpeas/peas.h
lib/girepository-1.0/Peas-1.0.typelib
lib/girepository-1.0/PeasGtk-1.0.typelib
lib/libpeas-1.0.so
lib/libpeas-1.0.so.0
-lib/libpeas-1.0.so.0.2000.0
+lib/libpeas-1.0.so.0.2200.0
lib/libpeas-gtk-1.0.so
lib/libpeas-gtk-1.0.so.0
-lib/libpeas-gtk-1.0.so.0.2000.0
+lib/libpeas-gtk-1.0.so.0.2200.0
lib/peas-demo/plugins/helloworld/helloworld.plugin
lib/peas-demo/plugins/helloworld/libhelloworld.so
lib/peas-demo/plugins/secondtime/libsecondtime.so
@@ -93,6 +93,7 @@ share/locale/gl/LC_MESSAGES/libpeas.mo
share/locale/gu/LC_MESSAGES/libpeas.mo
share/locale/he/LC_MESSAGES/libpeas.mo
share/locale/hi/LC_MESSAGES/libpeas.mo
+share/locale/hr/LC_MESSAGES/libpeas.mo
share/locale/hu/LC_MESSAGES/libpeas.mo
share/locale/id/LC_MESSAGES/libpeas.mo
share/locale/is/LC_MESSAGES/libpeas.mo
diff --git a/devel/libsoup-reference/Makefile b/devel/libsoup-reference/Makefile
deleted file mode 100644
index c7afa52936fb..000000000000
--- a/devel/libsoup-reference/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 0
-
-.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/devel/libsoup-reference/pkg-descr b/devel/libsoup-reference/pkg-descr
deleted file mode 100644
index 66848372fd8c..000000000000
--- a/devel/libsoup-reference/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This port contains the programming reference for devel/libsoup.
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 4499159db03e..5e10e68eb116 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -2,34 +2,31 @@
# $FreeBSD$
PORTNAME= libsoup
-PORTVERSION= 2.54.1
-PORTREVISION= 0
+PORTVERSION= 2.62.2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= SOAP (Simple Object Access Protocol) implementation in C
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= glib-networking>=2.29.18:net/glib-networking
LIB_DEPENDS= libgcrypt.so:security/libgcrypt
RUN_DEPENDS= glib-networking>=2.29.18:net/glib-networking
-USES= tar:xz
PORTSCOUT= limitw:1,even
-.if !defined(REFERENCE_PORT)
-
-USES+= gettext gmake gnome libtool pathfix pkgconfig \
- python:build sqlite:3 tar:xz
+USES= gettext gmake gnome libtool localbase pathfix \
+ pkgconfig python:3.6+,build sqlite ssl tar:xz
USE_GNOME= glib20 intlhack introspection:build \
libxml2 referencehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-more-warnings \
--disable-vala
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
LIBVERSION= 1.8.0
@@ -46,7 +43,7 @@ CONFIGURE_ARGS+=--without-gnome
post-patch:
@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
+ @${REINPLACE_CMD} -e 's|env python3|env ${PYTHON_VERSION}|g' \
${WRKSRC}/libsoup/tld-parser.py
@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
${WRKSRC}/configure
@@ -74,5 +71,3 @@ post-install:
.endif
.include <bsd.port.mk>
-
-.endif
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index a7c35a9cf0af..0d462d8a2a16 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508503209
-SHA256 (gnome2/libsoup-2.54.1.tar.xz) = 47b42c232034734d66e5f093025843a5d8cc4b2357c011085a2fd04ef02dd633
-SIZE (gnome2/libsoup-2.54.1.tar.xz) = 1793108
+TIMESTAMP = 1525958761
+SHA256 (gnome/libsoup-2.62.2.tar.xz) = 9e536fe3da60b25d2c63addb84a9d5072d00b0d8b8cbeabc629a6bcd63f879b6
+SIZE (gnome/libsoup-2.62.2.tar.xz) = 1848752
diff --git a/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c b/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c
index 3c08db164cbf..c1fed6510cf1 100644
--- a/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c
+++ b/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c
@@ -1,10 +1,11 @@
---- libsoup/soup-auth-negotiate.c.orig 2016-03-14 16:19:35 UTC
-+++ libsoup/soup-auth-negotiate.c
-@@ -14,7 +14,6 @@
+--- libsoup/soup-auth-negotiate.c.orig 2016-04-07 16:25:20.853309000 +0200
++++ libsoup/soup-auth-negotiate.c 2016-04-07 16:25:49.465869000 +0200
+@@ -11,6 +11,8 @@
+ #endif
+
+ #include <string.h>
++#include <time.h>
++#include <stdint.h>
#ifdef LIBSOUP_HAVE_GSSAPI
#include <gssapi/gssapi.h>
--#include <gssapi/gssapi_krb5.h>
- #endif /* LIBSOUP_HAVE_GSSAPI */
-
- #include "soup-auth-negotiate.h"
diff --git a/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c b/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c
deleted file mode 100644
index 17d2f9043552..000000000000
--- a/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c
+++ /dev/null
@@ -1,49 +0,0 @@
-From 03c91c76daf70ee227f38304c5e45a155f45073d Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Thu, 3 Aug 2017 09:56:43 -0400
-Subject: Fix chunked decoding buffer overrun (CVE-2017-2885)
-
-https://bugzilla.gnome.org/show_bug.cgi?id=785774
---- libsoup/soup-filter-input-stream.c.orig 2016-02-05 15:05:33 UTC
-+++ libsoup/soup-filter-input-stream.c
-@@ -201,7 +201,7 @@ soup_filter_input_stream_read_until (SoupFilterInputSt
- GCancellable *cancellable,
- GError **error)
- {
-- gssize nread;
-+ gssize nread, read_length;
- guint8 *p, *buf, *end;
- gboolean eof = FALSE;
- GError *my_error = NULL;
-@@ -254,10 +254,11 @@ soup_filter_input_stream_read_until (SoupFilterInputSt
- } else
- buf = fstream->priv->buf->data;
-
-- /* Scan for the boundary */
-- end = buf + fstream->priv->buf->len;
-- if (!eof)
-- end -= boundary_length;
-+ /* Scan for the boundary within the range we can possibly return. */
-+ if (include_boundary)
-+ end = buf + MIN (fstream->priv->buf->len, length) - boundary_length;
-+ else
-+ end = buf + MIN (fstream->priv->buf->len - boundary_length, length);
- for (p = buf; p <= end; p++) {
- if (*p == *(guint8*)boundary &&
- !memcmp (p, boundary, boundary_length)) {
-@@ -271,10 +272,9 @@ soup_filter_input_stream_read_until (SoupFilterInputSt
- if (!*got_boundary && fstream->priv->buf->len < length && !eof)
- goto fill_buffer;
-
-- /* Return everything up to 'p' (which is either just after the boundary if
-- * include_boundary is TRUE, just before the boundary if include_boundary is
-- * FALSE, @boundary_len - 1 bytes before the end of the buffer, or end-of-
-- * file).
-- */
-- return read_from_buf (fstream, buffer, p - buf);
-+ if (eof && !*got_boundary)
-+ read_length = MIN (fstream->priv->buf->len, length);
-+ else
-+ read_length = p - buf;
-+ return read_from_buf (fstream, buffer, read_length);
- }
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index 46279573fcc6..03d2654a6ca5 100644
--- a/devel/libsoup/pkg-plist
+++ b/devel/libsoup/pkg-plist
@@ -98,7 +98,6 @@ share/gtk-doc/html/libsoup-%%VERSION%%/ch04.html
share/gtk-doc/html/libsoup-%%VERSION%%/ch05.html
share/gtk-doc/html/libsoup-%%VERSION%%/home.png
share/gtk-doc/html/libsoup-%%VERSION%%/index.html
-share/gtk-doc/html/libsoup-%%VERSION%%/index.sgml
share/gtk-doc/html/libsoup-%%VERSION%%/ix01.html
share/gtk-doc/html/libsoup-%%VERSION%%/left-insensitive.png
share/gtk-doc/html/libsoup-%%VERSION%%/left.png
@@ -142,10 +141,12 @@ share/locale/eu/LC_MESSAGES/libsoup.mo
share/locale/fa/LC_MESSAGES/libsoup.mo
share/locale/fr/LC_MESSAGES/libsoup.mo
share/locale/fur/LC_MESSAGES/libsoup.mo
+share/locale/gd/LC_MESSAGES/libsoup.mo
share/locale/gl/LC_MESSAGES/libsoup.mo
share/locale/gu/LC_MESSAGES/libsoup.mo
share/locale/he/LC_MESSAGES/libsoup.mo
share/locale/hi/LC_MESSAGES/libsoup.mo
+share/locale/hr/LC_MESSAGES/libsoup.mo
share/locale/hu/LC_MESSAGES/libsoup.mo
share/locale/id/LC_MESSAGES/libsoup.mo
share/locale/it/LC_MESSAGES/libsoup.mo
@@ -157,6 +158,7 @@ share/locale/lv/LC_MESSAGES/libsoup.mo
share/locale/ml/LC_MESSAGES/libsoup.mo
share/locale/mr/LC_MESSAGES/libsoup.mo
share/locale/nb/LC_MESSAGES/libsoup.mo
+share/locale/ne/LC_MESSAGES/libsoup.mo
share/locale/nl/LC_MESSAGES/libsoup.mo
share/locale/oc/LC_MESSAGES/libsoup.mo
share/locale/or/LC_MESSAGES/libsoup.mo
diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile
index da4e943051d9..112e52e01417 100644
--- a/devel/mm-common/Makefile
+++ b/devel/mm-common/Makefile
@@ -1,15 +1,17 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/devel/mm-common/Makefile 19953 2014-10-15 08:51:31Z gusi $
PORTNAME= mm-common
-PORTVERSION= 0.9.9
+PORTVERSION= 0.9.12
CATEGORIES= devel gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Common build infrastructure for the GNOME C++ binding libraries
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= libcurl.so:ftp/curl
USES= gmake pathfix tar:xz
diff --git a/devel/mm-common/distinfo b/devel/mm-common/distinfo
index eadab227e3fd..1671b14fc5ef 100644
--- a/devel/mm-common/distinfo
+++ b/devel/mm-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491087794
-SHA256 (mm-common-0.9.9.tar.xz) = 9d00bc77e77794e0bd2ae68132c4b4136aa115d255e34b310f7449b29db50b7a
-SIZE (mm-common-0.9.9.tar.xz) = 264156
+TIMESTAMP = 1525590628
+SHA256 (mm-common-0.9.12.tar.xz) = ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b
+SIZE (mm-common-0.9.12.tar.xz) = 304588
diff --git a/devel/mm-common/pkg-plist b/devel/mm-common/pkg-plist
index 672054dbc568..c7793d632d6b 100644
--- a/devel/mm-common/pkg-plist
+++ b/devel/mm-common/pkg-plist
@@ -1,6 +1,7 @@
bin/mm-common-prepare
libdata/pkgconfig/mm-common-util.pc
man/man1/mm-common-prepare.1.gz
+share/aclocal/mm-ax_cxx_compile_stdcxx.m4
share/aclocal/mm-ax_cxx_compile_stdcxx_11.m4
share/aclocal/mm-common.m4
share/aclocal/mm-dietlib.m4
diff --git a/devel/py-gobject3/pkg-plist b/devel/py-gobject3/pkg-plist
index 40b8fc717ec7..fb9eed5429d9 100644
--- a/devel/py-gobject3/pkg-plist
+++ b/devel/py-gobject3/pkg-plist
@@ -1,78 +1,78 @@
%%PYTHON_SITELIBDIR%%/gi/__init__.py
%%PYTHON_SITELIBDIR%%/gi/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gi/_error.py
-%%PYTHON_SITELIBDIR%%/gi/_error.pyc
-%%PYTHON_SITELIBDIR%%/gi/_error.pyo
+%%PYTHON_SITELIBDIR%%/gi/__init__.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/_constants.py
%%PYTHON_SITELIBDIR%%/gi/_constants.pyc
-%%PYTHON_SITELIBDIR%%/gi/_constants.pyo
+%%PYTHON_SITELIBDIR%%/gi/_constants.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/_error.py
+%%PYTHON_SITELIBDIR%%/gi/_error.pyc
+%%PYTHON_SITELIBDIR%%/gi/_error.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/_gi.so
%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so
-%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyo
%%PYTHON_SITELIBDIR%%/gi/_option.py
%%PYTHON_SITELIBDIR%%/gi/_option.pyc
-%%PYTHON_SITELIBDIR%%/gi/_option.pyo
+%%PYTHON_SITELIBDIR%%/gi/_option.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/_ossighelper.py
+%%PYTHON_SITELIBDIR%%/gi/_ossighelper.pyc
+%%PYTHON_SITELIBDIR%%/gi/_ossighelper.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py
%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.pyc
-%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.pyo
+%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py
%%PYTHON_SITELIBDIR%%/gi/_signalhelper.pyc
-%%PYTHON_SITELIBDIR%%/gi/_signalhelper.pyo
+%%PYTHON_SITELIBDIR%%/gi/_signalhelper.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/docstring.py
%%PYTHON_SITELIBDIR%%/gi/docstring.pyc
-%%PYTHON_SITELIBDIR%%/gi/docstring.pyo
+%%PYTHON_SITELIBDIR%%/gi/docstring.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/importer.py
%%PYTHON_SITELIBDIR%%/gi/importer.pyc
-%%PYTHON_SITELIBDIR%%/gi/importer.pyo
+%%PYTHON_SITELIBDIR%%/gi/importer.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/module.py
%%PYTHON_SITELIBDIR%%/gi/module.pyc
-%%PYTHON_SITELIBDIR%%/gi/module.pyo
+%%PYTHON_SITELIBDIR%%/gi/module.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py
%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py
%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py
%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py
%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py
%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py
%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.pyc
-%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.pyo
+%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py
%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gi/repository/__init__.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/types.py
%%PYTHON_SITELIBDIR%%/gi/types.pyc
-%%PYTHON_SITELIBDIR%%/gi/types.pyo
-%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%-%%OPSYS%%-%%UNAME_R%%-%%UNAME_M%%.egg-info
+%%PYTHON_SITELIBDIR%%/gi/types.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%.egg-info
%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py
%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py
%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.pyo
+%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyo
+%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.%%PYTHON_PYOEXTENSION%%
diff --git a/devel/py-gobject3/pkg-plist-py3 b/devel/py-gobject3/pkg-plist-py3
index 210fa58ba17c..d58ea474cd95 100644
--- a/devel/py-gobject3/pkg-plist-py3
+++ b/devel/py-gobject3/pkg-plist-py3
@@ -1,34 +1,34 @@
%%PYTHON_SITELIBDIR%%/gi/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_ossighelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_ossighelper.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/_constants.py
%%PYTHON_SITELIBDIR%%/gi/_error.py
%%PYTHON_SITELIBDIR%%/gi/_gi.so
%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so
-%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gi/_option.py
+%%PYTHON_SITELIBDIR%%/gi/_ossighelper.py
%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py
%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py
%%PYTHON_SITELIBDIR%%/gi/docstring.py
@@ -42,37 +42,37 @@
%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py
%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py
%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py
%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py
%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/types.py
-%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%-%%OPSYS%%-%%UNAME_R%%-%%UNAME_M%%.egg-info
+%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%.egg-info
%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py
%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index 931f8479898e..3cc70b9c4a6d 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -2,14 +2,14 @@
# $FreeBSD$
PORTNAME= gobject
-PORTVERSION= 3.18.2
+PORTVERSION= 3.28.3
PORTREVISION= 0
CATEGORIES= devel python
MASTER_SITES= GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX?= py
PKGNAMESUFFIX?= 3-common
DISTNAME= pygobject-${PORTVERSION}
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Common files for the Python bindings for GObject
@@ -50,8 +50,8 @@ do-install:
.else
PORTSCOUT= ignore:1
-USES+= gnome
-USE_GNOME+= glib20 introspection
+USES+= gettext-runtime gnome
+USE_GNOME+= cairo glib20 introspection
LIB_DEPENDS+= libffi.so:devel/libffi
RUN_DEPENDS+= pygobject3-common>=0:devel/pygobject3-common
diff --git a/devel/pygobject3-common/distinfo b/devel/pygobject3-common/distinfo
index 8abc26274c2e..66dc442b8988 100644
--- a/devel/pygobject3-common/distinfo
+++ b/devel/pygobject3-common/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/pygobject-3.18.2.tar.xz) = 2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f
-SIZE (gnome3/pygobject-3.18.2.tar.xz) = 730220
+TIMESTAMP = 1527917161
+SHA256 (gnome/pygobject-3.28.3.tar.xz) = 3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0
+SIZE (gnome/pygobject-3.28.3.tar.xz) = 1005368
diff --git a/devel/template-glib/Makefile b/devel/template-glib/Makefile
new file mode 100644
index 000000000000..f05cae09c24e
--- /dev/null
+++ b/devel/template-glib/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= template-glib
+PORTVERSION= 3.28.0
+CATEGORIES= devel
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Templating library for GLib
+
+BUILD_DEPENDS= valac:lang/vala
+
+USES= bison gettext gnome meson pkgconfig tar:xz
+USE_GNOME= glib20 introspection
+
+.include <bsd.port.mk>
diff --git a/devel/template-glib/distinfo b/devel/template-glib/distinfo
new file mode 100644
index 000000000000..5e33a94e5d9f
--- /dev/null
+++ b/devel/template-glib/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525968626
+SHA256 (template-glib-3.28.0.tar.xz) = 6c74426efd4358fd91a52c32ed030c0cad1633f900fd55ac81a8b3e4026171a1
+SIZE (template-glib-3.28.0.tar.xz) = 54320
diff --git a/devel/template-glib/pkg-descr b/devel/template-glib/pkg-descr
new file mode 100644
index 000000000000..ac1d834bcde6
--- /dev/null
+++ b/devel/template-glib/pkg-descr
@@ -0,0 +1,7 @@
+Template-GLib is a templating library for GLib.
+
+It includes a simple template format along with integration into
+GObject-Introspection for properties and methods. It separates the parsing
+of templates and the expansion of templates for faster expansion. You can
+also define scope, custom functions, and more with the embedded expression
+language.
diff --git a/devel/template-glib/pkg-plist b/devel/template-glib/pkg-plist
new file mode 100644
index 000000000000..5ce51a49ee27
--- /dev/null
+++ b/devel/template-glib/pkg-plist
@@ -0,0 +1,33 @@
+include/template-glib-1.0/tmpl-debug.h
+include/template-glib-1.0/tmpl-enums.h
+include/template-glib-1.0/tmpl-error.h
+include/template-glib-1.0/tmpl-expr-types.h
+include/template-glib-1.0/tmpl-expr.h
+include/template-glib-1.0/tmpl-glib.h
+include/template-glib-1.0/tmpl-scope.h
+include/template-glib-1.0/tmpl-symbol.h
+include/template-glib-1.0/tmpl-template-locator.h
+include/template-glib-1.0/tmpl-template.h
+include/template-glib-1.0/tmpl-version-macros.h
+include/template-glib-1.0/tmpl-version.h
+lib/girepository-1.0/Template-1.0.typelib
+lib/libtemplate_glib-1.0.so
+lib/libtemplate_glib-1.0.so.0
+lib/libtemplate_glib-1.0.so.0.2800.0
+libdata/pkgconfig/template-glib-1.0.pc
+share/gir-1.0/Template-1.0.gir
+share/locale/cs/LC_MESSAGES/template-glib.mo
+share/locale/de/LC_MESSAGES/template-glib.mo
+share/locale/el/LC_MESSAGES/template-glib.mo
+share/locale/es/LC_MESSAGES/template-glib.mo
+share/locale/fur/LC_MESSAGES/template-glib.mo
+share/locale/hu/LC_MESSAGES/template-glib.mo
+share/locale/id/LC_MESSAGES/template-glib.mo
+share/locale/pl/LC_MESSAGES/template-glib.mo
+share/locale/pt/LC_MESSAGES/template-glib.mo
+share/locale/pt_BR/LC_MESSAGES/template-glib.mo
+share/locale/sl/LC_MESSAGES/template-glib.mo
+share/locale/sr/LC_MESSAGES/template-glib.mo
+share/locale/sv/LC_MESSAGES/template-glib.mo
+share/vala/vapi/template-glib-1.0.deps
+share/vala/vapi/template-glib-1.0.vapi
diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile
index 5127c23263b3..f4b46726a2d1 100644
--- a/devel/xfce4-vala/Makefile
+++ b/devel/xfce4-vala/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-vala
PORTVERSION= 4.10.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel xfce
MASTER_SITES= XFCE/src/bindings/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -19,6 +19,6 @@ GNU_CONFIGURE= yes
USES= pkgconfig gmake pathfix xfce tar:bzip2
USE_XFCE= panel
-CONFIGURE_ARGS= --with-vala-api=0.36
+CONFIGURE_ARGS= --with-vala-api=0.40
.include <bsd.port.mk>
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 1842d7da5937..7324a6867be4 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gedit-plugins
-PORTVERSION= 3.18.0
-PORTREVISION= 2
+PORTVERSION= 3.28.1
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,6 +10,9 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Plugins for GEdit 3
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= gedit>=0:editors/gedit \
valac:lang/vala \
itstool:textproc/itstool
@@ -21,14 +23,12 @@ RUN_DEPENDS= gedit>=0:editors/gedit
PORTSCOUT= limitw:1,even
-USES= compiler:c11 gettext gmake gnome libtool pathfix pkgconfig \
+USES= compiler:c11 gettext gmake gnome libtool localbase pathfix pkgconfig \
python:3.4+ tar:xz
+USE_GNOME= cairo gdkpixbuf2 gtk30 gtksourceview3 intlhack introspection
USE_CSTD= c11
-USE_GNOME= gtk30 gtksourceview3 intlhack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.gedit.plugins.drawspaces.gschema.xml \
@@ -41,7 +41,8 @@ RUN_DEPENDS+= py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
USE_GNOME+= vte3
CONFIGURE_ARGS+=--enable-python
-GLIB_SCHEMAS+= org.gnome.gedit.plugins.terminal.gschema.xml
+GLIB_SCHEMAS+= org.gnome.gedit.plugins.terminal.gschema.xml \
+ org.gnome.gedit.plugins.translate.gschema.xml
post-patch:
@${REINPLACE_CMD} -e 's| \\t\\r\\n\\f|[:space:]|g' \
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
index 96d7dadb5c67..08393b6828df 100644
--- a/editors/gedit-plugins/distinfo
+++ b/editors/gedit-plugins/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gedit-plugins-3.18.0.tar.xz) = e25249c0c2a057827bb4d4755a2359e1f9b4de288e0c4e201c6ef4f0e0e8c580
-SIZE (gnome3/gedit-plugins-3.18.0.tar.xz) = 1366868
+TIMESTAMP = 1525511676
+SHA256 (gnome3/gedit-plugins-3.28.1.tar.xz) = 222dfd7065d399f7eda48dce011b42cc7185cd058f523be1bbd7143980e01468
+SIZE (gnome3/gedit-plugins-3.28.1.tar.xz) = 1350468
diff --git a/editors/gedit-plugins/files/patch-py-compile b/editors/gedit-plugins/files/patch-py-compile
deleted file mode 100644
index e59b69ff5e9c..000000000000
--- a/editors/gedit-plugins/files/patch-py-compile
+++ /dev/null
@@ -1,64 +0,0 @@
---- py-compile.orig 2015-09-21 19:37:16.000000000 +0200
-+++ py-compile 2015-09-24 20:14:14.663916000 +0200
-@@ -3,8 +3,7 @@
-
- scriptversion=2011-06-08.12; # UTC
-
--# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009, 2011 Free
--# Software Foundation, Inc.
-+# Copyright (C) 2000-2013 Free Software Foundation, Inc.
-
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -37,7 +36,7 @@
- usage_error ()
- {
- echo "$me: $*" >&2
-- echo "Try \`$me --help' for more information." >&2
-+ echo "Try '$me --help' for more information." >&2
- exit 1
- }
-
-@@ -117,7 +116,7 @@
- fi
-
- $PYTHON -c "
--import sys, os, py_compile
-+import sys, os, py_compile, imp
-
- files = '''$files'''
-
-@@ -130,12 +129,19 @@
- continue
- sys.stdout.write(file)
- sys.stdout.flush()
-- py_compile.compile(filepath, filepath + 'c', path)
-+ if hasattr(imp, 'get_tag'):
-+ py_compile.compile(filepath, imp.cache_from_source(filepath), path)
-+ else:
-+ py_compile.compile(filepath, filepath + 'c', path)
- sys.stdout.write('\n')" || exit $?
-
- # this will fail for python < 1.5, but that doesn't matter ...
- $PYTHON -O -c "
--import sys, os, py_compile
-+import sys, os, py_compile, imp
-+
-+# pypy does not use .pyo optimization
-+if hasattr(sys, 'pypy_translation_info'):
-+ sys.exit(0)
-
- files = '''$files'''
- sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n')
-@@ -147,7 +153,10 @@
- continue
- sys.stdout.write(file)
- sys.stdout.flush()
-- py_compile.compile(filepath, filepath + 'o', path)
-+ if hasattr(imp, 'get_tag'):
-+ py_compile.compile(filepath, imp.cache_from_source(filepath, False), path)
-+ else:
-+ py_compile.compile(filepath, filepath + 'o', path)
- sys.stdout.write('\n')" 2>/dev/null || :
-
- # Local Variables:
diff --git a/editors/gedit-plugins/pkg-descr b/editors/gedit-plugins/pkg-descr
index 0ebb7cb3f367..7dc45808d94d 100644
--- a/editors/gedit-plugins/pkg-descr
+++ b/editors/gedit-plugins/pkg-descr
@@ -1 +1,3 @@
Various additional plug-ins for GEdit 3.
+
+WWW: https://wiki.gnome.org/Apps/Gedit/PluginsLists
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 7fe39e5c244e..dfe46de182da 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -1,26 +1,26 @@
-lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/bookmarks.plugin
lib/gedit/plugins/bracketcompletion.plugin
lib/gedit/plugins/bracketcompletion.py
lib/gedit/plugins/charmap.plugin
lib/gedit/plugins/charmap/__init__.py
-lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/charmap/panel.py
lib/gedit/plugins/codecomment.plugin
lib/gedit/plugins/codecomment.py
@@ -28,52 +28,52 @@ lib/gedit/plugins/colorpicker.plugin
lib/gedit/plugins/colorpicker.py
lib/gedit/plugins/colorschemer.plugin
lib/gedit/plugins/colorschemer/__init__.py
-lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/colorschemer/languages.py
lib/gedit/plugins/colorschemer/schemer.py
lib/gedit/plugins/commander.plugin
lib/gedit/plugins/commander/__init__.py
-lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/appactivatable.py
lib/gedit/plugins/commander/commands/__init__.py
-lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/commander/commands/accel_group.py
lib/gedit/plugins/commander/commands/completion.py
lib/gedit/plugins/commander/commands/exceptions.py
@@ -90,32 +90,32 @@ lib/gedit/plugins/commander/utils.py
lib/gedit/plugins/commander/windowactivatable.py
lib/gedit/plugins/dashboard.plugin
lib/gedit/plugins/dashboard/__init__.py
-lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/dashboard/dashboard.py
lib/gedit/plugins/dashboard/utils.py
lib/gedit/plugins/drawspaces.plugin
lib/gedit/plugins/findinfiles.plugin
lib/gedit/plugins/git.plugin
lib/gedit/plugins/git/__init__.py
-lib/gedit/plugins/git/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/git/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/git/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/git/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/diffrenderer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/git/__pycache__/diffrenderer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/diffrenderer.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/git/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/git/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/git/appactivatable.py
lib/gedit/plugins/git/debug.py
lib/gedit/plugins/git/diffrenderer.py
@@ -132,16 +132,16 @@ lib/gedit/plugins/libwordcompletion.so
lib/gedit/plugins/libzeitgeist.so
lib/gedit/plugins/multiedit.plugin
lib/gedit/plugins/multiedit/__init__.py
-lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/multiedit/appactivatable.py
lib/gedit/plugins/multiedit/signals.py
lib/gedit/plugins/multiedit/viewactivatable.py
@@ -150,26 +150,43 @@ lib/gedit/plugins/smartspaces.plugin
lib/gedit/plugins/smartspaces.py
lib/gedit/plugins/synctex.plugin
lib/gedit/plugins/synctex/__init__.py
-lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/synctex/evince_dbus.py
lib/gedit/plugins/synctex/synctex.py
lib/gedit/plugins/terminal.plugin
lib/gedit/plugins/terminal.py
lib/gedit/plugins/textsize.plugin
lib/gedit/plugins/textsize/__init__.py
-lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/textsize/signals.py
lib/gedit/plugins/textsize/viewactivatable.py
+lib/gedit/plugins/translate.plugin
+lib/gedit/plugins/translate/__init__.py
+lib/gedit/plugins/translate/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/translate/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/translate/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/translate/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/translate/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/translate/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/translate/__pycache__/translateview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/translate/__pycache__/translateview.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/translate/preferences.py
+lib/gedit/plugins/translate/services/apertium.py
+lib/gedit/plugins/translate/services/service.py
+lib/gedit/plugins/translate/services/services.py
+lib/gedit/plugins/translate/services/yandex.py
+lib/gedit/plugins/translate/settings.py
+lib/gedit/plugins/translate/translateview.py
lib/gedit/plugins/wordcompletion.plugin
lib/gedit/plugins/zeitgeist.plugin
share/appdata/gedit-bookmarks.metainfo.xml
@@ -189,44 +206,45 @@ share/appdata/gedit-smartspaces.metainfo.xml
share/appdata/gedit-synctex.metainfo.xml
share/appdata/gedit-terminal.metainfo.xml
share/appdata/gedit-textsize.metainfo.xml
+share/appdata/gedit-translate.metainfo.xml
share/appdata/gedit-wordcompletion.metainfo.xml
share/appdata/gedit-zeitgeist.metainfo.xml
share/gedit/plugins/colorschemer/ui/schemer.ui
-share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/align.py
share/gedit/plugins/commander/modules/bookmark.py
share/gedit/plugins/commander/modules/doc.py
share/gedit/plugins/commander/modules/edit.py
share/gedit/plugins/commander/modules/find/__init__.py
-share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYTHON_SUFFIX%%.pyc
share/gedit/plugins/commander/modules/find/finder.py
share/gedit/plugins/commander/modules/find/regex.py
share/gedit/plugins/commander/modules/format.py
@@ -237,10 +255,10 @@ share/gedit/plugins/commander/modules/move.py
share/gedit/plugins/commander/modules/reload.py
share/gedit/plugins/commander/modules/set.py
share/gedit/plugins/commander/modules/shell.py
+share/gedit/plugins/translate/ui/preferences.ui
share/help/C/gedit/bookmarks.page
share/help/C/gedit/bracket-comp.page
share/help/C/gedit/character-map.page
-share/help/C/gedit/code-assistance.page
share/help/C/gedit/code-comment.page
share/help/C/gedit/color-picker.page
share/help/C/gedit/commander.page
@@ -250,15 +268,14 @@ share/help/C/gedit/git.page
share/help/C/gedit/join-split-lines.page
share/help/C/gedit/legal-plugins.xml
share/help/C/gedit/multi-edit.page
-share/help/C/gedit/session-saver.page
share/help/C/gedit/terminal.page
share/help/C/gedit/text-size.page
+share/help/C/gedit/translate.page
share/help/C/gedit/word-completion.page
share/help/C/gedit/zeitgeist-dataprovider.page
share/help/ar/gedit/bookmarks.page
share/help/ar/gedit/bracket-comp.page
share/help/ar/gedit/character-map.page
-share/help/ar/gedit/code-assistance.page
share/help/ar/gedit/code-comment.page
share/help/ar/gedit/color-picker.page
share/help/ar/gedit/commander.page
@@ -268,15 +285,14 @@ share/help/ar/gedit/git.page
share/help/ar/gedit/join-split-lines.page
share/help/ar/gedit/legal-plugins.xml
share/help/ar/gedit/multi-edit.page
-share/help/ar/gedit/session-saver.page
share/help/ar/gedit/terminal.page
share/help/ar/gedit/text-size.page
+share/help/ar/gedit/translate.page
share/help/ar/gedit/word-completion.page
share/help/ar/gedit/zeitgeist-dataprovider.page
share/help/bg/gedit/bookmarks.page
share/help/bg/gedit/bracket-comp.page
share/help/bg/gedit/character-map.page
-share/help/bg/gedit/code-assistance.page
share/help/bg/gedit/code-comment.page
share/help/bg/gedit/color-picker.page
share/help/bg/gedit/commander.page
@@ -286,15 +302,14 @@ share/help/bg/gedit/git.page
share/help/bg/gedit/join-split-lines.page
share/help/bg/gedit/legal-plugins.xml
share/help/bg/gedit/multi-edit.page
-share/help/bg/gedit/session-saver.page
share/help/bg/gedit/terminal.page
share/help/bg/gedit/text-size.page
+share/help/bg/gedit/translate.page
share/help/bg/gedit/word-completion.page
share/help/bg/gedit/zeitgeist-dataprovider.page
share/help/ca/gedit/bookmarks.page
share/help/ca/gedit/bracket-comp.page
share/help/ca/gedit/character-map.page
-share/help/ca/gedit/code-assistance.page
share/help/ca/gedit/code-comment.page
share/help/ca/gedit/color-picker.page
share/help/ca/gedit/commander.page
@@ -304,15 +319,14 @@ share/help/ca/gedit/git.page
share/help/ca/gedit/join-split-lines.page
share/help/ca/gedit/legal-plugins.xml
share/help/ca/gedit/multi-edit.page
-share/help/ca/gedit/session-saver.page
share/help/ca/gedit/terminal.page
share/help/ca/gedit/text-size.page
+share/help/ca/gedit/translate.page
share/help/ca/gedit/word-completion.page
share/help/ca/gedit/zeitgeist-dataprovider.page
share/help/cs/gedit/bookmarks.page
share/help/cs/gedit/bracket-comp.page
share/help/cs/gedit/character-map.page
-share/help/cs/gedit/code-assistance.page
share/help/cs/gedit/code-comment.page
share/help/cs/gedit/color-picker.page
share/help/cs/gedit/commander.page
@@ -322,15 +336,14 @@ share/help/cs/gedit/git.page
share/help/cs/gedit/join-split-lines.page
share/help/cs/gedit/legal-plugins.xml
share/help/cs/gedit/multi-edit.page
-share/help/cs/gedit/session-saver.page
share/help/cs/gedit/terminal.page
share/help/cs/gedit/text-size.page
+share/help/cs/gedit/translate.page
share/help/cs/gedit/word-completion.page
share/help/cs/gedit/zeitgeist-dataprovider.page
share/help/da/gedit/bookmarks.page
share/help/da/gedit/bracket-comp.page
share/help/da/gedit/character-map.page
-share/help/da/gedit/code-assistance.page
share/help/da/gedit/code-comment.page
share/help/da/gedit/color-picker.page
share/help/da/gedit/commander.page
@@ -340,15 +353,14 @@ share/help/da/gedit/git.page
share/help/da/gedit/join-split-lines.page
share/help/da/gedit/legal-plugins.xml
share/help/da/gedit/multi-edit.page
-share/help/da/gedit/session-saver.page
share/help/da/gedit/terminal.page
share/help/da/gedit/text-size.page
+share/help/da/gedit/translate.page
share/help/da/gedit/word-completion.page
share/help/da/gedit/zeitgeist-dataprovider.page
share/help/de/gedit/bookmarks.page
share/help/de/gedit/bracket-comp.page
share/help/de/gedit/character-map.page
-share/help/de/gedit/code-assistance.page
share/help/de/gedit/code-comment.page
share/help/de/gedit/color-picker.page
share/help/de/gedit/commander.page
@@ -358,15 +370,14 @@ share/help/de/gedit/git.page
share/help/de/gedit/join-split-lines.page
share/help/de/gedit/legal-plugins.xml
share/help/de/gedit/multi-edit.page
-share/help/de/gedit/session-saver.page
share/help/de/gedit/terminal.page
share/help/de/gedit/text-size.page
+share/help/de/gedit/translate.page
share/help/de/gedit/word-completion.page
share/help/de/gedit/zeitgeist-dataprovider.page
share/help/el/gedit/bookmarks.page
share/help/el/gedit/bracket-comp.page
share/help/el/gedit/character-map.page
-share/help/el/gedit/code-assistance.page
share/help/el/gedit/code-comment.page
share/help/el/gedit/color-picker.page
share/help/el/gedit/commander.page
@@ -376,15 +387,14 @@ share/help/el/gedit/git.page
share/help/el/gedit/join-split-lines.page
share/help/el/gedit/legal-plugins.xml
share/help/el/gedit/multi-edit.page
-share/help/el/gedit/session-saver.page
share/help/el/gedit/terminal.page
share/help/el/gedit/text-size.page
+share/help/el/gedit/translate.page
share/help/el/gedit/word-completion.page
share/help/el/gedit/zeitgeist-dataprovider.page
share/help/es/gedit/bookmarks.page
share/help/es/gedit/bracket-comp.page
share/help/es/gedit/character-map.page
-share/help/es/gedit/code-assistance.page
share/help/es/gedit/code-comment.page
share/help/es/gedit/color-picker.page
share/help/es/gedit/commander.page
@@ -394,15 +404,14 @@ share/help/es/gedit/git.page
share/help/es/gedit/join-split-lines.page
share/help/es/gedit/legal-plugins.xml
share/help/es/gedit/multi-edit.page
-share/help/es/gedit/session-saver.page
share/help/es/gedit/terminal.page
share/help/es/gedit/text-size.page
+share/help/es/gedit/translate.page
share/help/es/gedit/word-completion.page
share/help/es/gedit/zeitgeist-dataprovider.page
share/help/eu/gedit/bookmarks.page
share/help/eu/gedit/bracket-comp.page
share/help/eu/gedit/character-map.page
-share/help/eu/gedit/code-assistance.page
share/help/eu/gedit/code-comment.page
share/help/eu/gedit/color-picker.page
share/help/eu/gedit/commander.page
@@ -412,15 +421,14 @@ share/help/eu/gedit/git.page
share/help/eu/gedit/join-split-lines.page
share/help/eu/gedit/legal-plugins.xml
share/help/eu/gedit/multi-edit.page
-share/help/eu/gedit/session-saver.page
share/help/eu/gedit/terminal.page
share/help/eu/gedit/text-size.page
+share/help/eu/gedit/translate.page
share/help/eu/gedit/word-completion.page
share/help/eu/gedit/zeitgeist-dataprovider.page
share/help/fi/gedit/bookmarks.page
share/help/fi/gedit/bracket-comp.page
share/help/fi/gedit/character-map.page
-share/help/fi/gedit/code-assistance.page
share/help/fi/gedit/code-comment.page
share/help/fi/gedit/color-picker.page
share/help/fi/gedit/commander.page
@@ -430,15 +438,14 @@ share/help/fi/gedit/git.page
share/help/fi/gedit/join-split-lines.page
share/help/fi/gedit/legal-plugins.xml
share/help/fi/gedit/multi-edit.page
-share/help/fi/gedit/session-saver.page
share/help/fi/gedit/terminal.page
share/help/fi/gedit/text-size.page
+share/help/fi/gedit/translate.page
share/help/fi/gedit/word-completion.page
share/help/fi/gedit/zeitgeist-dataprovider.page
share/help/fr/gedit/bookmarks.page
share/help/fr/gedit/bracket-comp.page
share/help/fr/gedit/character-map.page
-share/help/fr/gedit/code-assistance.page
share/help/fr/gedit/code-comment.page
share/help/fr/gedit/color-picker.page
share/help/fr/gedit/commander.page
@@ -448,15 +455,14 @@ share/help/fr/gedit/git.page
share/help/fr/gedit/join-split-lines.page
share/help/fr/gedit/legal-plugins.xml
share/help/fr/gedit/multi-edit.page
-share/help/fr/gedit/session-saver.page
share/help/fr/gedit/terminal.page
share/help/fr/gedit/text-size.page
+share/help/fr/gedit/translate.page
share/help/fr/gedit/word-completion.page
share/help/fr/gedit/zeitgeist-dataprovider.page
share/help/gl/gedit/bookmarks.page
share/help/gl/gedit/bracket-comp.page
share/help/gl/gedit/character-map.page
-share/help/gl/gedit/code-assistance.page
share/help/gl/gedit/code-comment.page
share/help/gl/gedit/color-picker.page
share/help/gl/gedit/commander.page
@@ -466,15 +472,14 @@ share/help/gl/gedit/git.page
share/help/gl/gedit/join-split-lines.page
share/help/gl/gedit/legal-plugins.xml
share/help/gl/gedit/multi-edit.page
-share/help/gl/gedit/session-saver.page
share/help/gl/gedit/terminal.page
share/help/gl/gedit/text-size.page
+share/help/gl/gedit/translate.page
share/help/gl/gedit/word-completion.page
share/help/gl/gedit/zeitgeist-dataprovider.page
share/help/hu/gedit/bookmarks.page
share/help/hu/gedit/bracket-comp.page
share/help/hu/gedit/character-map.page
-share/help/hu/gedit/code-assistance.page
share/help/hu/gedit/code-comment.page
share/help/hu/gedit/color-picker.page
share/help/hu/gedit/commander.page
@@ -484,15 +489,14 @@ share/help/hu/gedit/git.page
share/help/hu/gedit/join-split-lines.page
share/help/hu/gedit/legal-plugins.xml
share/help/hu/gedit/multi-edit.page
-share/help/hu/gedit/session-saver.page
share/help/hu/gedit/terminal.page
share/help/hu/gedit/text-size.page
+share/help/hu/gedit/translate.page
share/help/hu/gedit/word-completion.page
share/help/hu/gedit/zeitgeist-dataprovider.page
share/help/it/gedit/bookmarks.page
share/help/it/gedit/bracket-comp.page
share/help/it/gedit/character-map.page
-share/help/it/gedit/code-assistance.page
share/help/it/gedit/code-comment.page
share/help/it/gedit/color-picker.page
share/help/it/gedit/commander.page
@@ -502,15 +506,14 @@ share/help/it/gedit/git.page
share/help/it/gedit/join-split-lines.page
share/help/it/gedit/legal-plugins.xml
share/help/it/gedit/multi-edit.page
-share/help/it/gedit/session-saver.page
share/help/it/gedit/terminal.page
share/help/it/gedit/text-size.page
+share/help/it/gedit/translate.page
share/help/it/gedit/word-completion.page
share/help/it/gedit/zeitgeist-dataprovider.page
share/help/ja/gedit/bookmarks.page
share/help/ja/gedit/bracket-comp.page
share/help/ja/gedit/character-map.page
-share/help/ja/gedit/code-assistance.page
share/help/ja/gedit/code-comment.page
share/help/ja/gedit/color-picker.page
share/help/ja/gedit/commander.page
@@ -520,15 +523,14 @@ share/help/ja/gedit/git.page
share/help/ja/gedit/join-split-lines.page
share/help/ja/gedit/legal-plugins.xml
share/help/ja/gedit/multi-edit.page
-share/help/ja/gedit/session-saver.page
share/help/ja/gedit/terminal.page
share/help/ja/gedit/text-size.page
+share/help/ja/gedit/translate.page
share/help/ja/gedit/word-completion.page
share/help/ja/gedit/zeitgeist-dataprovider.page
share/help/ko/gedit/bookmarks.page
share/help/ko/gedit/bracket-comp.page
share/help/ko/gedit/character-map.page
-share/help/ko/gedit/code-assistance.page
share/help/ko/gedit/code-comment.page
share/help/ko/gedit/color-picker.page
share/help/ko/gedit/commander.page
@@ -538,15 +540,14 @@ share/help/ko/gedit/git.page
share/help/ko/gedit/join-split-lines.page
share/help/ko/gedit/legal-plugins.xml
share/help/ko/gedit/multi-edit.page
-share/help/ko/gedit/session-saver.page
share/help/ko/gedit/terminal.page
share/help/ko/gedit/text-size.page
+share/help/ko/gedit/translate.page
share/help/ko/gedit/word-completion.page
share/help/ko/gedit/zeitgeist-dataprovider.page
share/help/lv/gedit/bookmarks.page
share/help/lv/gedit/bracket-comp.page
share/help/lv/gedit/character-map.page
-share/help/lv/gedit/code-assistance.page
share/help/lv/gedit/code-comment.page
share/help/lv/gedit/color-picker.page
share/help/lv/gedit/commander.page
@@ -556,15 +557,14 @@ share/help/lv/gedit/git.page
share/help/lv/gedit/join-split-lines.page
share/help/lv/gedit/legal-plugins.xml
share/help/lv/gedit/multi-edit.page
-share/help/lv/gedit/session-saver.page
share/help/lv/gedit/terminal.page
share/help/lv/gedit/text-size.page
+share/help/lv/gedit/translate.page
share/help/lv/gedit/word-completion.page
share/help/lv/gedit/zeitgeist-dataprovider.page
share/help/oc/gedit/bookmarks.page
share/help/oc/gedit/bracket-comp.page
share/help/oc/gedit/character-map.page
-share/help/oc/gedit/code-assistance.page
share/help/oc/gedit/code-comment.page
share/help/oc/gedit/color-picker.page
share/help/oc/gedit/commander.page
@@ -574,15 +574,31 @@ share/help/oc/gedit/git.page
share/help/oc/gedit/join-split-lines.page
share/help/oc/gedit/legal-plugins.xml
share/help/oc/gedit/multi-edit.page
-share/help/oc/gedit/session-saver.page
share/help/oc/gedit/terminal.page
share/help/oc/gedit/text-size.page
+share/help/oc/gedit/translate.page
share/help/oc/gedit/word-completion.page
share/help/oc/gedit/zeitgeist-dataprovider.page
+share/help/pl/gedit/bookmarks.page
+share/help/pl/gedit/bracket-comp.page
+share/help/pl/gedit/character-map.page
+share/help/pl/gedit/code-comment.page
+share/help/pl/gedit/color-picker.page
+share/help/pl/gedit/commander.page
+share/help/pl/gedit/dashboard.page
+share/help/pl/gedit/draw-spaces.page
+share/help/pl/gedit/git.page
+share/help/pl/gedit/join-split-lines.page
+share/help/pl/gedit/legal-plugins.xml
+share/help/pl/gedit/multi-edit.page
+share/help/pl/gedit/terminal.page
+share/help/pl/gedit/text-size.page
+share/help/pl/gedit/translate.page
+share/help/pl/gedit/word-completion.page
+share/help/pl/gedit/zeitgeist-dataprovider.page
share/help/pt_BR/gedit/bookmarks.page
share/help/pt_BR/gedit/bracket-comp.page
share/help/pt_BR/gedit/character-map.page
-share/help/pt_BR/gedit/code-assistance.page
share/help/pt_BR/gedit/code-comment.page
share/help/pt_BR/gedit/color-picker.page
share/help/pt_BR/gedit/commander.page
@@ -592,15 +608,14 @@ share/help/pt_BR/gedit/git.page
share/help/pt_BR/gedit/join-split-lines.page
share/help/pt_BR/gedit/legal-plugins.xml
share/help/pt_BR/gedit/multi-edit.page
-share/help/pt_BR/gedit/session-saver.page
share/help/pt_BR/gedit/terminal.page
share/help/pt_BR/gedit/text-size.page
+share/help/pt_BR/gedit/translate.page
share/help/pt_BR/gedit/word-completion.page
share/help/pt_BR/gedit/zeitgeist-dataprovider.page
share/help/ru/gedit/bookmarks.page
share/help/ru/gedit/bracket-comp.page
share/help/ru/gedit/character-map.page
-share/help/ru/gedit/code-assistance.page
share/help/ru/gedit/code-comment.page
share/help/ru/gedit/color-picker.page
share/help/ru/gedit/commander.page
@@ -610,15 +625,14 @@ share/help/ru/gedit/git.page
share/help/ru/gedit/join-split-lines.page
share/help/ru/gedit/legal-plugins.xml
share/help/ru/gedit/multi-edit.page
-share/help/ru/gedit/session-saver.page
share/help/ru/gedit/terminal.page
share/help/ru/gedit/text-size.page
+share/help/ru/gedit/translate.page
share/help/ru/gedit/word-completion.page
share/help/ru/gedit/zeitgeist-dataprovider.page
share/help/sl/gedit/bookmarks.page
share/help/sl/gedit/bracket-comp.page
share/help/sl/gedit/character-map.page
-share/help/sl/gedit/code-assistance.page
share/help/sl/gedit/code-comment.page
share/help/sl/gedit/color-picker.page
share/help/sl/gedit/commander.page
@@ -628,15 +642,14 @@ share/help/sl/gedit/git.page
share/help/sl/gedit/join-split-lines.page
share/help/sl/gedit/legal-plugins.xml
share/help/sl/gedit/multi-edit.page
-share/help/sl/gedit/session-saver.page
share/help/sl/gedit/terminal.page
share/help/sl/gedit/text-size.page
+share/help/sl/gedit/translate.page
share/help/sl/gedit/word-completion.page
share/help/sl/gedit/zeitgeist-dataprovider.page
share/help/sv/gedit/bookmarks.page
share/help/sv/gedit/bracket-comp.page
share/help/sv/gedit/character-map.page
-share/help/sv/gedit/code-assistance.page
share/help/sv/gedit/code-comment.page
share/help/sv/gedit/color-picker.page
share/help/sv/gedit/commander.page
@@ -646,15 +659,14 @@ share/help/sv/gedit/git.page
share/help/sv/gedit/join-split-lines.page
share/help/sv/gedit/legal-plugins.xml
share/help/sv/gedit/multi-edit.page
-share/help/sv/gedit/session-saver.page
share/help/sv/gedit/terminal.page
share/help/sv/gedit/text-size.page
+share/help/sv/gedit/translate.page
share/help/sv/gedit/word-completion.page
share/help/sv/gedit/zeitgeist-dataprovider.page
share/help/te/gedit/bookmarks.page
share/help/te/gedit/bracket-comp.page
share/help/te/gedit/character-map.page
-share/help/te/gedit/code-assistance.page
share/help/te/gedit/code-comment.page
share/help/te/gedit/color-picker.page
share/help/te/gedit/commander.page
@@ -664,15 +676,14 @@ share/help/te/gedit/git.page
share/help/te/gedit/join-split-lines.page
share/help/te/gedit/legal-plugins.xml
share/help/te/gedit/multi-edit.page
-share/help/te/gedit/session-saver.page
share/help/te/gedit/terminal.page
share/help/te/gedit/text-size.page
+share/help/te/gedit/translate.page
share/help/te/gedit/word-completion.page
share/help/te/gedit/zeitgeist-dataprovider.page
share/help/th/gedit/bookmarks.page
share/help/th/gedit/bracket-comp.page
share/help/th/gedit/character-map.page
-share/help/th/gedit/code-assistance.page
share/help/th/gedit/code-comment.page
share/help/th/gedit/color-picker.page
share/help/th/gedit/commander.page
@@ -682,15 +693,14 @@ share/help/th/gedit/git.page
share/help/th/gedit/join-split-lines.page
share/help/th/gedit/legal-plugins.xml
share/help/th/gedit/multi-edit.page
-share/help/th/gedit/session-saver.page
share/help/th/gedit/terminal.page
share/help/th/gedit/text-size.page
+share/help/th/gedit/translate.page
share/help/th/gedit/word-completion.page
share/help/th/gedit/zeitgeist-dataprovider.page
share/help/uk/gedit/bookmarks.page
share/help/uk/gedit/bracket-comp.page
share/help/uk/gedit/character-map.page
-share/help/uk/gedit/code-assistance.page
share/help/uk/gedit/code-comment.page
share/help/uk/gedit/color-picker.page
share/help/uk/gedit/commander.page
@@ -700,15 +710,14 @@ share/help/uk/gedit/git.page
share/help/uk/gedit/join-split-lines.page
share/help/uk/gedit/legal-plugins.xml
share/help/uk/gedit/multi-edit.page
-share/help/uk/gedit/session-saver.page
share/help/uk/gedit/terminal.page
share/help/uk/gedit/text-size.page
+share/help/uk/gedit/translate.page
share/help/uk/gedit/word-completion.page
share/help/uk/gedit/zeitgeist-dataprovider.page
share/help/zh_CN/gedit/bookmarks.page
share/help/zh_CN/gedit/bracket-comp.page
share/help/zh_CN/gedit/character-map.page
-share/help/zh_CN/gedit/code-assistance.page
share/help/zh_CN/gedit/code-comment.page
share/help/zh_CN/gedit/color-picker.page
share/help/zh_CN/gedit/commander.page
@@ -718,15 +727,14 @@ share/help/zh_CN/gedit/git.page
share/help/zh_CN/gedit/join-split-lines.page
share/help/zh_CN/gedit/legal-plugins.xml
share/help/zh_CN/gedit/multi-edit.page
-share/help/zh_CN/gedit/session-saver.page
share/help/zh_CN/gedit/terminal.page
share/help/zh_CN/gedit/text-size.page
+share/help/zh_CN/gedit/translate.page
share/help/zh_CN/gedit/word-completion.page
share/help/zh_CN/gedit/zeitgeist-dataprovider.page
share/help/zh_HK/gedit/bookmarks.page
share/help/zh_HK/gedit/bracket-comp.page
share/help/zh_HK/gedit/character-map.page
-share/help/zh_HK/gedit/code-assistance.page
share/help/zh_HK/gedit/code-comment.page
share/help/zh_HK/gedit/color-picker.page
share/help/zh_HK/gedit/commander.page
@@ -736,15 +744,14 @@ share/help/zh_HK/gedit/git.page
share/help/zh_HK/gedit/join-split-lines.page
share/help/zh_HK/gedit/legal-plugins.xml
share/help/zh_HK/gedit/multi-edit.page
-share/help/zh_HK/gedit/session-saver.page
share/help/zh_HK/gedit/terminal.page
share/help/zh_HK/gedit/text-size.page
+share/help/zh_HK/gedit/translate.page
share/help/zh_HK/gedit/word-completion.page
share/help/zh_HK/gedit/zeitgeist-dataprovider.page
share/help/zh_TW/gedit/bookmarks.page
share/help/zh_TW/gedit/bracket-comp.page
share/help/zh_TW/gedit/character-map.page
-share/help/zh_TW/gedit/code-assistance.page
share/help/zh_TW/gedit/code-comment.page
share/help/zh_TW/gedit/color-picker.page
share/help/zh_TW/gedit/commander.page
@@ -754,9 +761,9 @@ share/help/zh_TW/gedit/git.page
share/help/zh_TW/gedit/join-split-lines.page
share/help/zh_TW/gedit/legal-plugins.xml
share/help/zh_TW/gedit/multi-edit.page
-share/help/zh_TW/gedit/session-saver.page
share/help/zh_TW/gedit/terminal.page
share/help/zh_TW/gedit/text-size.page
+share/help/zh_TW/gedit/translate.page
share/help/zh_TW/gedit/word-completion.page
share/help/zh_TW/gedit/zeitgeist-dataprovider.page
share/locale/af/LC_MESSAGES/gedit-plugins.mo
@@ -791,6 +798,7 @@ share/locale/eu/LC_MESSAGES/gedit-plugins.mo
share/locale/fa/LC_MESSAGES/gedit-plugins.mo
share/locale/fi/LC_MESSAGES/gedit-plugins.mo
share/locale/fr/LC_MESSAGES/gedit-plugins.mo
+share/locale/fur/LC_MESSAGES/gedit-plugins.mo
share/locale/ga/LC_MESSAGES/gedit-plugins.mo
share/locale/gl/LC_MESSAGES/gedit-plugins.mo
share/locale/gu/LC_MESSAGES/gedit-plugins.mo
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index eb5efb2e713c..c9286ba1ee3c 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= gedit
-PORTVERSION= 3.22.0
-PORTREVISION= 2
+PORTVERSION= 3.28.1
CATEGORIES= editors gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Small but powerful text editor for GNOME 3 Desktop Environment
@@ -29,7 +28,7 @@ RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
PORTSCOUT= limitw:1,even
USES= compiler:c11 desktop-file-utils gettext gmake gnome libtool \
- localbase pathfix pkgconfig python:3.2+ shebangfix tar:xz
+ localbase pathfix pkgconfig python:3.4+ shebangfix tar:xz
USE_CSTD= c11
USE_GNOME= cairo gdkpixbuf2 gtksourceview3 intlhack introspection \
libxml2 pygobject3
@@ -43,6 +42,7 @@ CPPFLAGS+= -Wno-error=format-nonliteral
CFLAGS+= -Wno-error=format-nonliteral
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
+SHEBANG_FILES= plugins/externaltools/data/send-to-fpaste.tool.in
PLIST_SUB= VERSION="3.14"
INSTALL_TARGET= install-strip
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 05aeb29a5f0d..5b9fcbf5e0bd 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476903361
-SHA256 (gnome3/gedit-3.22.0.tar.xz) = 063b5a0b5dcc8f540f6e8c3ea1c22cf8a3a19edffc25315a1b6bc51d462b3f45
-SIZE (gnome3/gedit-3.22.0.tar.xz) = 2957520
+TIMESTAMP = 1525511297
+SHA256 (gnome/gedit-3.28.1.tar.xz) = f174be0958ce63771fef9a81d06da6769358dab8705364a6abb5c7d10ec8211d
+SIZE (gnome/gedit-3.28.1.tar.xz) = 3149684
diff --git a/editors/gedit/pkg-descr b/editors/gedit/pkg-descr
index 8fa7597ad479..3f40c3455c3b 100644
--- a/editors/gedit/pkg-descr
+++ b/editors/gedit/pkg-descr
@@ -4,7 +4,7 @@ gEdit is a Gtk+ 3 text editor. Its features include:
* Global Search and Replace
* Dynamically loaded fonts
* Splitscreen Mode
- * Printing support
+ * Printing support
* Configurable Plugins system
* Unlimited Undo/Redo
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 9ca3d9e31364..c09a17748a39 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -22,26 +22,26 @@ lib/gedit/libgedit.so
lib/gedit/plugins/docinfo.plugin
lib/gedit/plugins/externaltools.plugin
lib/gedit/plugins/externaltools/__init__.py
-lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/externaltools/appactivatable.py
lib/gedit/plugins/externaltools/capture.py
lib/gedit/plugins/externaltools/filelookup.py
@@ -61,62 +61,62 @@ lib/gedit/plugins/libtime.so
lib/gedit/plugins/modelines.plugin
lib/gedit/plugins/pythonconsole.plugin
lib/gedit/plugins/pythonconsole/__init__.py
-lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/pythonconsole/config.py
lib/gedit/plugins/pythonconsole/console.py
lib/gedit/plugins/quickopen.plugin
lib/gedit/plugins/quickopen/__init__.py
-lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/quickopen/popup.py
lib/gedit/plugins/quickopen/virtualdirs.py
lib/gedit/plugins/snippets.plugin
lib/gedit/plugins/snippets/__init__.py
-lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
lib/gedit/plugins/snippets/appactivatable.py
lib/gedit/plugins/snippets/completion.py
lib/gedit/plugins/snippets/document.py
@@ -138,13 +138,12 @@ lib/gedit/plugins/sort.plugin
lib/gedit/plugins/spell.plugin
lib/gedit/plugins/time.plugin
%%PYTHON_SITELIBDIR%%/gi/overrides/Gedit.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYTHON_SUFFIX%%.pyc
libdata/pkgconfig/gedit.pc
libexec/gedit/gedit-bugreport.sh
man/man1/gedit.1.gz
share/GConf/gsettings/gedit.convert
-share/appdata/org.gnome.gedit.appdata.xml
share/applications/org.gnome.gedit.desktop
share/dbus-1/services/org.gnome.gedit.service
%%DATADIR%%/gir-1.0/Gedit-3.0.gir
@@ -184,16 +183,17 @@ share/dbus-1/services/org.gnome.gedit.service
%%DATADIR%%/plugins/snippets/ui/snippets.ui
%%DATADIR%%/plugins/snippets/xml.xml
%%DATADIR%%/plugins/snippets/xslt.xml
-share/gtk-doc/html/gedit/gedit-GeditApp.html
-share/gtk-doc/html/gedit/gedit-GeditAppActivatable.html
-share/gtk-doc/html/gedit/gedit-GeditDocument.html
-share/gtk-doc/html/gedit/gedit-GeditEncodingsComboBox.html
-share/gtk-doc/html/gedit/gedit-GeditMessage.html
-share/gtk-doc/html/gedit/gedit-GeditMessageBus.html
-share/gtk-doc/html/gedit/gedit-GeditProgressInfoBar.html
-share/gtk-doc/html/gedit/gedit-GeditStatusbar.html
-share/gtk-doc/html/gedit/gedit-GeditViewActivatable.html
-share/gtk-doc/html/gedit/gedit-GeditWindowActivatable.html
+share/gtk-doc/html/gedit/GeditApp.html
+share/gtk-doc/html/gedit/GeditAppActivatable.html
+share/gtk-doc/html/gedit/GeditDocument.html
+share/gtk-doc/html/gedit/GeditEncodingsComboBox.html
+share/gtk-doc/html/gedit/GeditMessage.html
+share/gtk-doc/html/gedit/GeditMessageBus.html
+share/gtk-doc/html/gedit/GeditProgressInfoBar.html
+share/gtk-doc/html/gedit/GeditStatusbar.html
+share/gtk-doc/html/gedit/GeditViewActivatable.html
+share/gtk-doc/html/gedit/GeditWindowActivatable.html
+share/gtk-doc/html/gedit/annotation-glossary.html
share/gtk-doc/html/gedit/api-index-3-14.html
share/gtk-doc/html/gedit/api-index-deprecated.html
share/gtk-doc/html/gedit/api-index-full.html
@@ -218,11 +218,6 @@ share/gtk-doc/html/gedit/up-insensitive.png
share/gtk-doc/html/gedit/up.png
share/help/C/gedit/figures/gedit-html-snippet.png
share/help/C/gedit/figures/gedit-icon.png
-share/help/C/gedit/figures/gedit-new-external-tool.png
-share/help/C/gedit/figures/gedit-open-location.png
-share/help/C/gedit/figures/gedit-side-pane1.png
-share/help/C/gedit/figures/gedit-side-pane2.png
-share/help/C/gedit/figures/gedit-side-pane3.png
share/help/C/gedit/figures/gedit3-screenshot.png
share/help/C/gedit/gedit-change-color-scheme.page
share/help/C/gedit/gedit-change-default-font.page
@@ -265,11 +260,6 @@ share/help/C/gedit/index.page
share/help/C/gedit/legal.xml
share/help/ar/gedit/figures/gedit-html-snippet.png
share/help/ar/gedit/figures/gedit-icon.png
-share/help/ar/gedit/figures/gedit-new-external-tool.png
-share/help/ar/gedit/figures/gedit-open-location.png
-share/help/ar/gedit/figures/gedit-side-pane1.png
-share/help/ar/gedit/figures/gedit-side-pane2.png
-share/help/ar/gedit/figures/gedit-side-pane3.png
share/help/ar/gedit/figures/gedit3-screenshot.png
share/help/ar/gedit/gedit-change-color-scheme.page
share/help/ar/gedit/gedit-change-default-font.page
@@ -312,11 +302,6 @@ share/help/ar/gedit/index.page
share/help/ar/gedit/legal.xml
share/help/bg/gedit/figures/gedit-html-snippet.png
share/help/bg/gedit/figures/gedit-icon.png
-share/help/bg/gedit/figures/gedit-new-external-tool.png
-share/help/bg/gedit/figures/gedit-open-location.png
-share/help/bg/gedit/figures/gedit-side-pane1.png
-share/help/bg/gedit/figures/gedit-side-pane2.png
-share/help/bg/gedit/figures/gedit-side-pane3.png
share/help/bg/gedit/figures/gedit3-screenshot.png
share/help/bg/gedit/gedit-change-color-scheme.page
share/help/bg/gedit/gedit-change-default-font.page
@@ -359,11 +344,6 @@ share/help/bg/gedit/index.page
share/help/bg/gedit/legal.xml
share/help/ca/gedit/figures/gedit-html-snippet.png
share/help/ca/gedit/figures/gedit-icon.png
-share/help/ca/gedit/figures/gedit-new-external-tool.png
-share/help/ca/gedit/figures/gedit-open-location.png
-share/help/ca/gedit/figures/gedit-side-pane1.png
-share/help/ca/gedit/figures/gedit-side-pane2.png
-share/help/ca/gedit/figures/gedit-side-pane3.png
share/help/ca/gedit/figures/gedit3-screenshot.png
share/help/ca/gedit/gedit-change-color-scheme.page
share/help/ca/gedit/gedit-change-default-font.page
@@ -406,11 +386,6 @@ share/help/ca/gedit/index.page
share/help/ca/gedit/legal.xml
share/help/cs/gedit/figures/gedit-html-snippet.png
share/help/cs/gedit/figures/gedit-icon.png
-share/help/cs/gedit/figures/gedit-new-external-tool.png
-share/help/cs/gedit/figures/gedit-open-location.png
-share/help/cs/gedit/figures/gedit-side-pane1.png
-share/help/cs/gedit/figures/gedit-side-pane2.png
-share/help/cs/gedit/figures/gedit-side-pane3.png
share/help/cs/gedit/figures/gedit3-screenshot.png
share/help/cs/gedit/gedit-change-color-scheme.page
share/help/cs/gedit/gedit-change-default-font.page
@@ -453,11 +428,6 @@ share/help/cs/gedit/index.page
share/help/cs/gedit/legal.xml
share/help/da/gedit/figures/gedit-html-snippet.png
share/help/da/gedit/figures/gedit-icon.png
-share/help/da/gedit/figures/gedit-new-external-tool.png
-share/help/da/gedit/figures/gedit-open-location.png
-share/help/da/gedit/figures/gedit-side-pane1.png
-share/help/da/gedit/figures/gedit-side-pane2.png
-share/help/da/gedit/figures/gedit-side-pane3.png
share/help/da/gedit/figures/gedit3-screenshot.png
share/help/da/gedit/gedit-change-color-scheme.page
share/help/da/gedit/gedit-change-default-font.page
@@ -500,11 +470,6 @@ share/help/da/gedit/index.page
share/help/da/gedit/legal.xml
share/help/de/gedit/figures/gedit-html-snippet.png
share/help/de/gedit/figures/gedit-icon.png
-share/help/de/gedit/figures/gedit-new-external-tool.png
-share/help/de/gedit/figures/gedit-open-location.png
-share/help/de/gedit/figures/gedit-side-pane1.png
-share/help/de/gedit/figures/gedit-side-pane2.png
-share/help/de/gedit/figures/gedit-side-pane3.png
share/help/de/gedit/figures/gedit3-screenshot.png
share/help/de/gedit/gedit-change-color-scheme.page
share/help/de/gedit/gedit-change-default-font.page
@@ -547,11 +512,6 @@ share/help/de/gedit/index.page
share/help/de/gedit/legal.xml
share/help/el/gedit/figures/gedit-html-snippet.png
share/help/el/gedit/figures/gedit-icon.png
-share/help/el/gedit/figures/gedit-new-external-tool.png
-share/help/el/gedit/figures/gedit-open-location.png
-share/help/el/gedit/figures/gedit-side-pane1.png
-share/help/el/gedit/figures/gedit-side-pane2.png
-share/help/el/gedit/figures/gedit-side-pane3.png
share/help/el/gedit/figures/gedit3-screenshot.png
share/help/el/gedit/gedit-change-color-scheme.page
share/help/el/gedit/gedit-change-default-font.page
@@ -594,11 +554,6 @@ share/help/el/gedit/index.page
share/help/el/gedit/legal.xml
share/help/es/gedit/figures/gedit-html-snippet.png
share/help/es/gedit/figures/gedit-icon.png
-share/help/es/gedit/figures/gedit-new-external-tool.png
-share/help/es/gedit/figures/gedit-open-location.png
-share/help/es/gedit/figures/gedit-side-pane1.png
-share/help/es/gedit/figures/gedit-side-pane2.png
-share/help/es/gedit/figures/gedit-side-pane3.png
share/help/es/gedit/figures/gedit3-screenshot.png
share/help/es/gedit/gedit-change-color-scheme.page
share/help/es/gedit/gedit-change-default-font.page
@@ -641,11 +596,6 @@ share/help/es/gedit/index.page
share/help/es/gedit/legal.xml
share/help/eu/gedit/figures/gedit-html-snippet.png
share/help/eu/gedit/figures/gedit-icon.png
-share/help/eu/gedit/figures/gedit-new-external-tool.png
-share/help/eu/gedit/figures/gedit-open-location.png
-share/help/eu/gedit/figures/gedit-side-pane1.png
-share/help/eu/gedit/figures/gedit-side-pane2.png
-share/help/eu/gedit/figures/gedit-side-pane3.png
share/help/eu/gedit/figures/gedit3-screenshot.png
share/help/eu/gedit/gedit-change-color-scheme.page
share/help/eu/gedit/gedit-change-default-font.page
@@ -688,11 +638,6 @@ share/help/eu/gedit/index.page
share/help/eu/gedit/legal.xml
share/help/fi/gedit/figures/gedit-html-snippet.png
share/help/fi/gedit/figures/gedit-icon.png
-share/help/fi/gedit/figures/gedit-new-external-tool.png
-share/help/fi/gedit/figures/gedit-open-location.png
-share/help/fi/gedit/figures/gedit-side-pane1.png
-share/help/fi/gedit/figures/gedit-side-pane2.png
-share/help/fi/gedit/figures/gedit-side-pane3.png
share/help/fi/gedit/figures/gedit3-screenshot.png
share/help/fi/gedit/gedit-change-color-scheme.page
share/help/fi/gedit/gedit-change-default-font.page
@@ -735,11 +680,6 @@ share/help/fi/gedit/index.page
share/help/fi/gedit/legal.xml
share/help/fr/gedit/figures/gedit-html-snippet.png
share/help/fr/gedit/figures/gedit-icon.png
-share/help/fr/gedit/figures/gedit-new-external-tool.png
-share/help/fr/gedit/figures/gedit-open-location.png
-share/help/fr/gedit/figures/gedit-side-pane1.png
-share/help/fr/gedit/figures/gedit-side-pane2.png
-share/help/fr/gedit/figures/gedit-side-pane3.png
share/help/fr/gedit/figures/gedit3-screenshot.png
share/help/fr/gedit/gedit-change-color-scheme.page
share/help/fr/gedit/gedit-change-default-font.page
@@ -782,11 +722,6 @@ share/help/fr/gedit/index.page
share/help/fr/gedit/legal.xml
share/help/gl/gedit/figures/gedit-html-snippet.png
share/help/gl/gedit/figures/gedit-icon.png
-share/help/gl/gedit/figures/gedit-new-external-tool.png
-share/help/gl/gedit/figures/gedit-open-location.png
-share/help/gl/gedit/figures/gedit-side-pane1.png
-share/help/gl/gedit/figures/gedit-side-pane2.png
-share/help/gl/gedit/figures/gedit-side-pane3.png
share/help/gl/gedit/figures/gedit3-screenshot.png
share/help/gl/gedit/gedit-change-color-scheme.page
share/help/gl/gedit/gedit-change-default-font.page
@@ -829,11 +764,6 @@ share/help/gl/gedit/index.page
share/help/gl/gedit/legal.xml
share/help/hu/gedit/figures/gedit-html-snippet.png
share/help/hu/gedit/figures/gedit-icon.png
-share/help/hu/gedit/figures/gedit-new-external-tool.png
-share/help/hu/gedit/figures/gedit-open-location.png
-share/help/hu/gedit/figures/gedit-side-pane1.png
-share/help/hu/gedit/figures/gedit-side-pane2.png
-share/help/hu/gedit/figures/gedit-side-pane3.png
share/help/hu/gedit/figures/gedit3-screenshot.png
share/help/hu/gedit/gedit-change-color-scheme.page
share/help/hu/gedit/gedit-change-default-font.page
@@ -876,11 +806,6 @@ share/help/hu/gedit/index.page
share/help/hu/gedit/legal.xml
share/help/id/gedit/figures/gedit-html-snippet.png
share/help/id/gedit/figures/gedit-icon.png
-share/help/id/gedit/figures/gedit-new-external-tool.png
-share/help/id/gedit/figures/gedit-open-location.png
-share/help/id/gedit/figures/gedit-side-pane1.png
-share/help/id/gedit/figures/gedit-side-pane2.png
-share/help/id/gedit/figures/gedit-side-pane3.png
share/help/id/gedit/figures/gedit3-screenshot.png
share/help/id/gedit/gedit-change-color-scheme.page
share/help/id/gedit/gedit-change-default-font.page
@@ -923,11 +848,6 @@ share/help/id/gedit/index.page
share/help/id/gedit/legal.xml
share/help/it/gedit/figures/gedit-html-snippet.png
share/help/it/gedit/figures/gedit-icon.png
-share/help/it/gedit/figures/gedit-new-external-tool.png
-share/help/it/gedit/figures/gedit-open-location.png
-share/help/it/gedit/figures/gedit-side-pane1.png
-share/help/it/gedit/figures/gedit-side-pane2.png
-share/help/it/gedit/figures/gedit-side-pane3.png
share/help/it/gedit/figures/gedit3-screenshot.png
share/help/it/gedit/gedit-change-color-scheme.page
share/help/it/gedit/gedit-change-default-font.page
@@ -970,11 +890,6 @@ share/help/it/gedit/index.page
share/help/it/gedit/legal.xml
share/help/ja/gedit/figures/gedit-html-snippet.png
share/help/ja/gedit/figures/gedit-icon.png
-share/help/ja/gedit/figures/gedit-new-external-tool.png
-share/help/ja/gedit/figures/gedit-open-location.png
-share/help/ja/gedit/figures/gedit-side-pane1.png
-share/help/ja/gedit/figures/gedit-side-pane2.png
-share/help/ja/gedit/figures/gedit-side-pane3.png
share/help/ja/gedit/figures/gedit3-screenshot.png
share/help/ja/gedit/gedit-change-color-scheme.page
share/help/ja/gedit/gedit-change-default-font.page
@@ -1017,11 +932,6 @@ share/help/ja/gedit/index.page
share/help/ja/gedit/legal.xml
share/help/ko/gedit/figures/gedit-html-snippet.png
share/help/ko/gedit/figures/gedit-icon.png
-share/help/ko/gedit/figures/gedit-new-external-tool.png
-share/help/ko/gedit/figures/gedit-open-location.png
-share/help/ko/gedit/figures/gedit-side-pane1.png
-share/help/ko/gedit/figures/gedit-side-pane2.png
-share/help/ko/gedit/figures/gedit-side-pane3.png
share/help/ko/gedit/figures/gedit3-screenshot.png
share/help/ko/gedit/gedit-change-color-scheme.page
share/help/ko/gedit/gedit-change-default-font.page
@@ -1064,11 +974,6 @@ share/help/ko/gedit/index.page
share/help/ko/gedit/legal.xml
share/help/lv/gedit/figures/gedit-html-snippet.png
share/help/lv/gedit/figures/gedit-icon.png
-share/help/lv/gedit/figures/gedit-new-external-tool.png
-share/help/lv/gedit/figures/gedit-open-location.png
-share/help/lv/gedit/figures/gedit-side-pane1.png
-share/help/lv/gedit/figures/gedit-side-pane2.png
-share/help/lv/gedit/figures/gedit-side-pane3.png
share/help/lv/gedit/figures/gedit3-screenshot.png
share/help/lv/gedit/gedit-change-color-scheme.page
share/help/lv/gedit/gedit-change-default-font.page
@@ -1111,11 +1016,6 @@ share/help/lv/gedit/index.page
share/help/lv/gedit/legal.xml
share/help/oc/gedit/figures/gedit-html-snippet.png
share/help/oc/gedit/figures/gedit-icon.png
-share/help/oc/gedit/figures/gedit-new-external-tool.png
-share/help/oc/gedit/figures/gedit-open-location.png
-share/help/oc/gedit/figures/gedit-side-pane1.png
-share/help/oc/gedit/figures/gedit-side-pane2.png
-share/help/oc/gedit/figures/gedit-side-pane3.png
share/help/oc/gedit/figures/gedit3-screenshot.png
share/help/oc/gedit/gedit-change-color-scheme.page
share/help/oc/gedit/gedit-change-default-font.page
@@ -1156,13 +1056,50 @@ share/help/oc/gedit/gedit-tabs.page
share/help/oc/gedit/gedit-undo-recent-action.page
share/help/oc/gedit/index.page
share/help/oc/gedit/legal.xml
+share/help/pl/gedit/figures/gedit-html-snippet.png
+share/help/pl/gedit/figures/gedit-icon.png
+share/help/pl/gedit/figures/gedit3-screenshot.png
+share/help/pl/gedit/gedit-change-color-scheme.page
+share/help/pl/gedit/gedit-change-default-font.page
+share/help/pl/gedit/gedit-close-file.page
+share/help/pl/gedit/gedit-create-new-file.page
+share/help/pl/gedit/gedit-edit-as-root.page
+share/help/pl/gedit/gedit-files-basic.page
+share/help/pl/gedit/gedit-full-screen.page
+share/help/pl/gedit/gedit-open-files-from-sidepane.page
+share/help/pl/gedit/gedit-open-files.page
+share/help/pl/gedit/gedit-open-on-server.page
+share/help/pl/gedit/gedit-open-recent.page
+share/help/pl/gedit/gedit-plugin-guide.page
+share/help/pl/gedit/gedit-plugins-change-case.page
+share/help/pl/gedit/gedit-plugins-doc-stats.page
+share/help/pl/gedit/gedit-plugins-external-tools.page
+share/help/pl/gedit/gedit-plugins-file-browser.page
+share/help/pl/gedit/gedit-plugins-insert-date-time.page
+share/help/pl/gedit/gedit-plugins-install.page
+share/help/pl/gedit/gedit-plugins-modelines.page
+share/help/pl/gedit/gedit-plugins-pyconsole.page
+share/help/pl/gedit/gedit-plugins-quick-open.page
+share/help/pl/gedit/gedit-plugins-snippets.page
+share/help/pl/gedit/gedit-plugins-sort.page
+share/help/pl/gedit/gedit-printing-order.page
+share/help/pl/gedit/gedit-printing-select.page
+share/help/pl/gedit/gedit-printing.page
+share/help/pl/gedit/gedit-quickstart.page
+share/help/pl/gedit/gedit-replace.page
+share/help/pl/gedit/gedit-save-file.page
+share/help/pl/gedit/gedit-search.page
+share/help/pl/gedit/gedit-shortcut-keys.page
+share/help/pl/gedit/gedit-spellcheck.page
+share/help/pl/gedit/gedit-syntax-highlighting.page
+share/help/pl/gedit/gedit-tab-groups.page
+share/help/pl/gedit/gedit-tabs-moving.page
+share/help/pl/gedit/gedit-tabs.page
+share/help/pl/gedit/gedit-undo-recent-action.page
+share/help/pl/gedit/index.page
+share/help/pl/gedit/legal.xml
share/help/pt_BR/gedit/figures/gedit-html-snippet.png
share/help/pt_BR/gedit/figures/gedit-icon.png
-share/help/pt_BR/gedit/figures/gedit-new-external-tool.png
-share/help/pt_BR/gedit/figures/gedit-open-location.png
-share/help/pt_BR/gedit/figures/gedit-side-pane1.png
-share/help/pt_BR/gedit/figures/gedit-side-pane2.png
-share/help/pt_BR/gedit/figures/gedit-side-pane3.png
share/help/pt_BR/gedit/figures/gedit3-screenshot.png
share/help/pt_BR/gedit/gedit-change-color-scheme.page
share/help/pt_BR/gedit/gedit-change-default-font.page
@@ -1205,11 +1142,6 @@ share/help/pt_BR/gedit/index.page
share/help/pt_BR/gedit/legal.xml
share/help/ro/gedit/figures/gedit-html-snippet.png
share/help/ro/gedit/figures/gedit-icon.png
-share/help/ro/gedit/figures/gedit-new-external-tool.png
-share/help/ro/gedit/figures/gedit-open-location.png
-share/help/ro/gedit/figures/gedit-side-pane1.png
-share/help/ro/gedit/figures/gedit-side-pane2.png
-share/help/ro/gedit/figures/gedit-side-pane3.png
share/help/ro/gedit/figures/gedit3-screenshot.png
share/help/ro/gedit/gedit-change-color-scheme.page
share/help/ro/gedit/gedit-change-default-font.page
@@ -1252,11 +1184,6 @@ share/help/ro/gedit/index.page
share/help/ro/gedit/legal.xml
share/help/ru/gedit/figures/gedit-html-snippet.png
share/help/ru/gedit/figures/gedit-icon.png
-share/help/ru/gedit/figures/gedit-new-external-tool.png
-share/help/ru/gedit/figures/gedit-open-location.png
-share/help/ru/gedit/figures/gedit-side-pane1.png
-share/help/ru/gedit/figures/gedit-side-pane2.png
-share/help/ru/gedit/figures/gedit-side-pane3.png
share/help/ru/gedit/figures/gedit3-screenshot.png
share/help/ru/gedit/gedit-change-color-scheme.page
share/help/ru/gedit/gedit-change-default-font.page
@@ -1299,11 +1226,6 @@ share/help/ru/gedit/index.page
share/help/ru/gedit/legal.xml
share/help/sl/gedit/figures/gedit-html-snippet.png
share/help/sl/gedit/figures/gedit-icon.png
-share/help/sl/gedit/figures/gedit-new-external-tool.png
-share/help/sl/gedit/figures/gedit-open-location.png
-share/help/sl/gedit/figures/gedit-side-pane1.png
-share/help/sl/gedit/figures/gedit-side-pane2.png
-share/help/sl/gedit/figures/gedit-side-pane3.png
share/help/sl/gedit/figures/gedit3-screenshot.png
share/help/sl/gedit/gedit-change-color-scheme.page
share/help/sl/gedit/gedit-change-default-font.page
@@ -1346,11 +1268,6 @@ share/help/sl/gedit/index.page
share/help/sl/gedit/legal.xml
share/help/sv/gedit/figures/gedit-html-snippet.png
share/help/sv/gedit/figures/gedit-icon.png
-share/help/sv/gedit/figures/gedit-new-external-tool.png
-share/help/sv/gedit/figures/gedit-open-location.png
-share/help/sv/gedit/figures/gedit-side-pane1.png
-share/help/sv/gedit/figures/gedit-side-pane2.png
-share/help/sv/gedit/figures/gedit-side-pane3.png
share/help/sv/gedit/figures/gedit3-screenshot.png
share/help/sv/gedit/gedit-change-color-scheme.page
share/help/sv/gedit/gedit-change-default-font.page
@@ -1393,11 +1310,6 @@ share/help/sv/gedit/index.page
share/help/sv/gedit/legal.xml
share/help/te/gedit/figures/gedit-html-snippet.png
share/help/te/gedit/figures/gedit-icon.png
-share/help/te/gedit/figures/gedit-new-external-tool.png
-share/help/te/gedit/figures/gedit-open-location.png
-share/help/te/gedit/figures/gedit-side-pane1.png
-share/help/te/gedit/figures/gedit-side-pane2.png
-share/help/te/gedit/figures/gedit-side-pane3.png
share/help/te/gedit/figures/gedit3-screenshot.png
share/help/te/gedit/gedit-change-color-scheme.page
share/help/te/gedit/gedit-change-default-font.page
@@ -1440,11 +1352,6 @@ share/help/te/gedit/index.page
share/help/te/gedit/legal.xml
share/help/th/gedit/figures/gedit-html-snippet.png
share/help/th/gedit/figures/gedit-icon.png
-share/help/th/gedit/figures/gedit-new-external-tool.png
-share/help/th/gedit/figures/gedit-open-location.png
-share/help/th/gedit/figures/gedit-side-pane1.png
-share/help/th/gedit/figures/gedit-side-pane2.png
-share/help/th/gedit/figures/gedit-side-pane3.png
share/help/th/gedit/figures/gedit3-screenshot.png
share/help/th/gedit/gedit-change-color-scheme.page
share/help/th/gedit/gedit-change-default-font.page
@@ -1487,11 +1394,6 @@ share/help/th/gedit/index.page
share/help/th/gedit/legal.xml
share/help/uk/gedit/figures/gedit-html-snippet.png
share/help/uk/gedit/figures/gedit-icon.png
-share/help/uk/gedit/figures/gedit-new-external-tool.png
-share/help/uk/gedit/figures/gedit-open-location.png
-share/help/uk/gedit/figures/gedit-side-pane1.png
-share/help/uk/gedit/figures/gedit-side-pane2.png
-share/help/uk/gedit/figures/gedit-side-pane3.png
share/help/uk/gedit/figures/gedit3-screenshot.png
share/help/uk/gedit/gedit-change-color-scheme.page
share/help/uk/gedit/gedit-change-default-font.page
@@ -1534,11 +1436,6 @@ share/help/uk/gedit/index.page
share/help/uk/gedit/legal.xml
share/help/zh_CN/gedit/figures/gedit-html-snippet.png
share/help/zh_CN/gedit/figures/gedit-icon.png
-share/help/zh_CN/gedit/figures/gedit-new-external-tool.png
-share/help/zh_CN/gedit/figures/gedit-open-location.png
-share/help/zh_CN/gedit/figures/gedit-side-pane1.png
-share/help/zh_CN/gedit/figures/gedit-side-pane2.png
-share/help/zh_CN/gedit/figures/gedit-side-pane3.png
share/help/zh_CN/gedit/figures/gedit3-screenshot.png
share/help/zh_CN/gedit/gedit-change-color-scheme.page
share/help/zh_CN/gedit/gedit-change-default-font.page
@@ -1581,11 +1478,6 @@ share/help/zh_CN/gedit/index.page
share/help/zh_CN/gedit/legal.xml
share/help/zh_HK/gedit/figures/gedit-html-snippet.png
share/help/zh_HK/gedit/figures/gedit-icon.png
-share/help/zh_HK/gedit/figures/gedit-new-external-tool.png
-share/help/zh_HK/gedit/figures/gedit-open-location.png
-share/help/zh_HK/gedit/figures/gedit-side-pane1.png
-share/help/zh_HK/gedit/figures/gedit-side-pane2.png
-share/help/zh_HK/gedit/figures/gedit-side-pane3.png
share/help/zh_HK/gedit/figures/gedit3-screenshot.png
share/help/zh_HK/gedit/gedit-change-color-scheme.page
share/help/zh_HK/gedit/gedit-change-default-font.page
@@ -1628,11 +1520,6 @@ share/help/zh_HK/gedit/index.page
share/help/zh_HK/gedit/legal.xml
share/help/zh_TW/gedit/figures/gedit-html-snippet.png
share/help/zh_TW/gedit/figures/gedit-icon.png
-share/help/zh_TW/gedit/figures/gedit-new-external-tool.png
-share/help/zh_TW/gedit/figures/gedit-open-location.png
-share/help/zh_TW/gedit/figures/gedit-side-pane1.png
-share/help/zh_TW/gedit/figures/gedit-side-pane2.png
-share/help/zh_TW/gedit/figures/gedit-side-pane3.png
share/help/zh_TW/gedit/figures/gedit3-screenshot.png
share/help/zh_TW/gedit/gedit-change-color-scheme.page
share/help/zh_TW/gedit/gedit-change-default-font.page
@@ -1673,6 +1560,13 @@ share/help/zh_TW/gedit/gedit-tabs.page
share/help/zh_TW/gedit/gedit-undo-recent-action.page
share/help/zh_TW/gedit/index.page
share/help/zh_TW/gedit/legal.xml
+share/icons/hicolor/16x16/apps/gedit.png
+share/icons/hicolor/22x22/apps/gedit.png
+share/icons/hicolor/24x24/apps/gedit.png
+share/icons/hicolor/256x256/apps/gedit.png
+share/icons/hicolor/32x32/apps/gedit.png
+share/icons/hicolor/48x48/apps/gedit.png
+share/icons/hicolor/symbolic/apps/gedit-symbolic.svg
share/locale/af/LC_MESSAGES/gedit.mo
share/locale/am/LC_MESSAGES/gedit.mo
share/locale/an/LC_MESSAGES/gedit.mo
@@ -1775,12 +1669,6 @@ share/locale/xh/LC_MESSAGES/gedit.mo
share/locale/zh_CN/LC_MESSAGES/gedit.mo
share/locale/zh_HK/LC_MESSAGES/gedit.mo
share/locale/zh_TW/LC_MESSAGES/gedit.mo
-share/icons/hicolor/16x16/apps/gedit.png
-share/icons/hicolor/22x22/apps/gedit.png
-share/icons/hicolor/24x24/apps/gedit.png
-share/icons/hicolor/256x256/apps/gedit.png
-share/icons/hicolor/32x32/apps/gedit.png
-share/icons/hicolor/48x48/apps/gedit.png
-share/icons/hicolor/symbolic/apps/gedit-symbolic.svg
+share/metainfo/org.gnome.gedit.appdata.xml
share/vala/vapi/gedit.deps
share/vala/vapi/gedit.vapi
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 5cb3735b8b60..4d4852813f00 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ghex
-PORTVERSION= 3.18.0
+PORTVERSION= 3.18.3
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -12,14 +12,12 @@ COMMENT= GNOME 3 hex editor
BUILD_DEPENDS= itstool:textproc/itstool
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME= gnomeprefix gtk30 intlhack libxml2:build
+USES= gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
+USE_GNOME= cairo gnomeprefix gtk30 intlhack libxml2:build
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-compile-warnings=no
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.GHex.gschema.xml
diff --git a/editors/ghex/distinfo b/editors/ghex/distinfo
index 3e01d7e37552..44d75957cd40 100644
--- a/editors/ghex/distinfo
+++ b/editors/ghex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/ghex-3.18.0.tar.xz) = c5b1eb50a8dd1334880b37617871498b778ea137f79bb43894ec68e4f63dc925
-SIZE (gnome3/ghex-3.18.0.tar.xz) = 1569372
+TIMESTAMP = 1516389461
+SHA256 (gnome3/ghex-3.18.3.tar.xz) = c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3
+SIZE (gnome3/ghex-3.18.3.tar.xz) = 1630720
diff --git a/emulators/tiemu3/Makefile b/emulators/tiemu3/Makefile
index cdb57a746adc..4f0afa661254 100644
--- a/emulators/tiemu3/Makefile
+++ b/emulators/tiemu3/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tiemu3
PORTVERSION= 3.03
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= emulators
MASTER_SITES= SF/gtktiemu/tiemu-linux/TIEmu%20${DISTVERSION}
DISTNAME= tiemu-${DISTVERSION}
diff --git a/emulators/tiemu3/files/patch-src_core_uae_Makefile b/emulators/tiemu3/files/patch-src_core_uae_Makefile
index f07efb4543a4..3cae8682e667 100644
--- a/emulators/tiemu3/files/patch-src_core_uae_Makefile
+++ b/emulators/tiemu3/files/patch-src_core_uae_Makefile
@@ -1,6 +1,6 @@
---- src/core/uae/Makefile.orig 2006-01-06 18:30:04.000000000 -0500
-+++ src/core/uae/Makefile 2011-07-02 12:14:35.000000000 -0400
-@@ -14,26 +14,26 @@
+--- src/core/uae/Makefile.orig 2006-01-06 23:30:04 UTC
++++ src/core/uae/Makefile
+@@ -14,26 +14,26 @@ all: cpudefs.o cpustbl.o readcpu.o fpp.o missing.o cpu
# For cross-compiling (generators are run on host)
build68k_host.o: build68k.c
diff --git a/emulators/tiemu3/files/patch-src_core_uae_build68k.c b/emulators/tiemu3/files/patch-src_core_uae_build68k.c
new file mode 100644
index 000000000000..167c819846d6
--- /dev/null
+++ b/emulators/tiemu3/files/patch-src_core_uae_build68k.c
@@ -0,0 +1,74 @@
+--- src/core/uae/build68k.c.orig 2005-06-25 14:27:52 UTC
++++ src/core/uae/build68k.c
+@@ -52,7 +52,7 @@ static int nextchtohex(void)
+ case 'd': return 13;
+ case 'e': return 14;
+ case 'f': return 15;
+- default: abort();
++ default: uae_abort();
+ }
+ }
+
+@@ -114,7 +114,7 @@ int main(int argc, char **argv)
+ case 'R': currbit = bitR; break;
+ case 'z': currbit = bitz; break;
+ case 'p': currbit = bitp; break;
+- default: abort();
++ default: uae_abort();
+ }
+ if (!(bitmask & 1)) {
+ bitpos[n_variable] = currbit;
+@@ -138,7 +138,7 @@ int main(int argc, char **argv)
+ case '2': cpulevel = 2; break;
+ case '3': cpulevel = 3; break;
+ case '4': cpulevel = 4; break;
+- default: abort();
++ default: uae_abort();
+ }
+ getnextch();
+
+@@ -147,7 +147,7 @@ int main(int argc, char **argv)
+ case '1': plevel = 1; break;
+ case '2': plevel = 2; break;
+ case '3': plevel = 3; break;
+- default: abort();
++ default: uae_abort();
+ }
+ getnextch();
+
+@@ -155,7 +155,7 @@ int main(int argc, char **argv)
+ getnextch();
+
+ if (nextch != ':')
+- abort();
++ uae_abort();
+
+ for(i = 0; i < 5; i++) {
+ getnextch();
+@@ -176,7 +176,7 @@ int main(int argc, char **argv)
+ getnextch();
+
+ if (nextch != ':') /* Get flag used information */
+- abort();
++ uae_abort();
+
+ for(i = 0; i < 5; i++) {
+ getnextch();
+@@ -194,7 +194,7 @@ int main(int argc, char **argv)
+ getnextch();
+
+ if (nextch != ':') /* Get source/dest usage information */
+- abort();
++ uae_abort();
+
+ getnextch();
+ sduse = nextchtohex() << 4;
+@@ -206,7 +206,7 @@ int main(int argc, char **argv)
+ getnextch();
+
+ if (nextch != ':')
+- abort();
++ uae_abort();
+
+ fgets(opcstr, 250, tablef);
+ getnextch();
diff --git a/emulators/tiemu3/files/patch-src_core_uae_fpp.c b/emulators/tiemu3/files/patch-src_core_uae_fpp.c
new file mode 100644
index 000000000000..64732cdcce12
--- /dev/null
+++ b/emulators/tiemu3/files/patch-src_core_uae_fpp.c
@@ -0,0 +1,45 @@
+--- src/core/uae/fpp.c.orig 2005-06-25 14:27:52 UTC
++++ src/core/uae/fpp.c
+@@ -13,35 +13,35 @@
+
+ void fdbcc_opp (uae_u32 opcode, uae_u16 extra)
+ {
+- abort();
++ uae_abort();
+ }
+
+ void fscc_opp (uae_u32 opcode, uae_u16 extra)
+ {
+- abort();
++ uae_abort();
+ }
+
+ void ftrapcc_opp (uae_u32 opcode, uaecptr oldpc)
+ {
+- abort();
++ uae_abort();
+ }
+
+ void fbcc_opp (uae_u32 opcode, uaecptr pc, uae_u32 extra)
+ {
+- abort();
++ uae_abort();
+ }
+
+ void fsave_opp (uae_u32 opcode)
+ {
+- abort();
++ uae_abort();
+ }
+
+ void frestore_opp (uae_u32 opcode)
+ {
+- abort();
++ uae_abort();
+ }
+
+ void fpp_opp (uae_u32 opcode, uae_u16 extra)
+ {
+- abort();
++ uae_abort();
+ }
diff --git a/emulators/tiemu3/files/patch-src_core_uae_gencpu.c b/emulators/tiemu3/files/patch-src_core_uae_gencpu.c
new file mode 100644
index 000000000000..57d03bcdd10a
--- /dev/null
+++ b/emulators/tiemu3/files/patch-src_core_uae_gencpu.c
@@ -0,0 +1,421 @@
+--- src/core/uae/gencpu.c.orig 2007-11-20 18:01:02 UTC
++++ src/core/uae/gencpu.c
+@@ -12,7 +12,7 @@
+ * MC68000 instructions, plus a prototype header file and a function pointer
+ * array to look up the function for an opcode.
+ * Error checking is bad, an illegal table68k file will cause the program to
+- * call abort().
++ * call uae_abort().
+ * The generated code is sometimes sub-optimal, an optimizing compiler should
+ * take care of this.
+ *
+@@ -89,7 +89,7 @@ static void read_counts (void)
+ }
+ }
+ if (nr != nr_cpuop_funcs)
+- abort ();
++ uae_abort ();
+ }
+
+ static char endlabelstr[80];
+@@ -144,7 +144,7 @@ static int bit_size (int size)
+ case sz_byte: return 8;
+ case sz_word: return 16;
+ case sz_long: return 32;
+- default: abort ();
++ default: uae_abort ();
+ }
+ return 0;
+ }
+@@ -155,7 +155,7 @@ static const char *bit_mask (int size)
+ case sz_byte: return "0xff";
+ case sz_word: return "0xffff";
+ case sz_long: return "0xffffffff";
+- default: abort ();
++ default: uae_abort ();
+ }
+ return 0;
+ }
+@@ -370,7 +370,7 @@ static void genamode (amodes mode, char *reg, wordsize
+ switch (mode) {
+ case Dreg:
+ if (movem)
+- abort ();
++ uae_abort ();
+ if (getv == 1)
+ switch (size) {
+ case sz_byte:
+@@ -393,12 +393,12 @@ static void genamode (amodes mode, char *reg, wordsize
+ printf ("\tuae_s32 %s = m68k_dreg(regs, %s);\n", name, reg);
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ return;
+ case Areg:
+ if (movem)
+- abort ();
++ uae_abort ();
+ if (getv == 1)
+ switch (size) {
+ case sz_word:
+@@ -408,7 +408,7 @@ static void genamode (amodes mode, char *reg, wordsize
+ printf ("\tuae_s32 %s = m68k_areg(regs, %s);\n", name, reg);
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ return;
+ case Aind:
+@@ -433,7 +433,7 @@ static void genamode (amodes mode, char *reg, wordsize
+ printf ("\tuaecptr %sa = m68k_areg(regs, %s) - %d;\n", name, reg, movem ? 0 : 4);
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ break;
+ case Ad16:
+@@ -482,7 +482,7 @@ static void genamode (amodes mode, char *reg, wordsize
+ break;
+ case imm:
+ if (getv != 1)
+- abort ();
++ uae_abort ();
+ switch (size) {
+ case sz_byte:
+ printf ("\tuae_s8 %s = %s;\n", name, gen_nextibyte (flags & GF_NOREFILL));
+@@ -494,31 +494,31 @@ static void genamode (amodes mode, char *reg, wordsize
+ gen_nextilong ("uae_s32", name, flags & GF_NOREFILL);
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ return;
+ case imm0:
+ if (getv != 1)
+- abort ();
++ uae_abort ();
+ printf ("\tuae_s8 %s = %s;\n", name, gen_nextibyte (flags & GF_NOREFILL));
+ return;
+ case imm1:
+ if (getv != 1)
+- abort ();
++ uae_abort ();
+ printf ("\tuae_s16 %s = %s;\n", name, gen_nextiword (flags & GF_NOREFILL));
+ return;
+ case imm2:
+ if (getv != 1)
+- abort ();
++ uae_abort ();
+ gen_nextilong ("uae_s32", name, flags & GF_NOREFILL);
+ return;
+ case immi:
+ if (getv != 1)
+- abort ();
++ uae_abort ();
+ printf ("\tuae_u32 %s = %s;\n", name, reg);
+ return;
+ default:
+- abort ();
++ uae_abort ();
+ }
+
+ /* We get here for all non-reg non-immediate addressing modes to
+@@ -544,14 +544,14 @@ static void genamode (amodes mode, char *reg, wordsize
+ case sz_byte: insn_n_cycles += 4; break;
+ case sz_word: insn_n_cycles += 4; break;
+ case sz_long: insn_n_cycles += 8; break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ start_brace ();
+ switch (size) {
+ case sz_byte: printf ("\tuae_s8 %s = get_byte(%sa);\n", name, name); break;
+ case sz_word: printf ("\tuae_s16 %s = get_word(%sa);\n", name, name); break;
+ case sz_long: printf ("\tuae_s32 %s = get_long(%sa);\n", name, name); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ }
+
+@@ -571,7 +571,7 @@ static void genamode (amodes mode, char *reg, wordsize
+ printf ("\tm68k_areg(regs, %s) += 4;\n", reg);
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ break;
+ case Apdi:
+@@ -597,7 +597,7 @@ static void genastore (char *from, amodes mode, char *
+ printf ("\tm68k_dreg(regs, %s) = (%s);\n", reg, from);
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ break;
+ case Areg:
+@@ -609,7 +609,7 @@ static void genastore (char *from, amodes mode, char *
+ printf ("\tm68k_areg(regs, %s) = (%s);\n", reg, from);
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ break;
+ case Aind:
+@@ -631,17 +631,17 @@ static void genastore (char *from, amodes mode, char *
+ case sz_word:
+ insn_n_cycles += 4;
+ if (cpu_level < 2 && (mode == PC16 || mode == PC8r))
+- abort ();
++ uae_abort ();
+ printf ("\tput_word(%sa,%s);\n", to, from);
+ break;
+ case sz_long:
+ insn_n_cycles += 8;
+ if (cpu_level < 2 && (mode == PC16 || mode == PC8r))
+- abort ();
++ uae_abort ();
+ printf ("\tput_long(%sa,%s);\n", to, from);
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ break;
+ case imm:
+@@ -649,10 +649,10 @@ static void genastore (char *from, amodes mode, char *
+ case imm1:
+ case imm2:
+ case immi:
+- abort ();
++ uae_abort ();
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ }
+
+@@ -746,7 +746,7 @@ static void genflags_normal (flagtypes type, wordsizes
+ strcpy (usstr, "((uae_u32)(");
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ strcpy (unsstr, usstr);
+
+@@ -969,7 +969,7 @@ static const char *cmask (wordsizes size)
+ case sz_byte: return "0x80";
+ case sz_word: return "0x8000";
+ case sz_long: return "0x80000000";
+- default: abort ();
++ default: uae_abort ();
+ }
+ }
+
+@@ -1391,7 +1391,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 dst = (uae_s32)(uae_s8)src;\n"); break;
+ case sz_word: printf ("\tuae_u16 dst = (uae_s16)(uae_s8)src;\n"); break;
+ case sz_long: printf ("\tuae_u32 dst = (uae_s32)(uae_s16)src;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ genflags (flag_logical,
+ curi->size == sz_word ? sz_word : sz_long, "dst", "", "");
+@@ -1823,7 +1823,7 @@ static void gen_opcode (unsigned long int opcode)
+ printf ("\tlower=get_long(dsta); upper = get_long(dsta+4);\n");
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ }
+ printf ("\tSET_ZFLG (upper == reg || lower == reg);\n");
+ printf ("\tSET_CFLG (lower <= upper ? reg < lower || reg > upper : reg > upper || reg < lower);\n");
+@@ -1840,7 +1840,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tuae_u32 sign = (%s & val) >> %d;\n", cmask (curi->size), bit_size (curi->size) - 1);
+ printf ("\tcnt &= 63;\n");
+@@ -1874,7 +1874,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tcnt &= 63;\n");
+ printf ("\tCLEAR_CZNV;\n");
+@@ -1911,7 +1911,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tcnt &= 63;\n");
+ printf ("\tCLEAR_CZNV;\n");
+@@ -1941,7 +1941,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tcnt &= 63;\n");
+ printf ("\tCLEAR_CZNV;\n");
+@@ -1972,7 +1972,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tcnt &= 63;\n");
+ printf ("\tCLEAR_CZNV;\n");
+@@ -2000,7 +2000,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tcnt &= 63;\n");
+ printf ("\tCLEAR_CZNV;\n");
+@@ -2028,7 +2028,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tcnt &= 63;\n");
+ printf ("\tCLEAR_CZNV;\n");
+@@ -2059,7 +2059,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tcnt &= 63;\n");
+ printf ("\tCLEAR_CZNV;\n");
+@@ -2092,7 +2092,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tuae_u32 sign = %s & val;\n", cmask (curi->size));
+ printf ("\tuae_u32 cflg = val & 1;\n");
+@@ -2110,7 +2110,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tuae_u32 sign = %s & val;\n", cmask (curi->size));
+ printf ("\tuae_u32 sign2;\n");
+@@ -2131,7 +2131,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break;
+ case sz_word: printf ("\tuae_u32 val = (uae_u16)data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tuae_u32 carry = val & 1;\n");
+ printf ("\tval >>= 1;\n");
+@@ -2148,7 +2148,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
+ case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tuae_u32 carry = val & %s;\n", cmask (curi->size));
+ printf ("\tval <<= 1;\n");
+@@ -2165,7 +2165,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
+ case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tuae_u32 carry = val & %s;\n", cmask (curi->size));
+ printf ("\tval <<= 1;\n");
+@@ -2182,7 +2182,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
+ case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tuae_u32 carry = val & 1;\n");
+ printf ("\tval >>= 1;\n");
+@@ -2199,7 +2199,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
+ case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tuae_u32 carry = val & %s;\n", cmask (curi->size));
+ printf ("\tval <<= 1;\n");
+@@ -2217,7 +2217,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tuae_u8 val = data;\n"); break;
+ case sz_word: printf ("\tuae_u16 val = data;\n"); break;
+ case sz_long: printf ("\tuae_u32 val = data;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\tuae_u32 carry = val & 1;\n");
+ printf ("\tval >>= 1;\n");
+@@ -2319,7 +2319,7 @@ static void gen_opcode (unsigned long int opcode)
+ case sz_byte: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = (uae_s32)(uae_s8)src;\n"); break;
+ case sz_word: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = (uae_s32)(uae_s16)src;\n"); break;
+ case sz_long: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = src;\n"); break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ printf ("\t} else {\n");
+ genastore ("src", Dreg, "(extra >> 12) & 7", curi->size, "");
+@@ -2566,7 +2566,7 @@ static void gen_opcode (unsigned long int opcode)
+ printf ("\tmmu_op(opcode,extra);\n");
+ break;
+ default:
+- abort ();
++ uae_abort ();
+ break;
+ }
+ finish_braces ();
+@@ -2631,7 +2631,7 @@ static void generate_one_opcode (int rp)
+ case 4: smsk = 7; break;
+ case 5: smsk = 63; break;
+ case 7: smsk = 3; break;
+- default: abort ();
++ default: uae_abort ();
+ }
+ dmsk = 7;
+
+@@ -2680,7 +2680,7 @@ static void generate_one_opcode (int rp)
+ #if 0
+ /* Check that we can do the little endian optimization safely. */
+ if (pos < 8 && (dmsk >> (8 - pos)) != 0)
+- abort ();
++ uae_abort ();
+ #endif
+ if (pos)
+ printf ("\tuae_u32 dstreg = (opcode >> %d) & %d;\n",
diff --git a/emulators/tiemu3/files/patch-src_core_uae_machdep_m68k.h b/emulators/tiemu3/files/patch-src_core_uae_machdep_m68k.h
new file mode 100644
index 000000000000..b976d40b9cab
--- /dev/null
+++ b/emulators/tiemu3/files/patch-src_core_uae_machdep_m68k.h
@@ -0,0 +1,11 @@
+--- src/core/uae/machdep/m68k.h.orig 2005-08-26 21:05:37 UTC
++++ src/core/uae/machdep/m68k.h
+@@ -36,7 +36,7 @@ static __inline__ int cctrue(const int cc)
+ case 14:return !ZFLG && (NFLG == VFLG); /* GT */
+ case 15:return ZFLG || (NFLG != VFLG); /* LE */
+ }
+-// abort();
++// uae_abort();
+ return 0;
+ }
+
diff --git a/emulators/tiemu3/files/patch-src_core_uae_newcpu.c b/emulators/tiemu3/files/patch-src_core_uae_newcpu.c
new file mode 100644
index 000000000000..b05692415144
--- /dev/null
+++ b/emulators/tiemu3/files/patch-src_core_uae_newcpu.c
@@ -0,0 +1,20 @@
+--- src/core/uae/newcpu.c.orig 2008-05-25 13:08:41 UTC
++++ src/core/uae/newcpu.c
+@@ -148,7 +148,7 @@ static void build_cpufunctbl (void)
+ if (table68k[opcode].handler != -1) {
+ f = cpufunctbl[table68k[opcode].handler];
+ if (f == op_illg_1)
+- abort();
++ uae_abort();
+ cpufunctbl[opcode] = f;
+ }
+ }
+@@ -1575,7 +1575,7 @@ void m68k_go (int may_quit)
+ {
+ if (in_m68k_go || !may_quit) {
+ write_log ("Bug! m68k_go is not reentrant.\n");
+- abort ();
++ uae_abort ();
+ }
+
+ reset_frame_rate_hack ();
diff --git a/emulators/tiemu3/files/patch-src_core_uae_readcpu.c b/emulators/tiemu3/files/patch-src_core_uae_readcpu.c
new file mode 100644
index 000000000000..f05c4a3faa83
--- /dev/null
+++ b/emulators/tiemu3/files/patch-src_core_uae_readcpu.c
@@ -0,0 +1,140 @@
+--- src/core/uae/readcpu.c.orig 2007-11-20 18:01:02 UTC
++++ src/core/uae/readcpu.c
+@@ -172,7 +172,7 @@ STATIC_INLINE amodes mode_from_str (const char *str)
+ if (strncmp (str, "PC16", 4) == 0) return PC16;
+ if (strncmp (str, "PC8r", 4) == 0) return PC8r;
+ if (strncmp (str, "Immd", 4) == 0) return imm;
+- abort ();
++ uae_abort ();
+ return 0;
+ }
+
+@@ -198,7 +198,7 @@ STATIC_INLINE amodes mode_from_mr (int mode, int reg)
+ case 7: return am_illg;
+ }
+ }
+- abort ();
++ uae_abort ();
+ return 0;
+ }
+
+@@ -316,10 +316,10 @@ static void build_insn (int insn)
+ case 0: sz = sz_byte; break;
+ case 1: sz = sz_word; break;
+ case 2: sz = sz_long; break;
+- default: abort();
++ default: uae_abort();
+ }
+ break;
+- default: abort();
++ default: uae_abort();
+ }
+ } else {
+ mnemonic[mnp] = opcstr[pos];
+@@ -328,7 +328,7 @@ static void build_insn (int insn)
+ switch (bitval[bitf]) {
+ case 0: mnemonic[mnp] = 'R'; break;
+ case 1: mnemonic[mnp] = 'L'; break;
+- default: abort();
++ default: uae_abort();
+ }
+ }
+ mnp++;
+@@ -353,7 +353,7 @@ static void build_insn (int insn)
+ switch (opcstr[pos++]) {
+ case 'r': srcreg = bitval[bitr]; srcgather = 1; srcpos = bitpos[bitr]; break;
+ case 'R': srcreg = bitval[bitR]; srcgather = 1; srcpos = bitpos[bitR]; break;
+- default: abort();
++ default: uae_abort();
+ }
+ break;
+ case 'A':
+@@ -361,7 +361,7 @@ static void build_insn (int insn)
+ switch (opcstr[pos++]) {
+ case 'r': srcreg = bitval[bitr]; srcgather = 1; srcpos = bitpos[bitr]; break;
+ case 'R': srcreg = bitval[bitR]; srcgather = 1; srcpos = bitpos[bitR]; break;
+- default: abort();
++ default: uae_abort();
+ }
+ switch (opcstr[pos]) {
+ case 'p': srcmode = Apdi; pos++; break;
+@@ -424,7 +424,7 @@ static void build_insn (int insn)
+ srcpos = bitpos[bitp];
+ }
+ break;
+- default: abort();
++ default: uae_abort();
+ }
+ break;
+ case 'd':
+@@ -522,7 +522,7 @@ static void build_insn (int insn)
+ }
+ }
+ break;
+- default: abort();
++ default: uae_abort();
+ }
+ /* safety check - might have changed */
+ if (srcmode != Areg && srcmode != Dreg && srcmode != Aind
+@@ -546,10 +546,10 @@ static void build_insn (int insn)
+ switch (opcstr[pos++]) {
+ case 'r': destreg = bitval[bitr]; dstgather = 1; dstpos = bitpos[bitr]; break;
+ case 'R': destreg = bitval[bitR]; dstgather = 1; dstpos = bitpos[bitR]; break;
+- default: abort();
++ default: uae_abort();
+ }
+ if (dstpos < 0 || dstpos >= 32)
+- abort ();
++ uae_abort ();
+ break;
+ case 'A':
+ destmode = Areg;
+@@ -557,10 +557,10 @@ static void build_insn (int insn)
+ case 'r': destreg = bitval[bitr]; dstgather = 1; dstpos = bitpos[bitr]; break;
+ case 'R': destreg = bitval[bitR]; dstgather = 1; dstpos = bitpos[bitR]; break;
+ case 'x': destreg = 0; dstgather = 0; dstpos = 0; break;
+- default: abort();
++ default: uae_abort();
+ }
+ if (dstpos < 0 || dstpos >= 32)
+- abort ();
++ uae_abort ();
+ switch (opcstr[pos]) {
+ case 'p': destmode = Apdi; pos++; break;
+ case 'P': destmode = Aipi; pos++; break;
+@@ -580,7 +580,7 @@ static void build_insn (int insn)
+ case 'J': destmode = immi; destreg = bitval[bitJ]; break;
+ case 'k': destmode = immi; destreg = bitval[bitk]; break;
+ case 'K': destmode = immi; destreg = bitval[bitK]; break;
+- default: abort();
++ default: uae_abort();
+ }
+ break;
+ case 'd':
+@@ -680,7 +680,7 @@ static void build_insn (int insn)
+ }
+ }
+ break;
+- default: abort();
++ default: uae_abort();
+ }
+ /* safety check - might have changed */
+ if (destmode != Areg && destmode != Dreg && destmode != Aind
+@@ -707,7 +707,7 @@ static void build_insn (int insn)
+ table68k[opc].mnemo = lookuptab[find].mnemo;
+ break;
+ }
+- if (strlen(lookuptab[find].name) == 0) abort();
++ if (strlen(lookuptab[find].name) == 0) uae_abort();
+ }
+ }
+ else {
+@@ -792,7 +792,7 @@ static void handle_merges (long int opcode)
+ smsk = 3; sbitdst = 4; break;
+ default:
+ smsk = 0; sbitdst = 0;
+- abort();
++ uae_abort();
+ break;
+ }
+ smsk <<= table68k[opcode].spos;
diff --git a/emulators/tiemu3/files/patch-src_core_uae_sysdeps.h b/emulators/tiemu3/files/patch-src_core_uae_sysdeps.h
new file mode 100644
index 000000000000..503ef8dc545a
--- /dev/null
+++ b/emulators/tiemu3/files/patch-src_core_uae_sysdeps.h
@@ -0,0 +1,11 @@
+--- src/core/uae/sysdeps.h.orig 2007-06-24 05:05:05 UTC
++++ src/core/uae/sysdeps.h
+@@ -138,7 +138,7 @@ extern void *xcalloc(size_t, size_t);
+ #define ENUMNAME(name) name
+
+ /* While we're here, make abort more useful. */
+-#define abort() \
++#define uae_abort() \
+ do { \
+ fprintf (stderr, "UAE: Internal error; file %s, line %d\n", __FILE__, __LINE__); \
+ (abort) (); \
diff --git a/games/aisleriot/Makefile b/games/aisleriot/Makefile
index 404573d531ce..5537130fc8e6 100644
--- a/games/aisleriot/Makefile
+++ b/games/aisleriot/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= aisleriot
-PORTVERSION= 3.22.2
-PORTREVISION= 5
+PORTVERSION= 3.22.5
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -12,7 +11,6 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Collection of patience games written in guile scheme
BUILD_DEPENDS= itstool:textproc/itstool \
- appstream-builder:devel/appstream-glib \
bash:shells/bash
LIB_DEPENDS= libguile-2.0.so:lang/guile2 \
libcanberra.so:audio/libcanberra \
@@ -36,4 +34,5 @@ GCONF_SCHEMAS= aisleriot.schemas
GLIB_SCHEMAS= org.gnome.Patience.WindowState.gschema.xml
INSTALLS_ICONS= yes
+
.include <bsd.port.mk>
diff --git a/games/aisleriot/distinfo b/games/aisleriot/distinfo
index cbbbaea22e37..9ee9a07181e1 100644
--- a/games/aisleriot/distinfo
+++ b/games/aisleriot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494524582
-SHA256 (gnome3/aisleriot-3.22.2.tar.xz) = bd312f15a2212851f0c80f997c6acbaaaa10f0f5ec544099d5c7c4b74f8e0c29
-SIZE (gnome3/aisleriot-3.22.2.tar.xz) = 6336448
+TIMESTAMP = 1526109122
+SHA256 (gnome3/aisleriot-3.22.5.tar.xz) = f0c3d9c21e6a701442c1a18aec8fe524da68067fd95f10064125f692f54d8366
+SIZE (gnome3/aisleriot-3.22.5.tar.xz) = 5730172
diff --git a/games/five-or-more/Makefile b/games/five-or-more/Makefile
index 20c422d97406..c50082c863f1 100644
--- a/games/five-or-more/Makefile
+++ b/games/five-or-more/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= five-or-more
-PORTVERSION= 3.22.2
+PORTVERSION= 3.28.0
CATEGORIES= games gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Form a line of 5 or more colored balls
diff --git a/games/five-or-more/distinfo b/games/five-or-more/distinfo
index f1e88378c802..01e333d56845 100644
--- a/games/five-or-more/distinfo
+++ b/games/five-or-more/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479045778
-SHA256 (gnome3/five-or-more-3.22.2.tar.xz) = bacf8e03ad9404623a152900b8545d745d38a2fe0f01208bc7dc882cbd5346ac
-SIZE (gnome3/five-or-more-3.22.2.tar.xz) = 3297904
+TIMESTAMP = 1526108705
+SHA256 (gnome/five-or-more-3.28.0.tar.xz) = ac3450045de338e7a2ba6281babbbac443d36937ad10ca405d6a63d9f051c4bb
+SIZE (gnome/five-or-more-3.28.0.tar.xz) = 1507188
diff --git a/games/five-or-more/pkg-plist b/games/five-or-more/pkg-plist
index 241101fcbdeb..06253278d355 100644
--- a/games/five-or-more/pkg-plist
+++ b/games/five-or-more/pkg-plist
@@ -348,34 +348,6 @@ 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/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/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
@@ -404,6 +376,62 @@ 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
+share/help/pl/five-or-more/figures/horizontal.png
+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
+share/help/pl/five-or-more/legal.xml
+share/help/pl/five-or-more/license.page
+share/help/pl/five-or-more/play.page
+share/help/pl/five-or-more/rules.page
+share/help/pl/five-or-more/scores.page
+share/help/pl/five-or-more/shortcuts.page
+share/help/pl/five-or-more/strategy.page
+share/help/pl/five-or-more/translate.page
share/help/pt_BR/five-or-more/bug-filing.page
share/help/pt_BR/five-or-more/change-board-size.page
share/help/pt_BR/five-or-more/change-theme.page
diff --git a/games/four-in-a-row/Makefile b/games/four-in-a-row/Makefile
index dca7ac03bdbc..25a0852c2df0 100644
--- a/games/four-in-a-row/Makefile
+++ b/games/four-in-a-row/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= four-in-a-row
-PORTVERSION= 3.22.1
+PORTVERSION= 3.28.0
CATEGORIES= games gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Make lines of the same color
diff --git a/games/four-in-a-row/distinfo b/games/four-in-a-row/distinfo
index 85bbb4a694cf..b9c6873291a3 100644
--- a/games/four-in-a-row/distinfo
+++ b/games/four-in-a-row/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479047599
-SHA256 (gnome3/four-in-a-row-3.22.1.tar.xz) = 3ccf65a9da08d8e888fa90a7bf55192bc344981cec3b1f56fa0da70f423137d4
-SIZE (gnome3/four-in-a-row-3.22.1.tar.xz) = 1786220
+TIMESTAMP = 1526113000
+SHA256 (gnome/four-in-a-row-3.28.0.tar.xz) = 9368667d7b74192876faf6d1ca9be070f090cd8d951e83c1e25aa42cbc525fc7
+SIZE (gnome/four-in-a-row-3.28.0.tar.xz) = 740784
diff --git a/games/four-in-a-row/pkg-plist b/games/four-in-a-row/pkg-plist
index e36b0a0ad8a6..c2ac00dfbafe 100644
--- a/games/four-in-a-row/pkg-plist
+++ b/games/four-in-a-row/pkg-plist
@@ -1,6 +1,5 @@
bin/four-in-a-row
man/man6/four-in-a-row.6.gz
-share/appdata/four-in-a-row.appdata.xml
share/applications/four-in-a-row.desktop
%%DATADIR%%/bg_toplight.png
%%DATADIR%%/four-in-a-row.ui
@@ -19,8 +18,6 @@ share/help/C/four-in-a-row/choose-opponent.page
share/help/C/four-in-a-row/controls-change.page
share/help/C/four-in-a-row/controls-default.page
share/help/C/four-in-a-row/figures/logo.png
-share/help/C/four-in-a-row/figures/mainwindow.png
-share/help/C/four-in-a-row/figures/tileset.png
share/help/C/four-in-a-row/index.page
share/help/C/four-in-a-row/legal.xml
share/help/C/four-in-a-row/make-easy.page
@@ -32,8 +29,6 @@ share/help/ca/four-in-a-row/choose-opponent.page
share/help/ca/four-in-a-row/controls-change.page
share/help/ca/four-in-a-row/controls-default.page
share/help/ca/four-in-a-row/figures/logo.png
-share/help/ca/four-in-a-row/figures/mainwindow.png
-share/help/ca/four-in-a-row/figures/tileset.png
share/help/ca/four-in-a-row/index.page
share/help/ca/four-in-a-row/legal.xml
share/help/ca/four-in-a-row/make-easy.page
@@ -45,8 +40,6 @@ share/help/cs/four-in-a-row/choose-opponent.page
share/help/cs/four-in-a-row/controls-change.page
share/help/cs/four-in-a-row/controls-default.page
share/help/cs/four-in-a-row/figures/logo.png
-share/help/cs/four-in-a-row/figures/mainwindow.png
-share/help/cs/four-in-a-row/figures/tileset.png
share/help/cs/four-in-a-row/index.page
share/help/cs/four-in-a-row/legal.xml
share/help/cs/four-in-a-row/make-easy.page
@@ -58,8 +51,6 @@ share/help/da/four-in-a-row/choose-opponent.page
share/help/da/four-in-a-row/controls-change.page
share/help/da/four-in-a-row/controls-default.page
share/help/da/four-in-a-row/figures/logo.png
-share/help/da/four-in-a-row/figures/mainwindow.png
-share/help/da/four-in-a-row/figures/tileset.png
share/help/da/four-in-a-row/index.page
share/help/da/four-in-a-row/legal.xml
share/help/da/four-in-a-row/make-easy.page
@@ -71,8 +62,6 @@ share/help/de/four-in-a-row/choose-opponent.page
share/help/de/four-in-a-row/controls-change.page
share/help/de/four-in-a-row/controls-default.page
share/help/de/four-in-a-row/figures/logo.png
-share/help/de/four-in-a-row/figures/mainwindow.png
-share/help/de/four-in-a-row/figures/tileset.png
share/help/de/four-in-a-row/index.page
share/help/de/four-in-a-row/legal.xml
share/help/de/four-in-a-row/make-easy.page
@@ -84,8 +73,6 @@ share/help/el/four-in-a-row/choose-opponent.page
share/help/el/four-in-a-row/controls-change.page
share/help/el/four-in-a-row/controls-default.page
share/help/el/four-in-a-row/figures/logo.png
-share/help/el/four-in-a-row/figures/mainwindow.png
-share/help/el/four-in-a-row/figures/tileset.png
share/help/el/four-in-a-row/index.page
share/help/el/four-in-a-row/legal.xml
share/help/el/four-in-a-row/make-easy.page
@@ -97,8 +84,6 @@ share/help/en_GB/four-in-a-row/choose-opponent.page
share/help/en_GB/four-in-a-row/controls-change.page
share/help/en_GB/four-in-a-row/controls-default.page
share/help/en_GB/four-in-a-row/figures/logo.png
-share/help/en_GB/four-in-a-row/figures/mainwindow.png
-share/help/en_GB/four-in-a-row/figures/tileset.png
share/help/en_GB/four-in-a-row/index.page
share/help/en_GB/four-in-a-row/legal.xml
share/help/en_GB/four-in-a-row/make-easy.page
@@ -110,8 +95,6 @@ share/help/es/four-in-a-row/choose-opponent.page
share/help/es/four-in-a-row/controls-change.page
share/help/es/four-in-a-row/controls-default.page
share/help/es/four-in-a-row/figures/logo.png
-share/help/es/four-in-a-row/figures/mainwindow.png
-share/help/es/four-in-a-row/figures/tileset.png
share/help/es/four-in-a-row/index.page
share/help/es/four-in-a-row/legal.xml
share/help/es/four-in-a-row/make-easy.page
@@ -123,8 +106,6 @@ share/help/eu/four-in-a-row/choose-opponent.page
share/help/eu/four-in-a-row/controls-change.page
share/help/eu/four-in-a-row/controls-default.page
share/help/eu/four-in-a-row/figures/logo.png
-share/help/eu/four-in-a-row/figures/mainwindow.png
-share/help/eu/four-in-a-row/figures/tileset.png
share/help/eu/four-in-a-row/index.page
share/help/eu/four-in-a-row/legal.xml
share/help/eu/four-in-a-row/make-easy.page
@@ -136,8 +117,6 @@ share/help/fi/four-in-a-row/choose-opponent.page
share/help/fi/four-in-a-row/controls-change.page
share/help/fi/four-in-a-row/controls-default.page
share/help/fi/four-in-a-row/figures/logo.png
-share/help/fi/four-in-a-row/figures/mainwindow.png
-share/help/fi/four-in-a-row/figures/tileset.png
share/help/fi/four-in-a-row/index.page
share/help/fi/four-in-a-row/legal.xml
share/help/fi/four-in-a-row/make-easy.page
@@ -149,8 +128,6 @@ share/help/fr/four-in-a-row/choose-opponent.page
share/help/fr/four-in-a-row/controls-change.page
share/help/fr/four-in-a-row/controls-default.page
share/help/fr/four-in-a-row/figures/logo.png
-share/help/fr/four-in-a-row/figures/mainwindow.png
-share/help/fr/four-in-a-row/figures/tileset.png
share/help/fr/four-in-a-row/index.page
share/help/fr/four-in-a-row/legal.xml
share/help/fr/four-in-a-row/make-easy.page
@@ -162,60 +139,61 @@ share/help/hu/four-in-a-row/choose-opponent.page
share/help/hu/four-in-a-row/controls-change.page
share/help/hu/four-in-a-row/controls-default.page
share/help/hu/four-in-a-row/figures/logo.png
-share/help/hu/four-in-a-row/figures/mainwindow.png
-share/help/hu/four-in-a-row/figures/tileset.png
share/help/hu/four-in-a-row/index.page
share/help/hu/four-in-a-row/legal.xml
share/help/hu/four-in-a-row/make-easy.page
share/help/hu/four-in-a-row/scores.page
share/help/hu/four-in-a-row/sound-animation.page
-share/help/ko/four-in-a-row/appearance.page
-share/help/ko/four-in-a-row/basics.page
-share/help/ko/four-in-a-row/choose-opponent.page
-share/help/ko/four-in-a-row/controls-change.page
-share/help/ko/four-in-a-row/controls-default.page
-share/help/ko/four-in-a-row/figures/logo.png
-share/help/ko/four-in-a-row/figures/mainwindow.png
-share/help/ko/four-in-a-row/figures/tileset.png
-share/help/ko/four-in-a-row/index.page
-share/help/ko/four-in-a-row/legal.xml
-share/help/ko/four-in-a-row/make-easy.page
-share/help/ko/four-in-a-row/scores.page
-share/help/ko/four-in-a-row/sound-animation.page
share/help/it/four-in-a-row/appearance.page
share/help/it/four-in-a-row/basics.page
share/help/it/four-in-a-row/choose-opponent.page
share/help/it/four-in-a-row/controls-change.page
share/help/it/four-in-a-row/controls-default.page
share/help/it/four-in-a-row/figures/logo.png
-share/help/it/four-in-a-row/figures/mainwindow.png
-share/help/it/four-in-a-row/figures/tileset.png
share/help/it/four-in-a-row/index.page
share/help/it/four-in-a-row/legal.xml
share/help/it/four-in-a-row/make-easy.page
share/help/it/four-in-a-row/scores.page
share/help/it/four-in-a-row/sound-animation.page
+share/help/ko/four-in-a-row/appearance.page
+share/help/ko/four-in-a-row/basics.page
+share/help/ko/four-in-a-row/choose-opponent.page
+share/help/ko/four-in-a-row/controls-change.page
+share/help/ko/four-in-a-row/controls-default.page
+share/help/ko/four-in-a-row/figures/logo.png
+share/help/ko/four-in-a-row/index.page
+share/help/ko/four-in-a-row/legal.xml
+share/help/ko/four-in-a-row/make-easy.page
+share/help/ko/four-in-a-row/scores.page
+share/help/ko/four-in-a-row/sound-animation.page
share/help/oc/four-in-a-row/appearance.page
share/help/oc/four-in-a-row/basics.page
share/help/oc/four-in-a-row/choose-opponent.page
share/help/oc/four-in-a-row/controls-change.page
share/help/oc/four-in-a-row/controls-default.page
share/help/oc/four-in-a-row/figures/logo.png
-share/help/oc/four-in-a-row/figures/mainwindow.png
-share/help/oc/four-in-a-row/figures/tileset.png
share/help/oc/four-in-a-row/index.page
share/help/oc/four-in-a-row/legal.xml
share/help/oc/four-in-a-row/make-easy.page
share/help/oc/four-in-a-row/scores.page
share/help/oc/four-in-a-row/sound-animation.page
+share/help/pl/four-in-a-row/appearance.page
+share/help/pl/four-in-a-row/basics.page
+share/help/pl/four-in-a-row/choose-opponent.page
+share/help/pl/four-in-a-row/controls-change.page
+share/help/pl/four-in-a-row/controls-default.page
+share/help/pl/four-in-a-row/figures/logo.png
+share/help/pl/four-in-a-row/index.page
+share/help/pl/four-in-a-row/legal.xml
+share/help/pl/four-in-a-row/make-easy.page
+share/help/pl/four-in-a-row/scores.page
+share/help/pl/four-in-a-row/sound-animation.page
share/help/pt_BR/four-in-a-row/appearance.page
share/help/pt_BR/four-in-a-row/basics.page
share/help/pt_BR/four-in-a-row/choose-opponent.page
share/help/pt_BR/four-in-a-row/controls-change.page
share/help/pt_BR/four-in-a-row/controls-default.page
share/help/pt_BR/four-in-a-row/figures/logo.png
-share/help/pt_BR/four-in-a-row/figures/mainwindow.png
-share/help/pt_BR/four-in-a-row/figures/tileset.png
share/help/pt_BR/four-in-a-row/index.page
share/help/pt_BR/four-in-a-row/legal.xml
share/help/pt_BR/four-in-a-row/make-easy.page
@@ -227,8 +205,6 @@ share/help/sl/four-in-a-row/choose-opponent.page
share/help/sl/four-in-a-row/controls-change.page
share/help/sl/four-in-a-row/controls-default.page
share/help/sl/four-in-a-row/figures/logo.png
-share/help/sl/four-in-a-row/figures/mainwindow.png
-share/help/sl/four-in-a-row/figures/tileset.png
share/help/sl/four-in-a-row/index.page
share/help/sl/four-in-a-row/legal.xml
share/help/sl/four-in-a-row/make-easy.page
@@ -240,8 +216,6 @@ share/help/sr/four-in-a-row/choose-opponent.page
share/help/sr/four-in-a-row/controls-change.page
share/help/sr/four-in-a-row/controls-default.page
share/help/sr/four-in-a-row/figures/logo.png
-share/help/sr/four-in-a-row/figures/mainwindow.png
-share/help/sr/four-in-a-row/figures/tileset.png
share/help/sr/four-in-a-row/index.page
share/help/sr/four-in-a-row/legal.xml
share/help/sr/four-in-a-row/make-easy.page
@@ -253,8 +227,6 @@ share/help/sr@latin/four-in-a-row/choose-opponent.page
share/help/sr@latin/four-in-a-row/controls-change.page
share/help/sr@latin/four-in-a-row/controls-default.page
share/help/sr@latin/four-in-a-row/figures/logo.png
-share/help/sr@latin/four-in-a-row/figures/mainwindow.png
-share/help/sr@latin/four-in-a-row/figures/tileset.png
share/help/sr@latin/four-in-a-row/index.page
share/help/sr@latin/four-in-a-row/legal.xml
share/help/sr@latin/four-in-a-row/make-easy.page
@@ -266,8 +238,6 @@ share/help/sv/four-in-a-row/choose-opponent.page
share/help/sv/four-in-a-row/controls-change.page
share/help/sv/four-in-a-row/controls-default.page
share/help/sv/four-in-a-row/figures/logo.png
-share/help/sv/four-in-a-row/figures/mainwindow.png
-share/help/sv/four-in-a-row/figures/tileset.png
share/help/sv/four-in-a-row/index.page
share/help/sv/four-in-a-row/legal.xml
share/help/sv/four-in-a-row/make-easy.page
@@ -279,8 +249,6 @@ share/help/zh_CN/four-in-a-row/choose-opponent.page
share/help/zh_CN/four-in-a-row/controls-change.page
share/help/zh_CN/four-in-a-row/controls-default.page
share/help/zh_CN/four-in-a-row/figures/logo.png
-share/help/zh_CN/four-in-a-row/figures/mainwindow.png
-share/help/zh_CN/four-in-a-row/figures/tileset.png
share/help/zh_CN/four-in-a-row/index.page
share/help/zh_CN/four-in-a-row/legal.xml
share/help/zh_CN/four-in-a-row/make-easy.page
@@ -383,3 +351,4 @@ share/locale/xh/LC_MESSAGES/four-in-a-row.mo
share/locale/zh_CN/LC_MESSAGES/four-in-a-row.mo
share/locale/zh_HK/LC_MESSAGES/four-in-a-row.mo
share/locale/zh_TW/LC_MESSAGES/four-in-a-row.mo
+share/metainfo/four-in-a-row.appdata.xml
diff --git a/games/gnome-2048/Makefile b/games/gnome-2048/Makefile
index a22faa69a692..1f47626092ad 100644
--- a/games/gnome-2048/Makefile
+++ b/games/gnome-2048/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-2048
-PORTVERSION= 3.22.0
+PORTVERSION= 3.26.1
CATEGORIES= games gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Move the tiles until you obtain the 2048 tile
diff --git a/games/gnome-2048/distinfo b/games/gnome-2048/distinfo
index ba7f7684288d..142bbc905126 100644
--- a/games/gnome-2048/distinfo
+++ b/games/gnome-2048/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481233919
-SHA256 (gnome3/gnome-2048-3.22.0.tar.xz) = 78db8d709963d99c5d7b8233c7ba6b347a224c7a664de9933eadd29a349e59fa
-SIZE (gnome3/gnome-2048-3.22.0.tar.xz) = 402264
+TIMESTAMP = 1525548734
+SHA256 (gnome/gnome-2048-3.26.1.tar.xz) = c10ca70a26365ceb93be8475758debe313f3db842046831cf2239ccdffa35035
+SIZE (gnome/gnome-2048-3.26.1.tar.xz) = 394804
diff --git a/games/gnome-2048/pkg-plist b/games/gnome-2048/pkg-plist
index d703dc5e660b..8b77f4ae538b 100644
--- a/games/gnome-2048/pkg-plist
+++ b/games/gnome-2048/pkg-plist
@@ -19,6 +19,12 @@ share/help/es/gnome-2048/media/gnome-204822.png
share/help/hu/gnome-2048/index.page
share/help/hu/gnome-2048/media/gnome-2048.png
share/help/hu/gnome-2048/media/gnome-204822.png
+share/help/pl/gnome-2048/index.page
+share/help/pl/gnome-2048/media/gnome-2048.png
+share/help/pl/gnome-2048/media/gnome-204822.png
+share/help/pt_BR/gnome-2048/index.page
+share/help/pt_BR/gnome-2048/media/gnome-2048.png
+share/help/pt_BR/gnome-2048/media/gnome-204822.png
share/help/sv/gnome-2048/index.page
share/help/sv/gnome-2048/media/gnome-2048.png
share/help/sv/gnome-2048/media/gnome-204822.png
@@ -38,9 +44,11 @@ share/locale/el/LC_MESSAGES/gnome-2048.mo
share/locale/es/LC_MESSAGES/gnome-2048.mo
share/locale/fi/LC_MESSAGES/gnome-2048.mo
share/locale/fr/LC_MESSAGES/gnome-2048.mo
+share/locale/fur/LC_MESSAGES/gnome-2048.mo
share/locale/he/LC_MESSAGES/gnome-2048.mo
share/locale/hu/LC_MESSAGES/gnome-2048.mo
share/locale/id/LC_MESSAGES/gnome-2048.mo
+share/locale/it/LC_MESSAGES/gnome-2048.mo
share/locale/lt/LC_MESSAGES/gnome-2048.mo
share/locale/pl/LC_MESSAGES/gnome-2048.mo
share/locale/pt/LC_MESSAGES/gnome-2048.mo
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index ef950365673c..9773cea68f1e 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-chess
-PORTVERSION= 3.24.1
-PORTREVISION= 1
+PORTVERSION= 3.28.1
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -20,18 +19,18 @@ BUILD_DEPENDS= vala:lang/vala \
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake gnome \
- localbase pkgconfig tar:xz
+USES= desktop-file-utils gettext gnome localbase meson \
+ pkgconfig python:3.6+,build tar:xz
USE_GNOME= cairo gtk30 librsvg2 libxml2:build
INSTALLS_ICONS= yes
-USE_XORG= x11
-USE_GL= gl glu
-GNU_CONFIGURE= yes
+USE_GL= gl egl
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.chess.gschema.xml
OPTIONS_DEFINE= GNUCHESS
OPTIONS_DEFAULT=GNUCHESS
+
GNUCHESS_DESC= Use gnuchess engine for computer player
GNUCHESS_RUN_DEPENDS= gnuchess:games/gnuchess
diff --git a/games/gnome-chess/distinfo b/games/gnome-chess/distinfo
index e02a5a2f35e4..74201a23940e 100644
--- a/games/gnome-chess/distinfo
+++ b/games/gnome-chess/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494623251
-SHA256 (gnome3/gnome-chess-3.24.1.tar.xz) = 6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3
-SIZE (gnome3/gnome-chess-3.24.1.tar.xz) = 2808208
+TIMESTAMP = 1525548927
+SHA256 (gnome3/gnome-chess-3.28.1.tar.xz) = 61d7eda645ab74fcf6fa586bc3edc49f01d4a4076f98e1e53d4b4c842b600fe1
+SIZE (gnome3/gnome-chess-3.28.1.tar.xz) = 1697524
diff --git a/games/gnome-chess/pkg-plist b/games/gnome-chess/pkg-plist
index f1b95ad668f9..8cc79bfd9944 100644
--- a/games/gnome-chess/pkg-plist
+++ b/games/gnome-chess/pkg-plist
@@ -1,139 +1,143 @@
bin/gnome-chess
%%ETCDIR%%/engines.conf
man/man6/gnome-chess.6.gz
-share/appdata/gnome-chess.appdata.xml
share/applications/gnome-chess.desktop
-share/gnome-chess/pieces/fancy/blackBishop.svg
-share/gnome-chess/pieces/fancy/blackKing.svg
-share/gnome-chess/pieces/fancy/blackKnight.svg
-share/gnome-chess/pieces/fancy/blackPawn.svg
-share/gnome-chess/pieces/fancy/blackQueen.svg
-share/gnome-chess/pieces/fancy/blackRook.svg
-share/gnome-chess/pieces/fancy/whiteBishop.svg
-share/gnome-chess/pieces/fancy/whiteKing.svg
-share/gnome-chess/pieces/fancy/whiteKnight.svg
-share/gnome-chess/pieces/fancy/whitePawn.svg
-share/gnome-chess/pieces/fancy/whiteQueen.svg
-share/gnome-chess/pieces/fancy/whiteRook.svg
-share/gnome-chess/pieces/simple/blackBishop.svg
-share/gnome-chess/pieces/simple/blackKing.svg
-share/gnome-chess/pieces/simple/blackKnight.svg
-share/gnome-chess/pieces/simple/blackPawn.svg
-share/gnome-chess/pieces/simple/blackQueen.svg
-share/gnome-chess/pieces/simple/blackRook.svg
-share/gnome-chess/pieces/simple/whiteBishop.svg
-share/gnome-chess/pieces/simple/whiteKing.svg
-share/gnome-chess/pieces/simple/whiteKnight.svg
-share/gnome-chess/pieces/simple/whitePawn.svg
-share/gnome-chess/pieces/simple/whiteQueen.svg
-share/gnome-chess/pieces/simple/whiteRook.svg
-share/help/C/gnome-chess/index.docbook
-share/help/C/gnome-chess/legal.xml
+%%DATADIR%%/pieces/fancy/blackBishop.svg
+%%DATADIR%%/pieces/fancy/blackKing.svg
+%%DATADIR%%/pieces/fancy/blackKnight.svg
+%%DATADIR%%/pieces/fancy/blackPawn.svg
+%%DATADIR%%/pieces/fancy/blackQueen.svg
+%%DATADIR%%/pieces/fancy/blackRook.svg
+%%DATADIR%%/pieces/fancy/whiteBishop.svg
+%%DATADIR%%/pieces/fancy/whiteKing.svg
+%%DATADIR%%/pieces/fancy/whiteKnight.svg
+%%DATADIR%%/pieces/fancy/whitePawn.svg
+%%DATADIR%%/pieces/fancy/whiteQueen.svg
+%%DATADIR%%/pieces/fancy/whiteRook.svg
+%%DATADIR%%/pieces/simple/COPYING.html
+%%DATADIR%%/pieces/simple/blackBishop.svg
+%%DATADIR%%/pieces/simple/blackKing.svg
+%%DATADIR%%/pieces/simple/blackKnight.svg
+%%DATADIR%%/pieces/simple/blackPawn.svg
+%%DATADIR%%/pieces/simple/blackQueen.svg
+%%DATADIR%%/pieces/simple/blackRook.svg
+%%DATADIR%%/pieces/simple/whiteBishop.svg
+%%DATADIR%%/pieces/simple/whiteKing.svg
+%%DATADIR%%/pieces/simple/whiteKnight.svg
+%%DATADIR%%/pieces/simple/whitePawn.svg
+%%DATADIR%%/pieces/simple/whiteQueen.svg
+%%DATADIR%%/pieces/simple/whiteRook.svg
share/help/C/gnome-chess/figures/game-3-12.png
share/help/C/gnome-chess/figures/preferences-appearance-3-12.png
share/help/C/gnome-chess/figures/preferences-game-3-12.png
-share/help/ca/gnome-chess/index.docbook
-share/help/ca/gnome-chess/legal.xml
+share/help/C/gnome-chess/index.docbook
+share/help/C/gnome-chess/legal.xml
share/help/ca/gnome-chess/figures/game-3-12.png
share/help/ca/gnome-chess/figures/preferences-appearance-3-12.png
share/help/ca/gnome-chess/figures/preferences-game-3-12.png
-share/help/cs/gnome-chess/index.docbook
-share/help/cs/gnome-chess/legal.xml
+share/help/ca/gnome-chess/index.docbook
+share/help/ca/gnome-chess/legal.xml
share/help/cs/gnome-chess/figures/game-3-12.png
share/help/cs/gnome-chess/figures/preferences-appearance-3-12.png
share/help/cs/gnome-chess/figures/preferences-game-3-12.png
-share/help/da/gnome-chess/index.docbook
-share/help/da/gnome-chess/legal.xml
+share/help/cs/gnome-chess/index.docbook
+share/help/cs/gnome-chess/legal.xml
share/help/da/gnome-chess/figures/game-3-12.png
share/help/da/gnome-chess/figures/preferences-appearance-3-12.png
share/help/da/gnome-chess/figures/preferences-game-3-12.png
-share/help/de/gnome-chess/index.docbook
-share/help/de/gnome-chess/legal.xml
+share/help/da/gnome-chess/index.docbook
+share/help/da/gnome-chess/legal.xml
share/help/de/gnome-chess/figures/game-3-12.png
share/help/de/gnome-chess/figures/preferences-appearance-3-12.png
share/help/de/gnome-chess/figures/preferences-game-3-12.png
-share/help/el/gnome-chess/index.docbook
-share/help/el/gnome-chess/legal.xml
+share/help/de/gnome-chess/index.docbook
+share/help/de/gnome-chess/legal.xml
share/help/el/gnome-chess/figures/game-3-12.png
share/help/el/gnome-chess/figures/preferences-appearance-3-12.png
share/help/el/gnome-chess/figures/preferences-game-3-12.png
-share/help/en_GB/gnome-chess/index.docbook
-share/help/en_GB/gnome-chess/legal.xml
+share/help/el/gnome-chess/index.docbook
+share/help/el/gnome-chess/legal.xml
share/help/en_GB/gnome-chess/figures/game-3-12.png
share/help/en_GB/gnome-chess/figures/preferences-appearance-3-12.png
share/help/en_GB/gnome-chess/figures/preferences-game-3-12.png
-share/help/es/gnome-chess/index.docbook
-share/help/es/gnome-chess/legal.xml
+share/help/en_GB/gnome-chess/index.docbook
+share/help/en_GB/gnome-chess/legal.xml
share/help/es/gnome-chess/figures/game-3-12.png
share/help/es/gnome-chess/figures/preferences-appearance-3-12.png
share/help/es/gnome-chess/figures/preferences-game-3-12.png
-share/help/eu/gnome-chess/index.docbook
-share/help/eu/gnome-chess/legal.xml
+share/help/es/gnome-chess/index.docbook
+share/help/es/gnome-chess/legal.xml
share/help/eu/gnome-chess/figures/game-3-12.png
share/help/eu/gnome-chess/figures/preferences-appearance-3-12.png
share/help/eu/gnome-chess/figures/preferences-game-3-12.png
-share/help/fr/gnome-chess/index.docbook
-share/help/fr/gnome-chess/legal.xml
+share/help/eu/gnome-chess/index.docbook
+share/help/eu/gnome-chess/legal.xml
share/help/fr/gnome-chess/figures/game-3-12.png
share/help/fr/gnome-chess/figures/preferences-appearance-3-12.png
share/help/fr/gnome-chess/figures/preferences-game-3-12.png
-share/help/gl/gnome-chess/index.docbook
-share/help/gl/gnome-chess/legal.xml
+share/help/fr/gnome-chess/index.docbook
+share/help/fr/gnome-chess/legal.xml
share/help/gl/gnome-chess/figures/game-3-12.png
share/help/gl/gnome-chess/figures/preferences-appearance-3-12.png
share/help/gl/gnome-chess/figures/preferences-game-3-12.png
-share/help/ja/gnome-chess/index.docbook
-share/help/ja/gnome-chess/legal.xml
+share/help/gl/gnome-chess/index.docbook
+share/help/gl/gnome-chess/legal.xml
share/help/ja/gnome-chess/figures/game-3-12.png
share/help/ja/gnome-chess/figures/preferences-appearance-3-12.png
share/help/ja/gnome-chess/figures/preferences-game-3-12.png
-share/help/ko/gnome-chess/index.docbook
-share/help/ko/gnome-chess/legal.xml
+share/help/ja/gnome-chess/index.docbook
+share/help/ja/gnome-chess/legal.xml
share/help/ko/gnome-chess/figures/game-3-12.png
share/help/ko/gnome-chess/figures/preferences-appearance-3-12.png
share/help/ko/gnome-chess/figures/preferences-game-3-12.png
-share/help/oc/gnome-chess/index.docbook
-share/help/oc/gnome-chess/legal.xml
+share/help/ko/gnome-chess/index.docbook
+share/help/ko/gnome-chess/legal.xml
share/help/oc/gnome-chess/figures/game-3-12.png
share/help/oc/gnome-chess/figures/preferences-appearance-3-12.png
share/help/oc/gnome-chess/figures/preferences-game-3-12.png
-share/help/pt_BR/gnome-chess/index.docbook
-share/help/pt_BR/gnome-chess/legal.xml
+share/help/oc/gnome-chess/index.docbook
+share/help/oc/gnome-chess/legal.xml
+share/help/pl/gnome-chess/figures/game-3-12.png
+share/help/pl/gnome-chess/figures/preferences-appearance-3-12.png
+share/help/pl/gnome-chess/figures/preferences-game-3-12.png
+share/help/pl/gnome-chess/index.docbook
+share/help/pl/gnome-chess/legal.xml
share/help/pt_BR/gnome-chess/figures/game-3-12.png
share/help/pt_BR/gnome-chess/figures/preferences-appearance-3-12.png
share/help/pt_BR/gnome-chess/figures/preferences-game-3-12.png
-share/help/ru/gnome-chess/index.docbook
-share/help/ru/gnome-chess/legal.xml
+share/help/pt_BR/gnome-chess/index.docbook
+share/help/pt_BR/gnome-chess/legal.xml
share/help/ru/gnome-chess/figures/game-3-12.png
share/help/ru/gnome-chess/figures/preferences-appearance-3-12.png
share/help/ru/gnome-chess/figures/preferences-game-3-12.png
-share/help/sl/gnome-chess/index.docbook
-share/help/sl/gnome-chess/legal.xml
+share/help/ru/gnome-chess/index.docbook
+share/help/ru/gnome-chess/legal.xml
share/help/sl/gnome-chess/figures/game-3-12.png
share/help/sl/gnome-chess/figures/preferences-appearance-3-12.png
share/help/sl/gnome-chess/figures/preferences-game-3-12.png
-share/help/sr/gnome-chess/index.docbook
-share/help/sr/gnome-chess/legal.xml
+share/help/sl/gnome-chess/index.docbook
+share/help/sl/gnome-chess/legal.xml
share/help/sr/gnome-chess/figures/game-3-12.png
share/help/sr/gnome-chess/figures/preferences-appearance-3-12.png
share/help/sr/gnome-chess/figures/preferences-game-3-12.png
-share/help/sr@latin/gnome-chess/index.docbook
-share/help/sr@latin/gnome-chess/legal.xml
+share/help/sr/gnome-chess/index.docbook
+share/help/sr/gnome-chess/legal.xml
share/help/sr@latin/gnome-chess/figures/game-3-12.png
share/help/sr@latin/gnome-chess/figures/preferences-appearance-3-12.png
share/help/sr@latin/gnome-chess/figures/preferences-game-3-12.png
-share/help/sv/gnome-chess/index.docbook
-share/help/sv/gnome-chess/legal.xml
+share/help/sr@latin/gnome-chess/index.docbook
+share/help/sr@latin/gnome-chess/legal.xml
share/help/sv/gnome-chess/figures/game-3-12.png
share/help/sv/gnome-chess/figures/preferences-appearance-3-12.png
share/help/sv/gnome-chess/figures/preferences-game-3-12.png
-share/help/zh_CN/gnome-chess/index.docbook
-share/help/zh_CN/gnome-chess/legal.xml
+share/help/sv/gnome-chess/index.docbook
+share/help/sv/gnome-chess/legal.xml
share/help/zh_CN/gnome-chess/figures/game-3-12.png
share/help/zh_CN/gnome-chess/figures/preferences-appearance-3-12.png
share/help/zh_CN/gnome-chess/figures/preferences-game-3-12.png
+share/help/zh_CN/gnome-chess/index.docbook
+share/help/zh_CN/gnome-chess/legal.xml
share/icons/hicolor/16x16/apps/gnome-chess.png
-share/icons/hicolor/22x22/apps/gnome-chess.png
share/icons/hicolor/24x24/apps/gnome-chess.png
share/icons/hicolor/256x256/apps/gnome-chess.png
share/icons/hicolor/32x32/apps/gnome-chess.png
@@ -229,3 +233,4 @@ share/locale/xh/LC_MESSAGES/gnome-chess.mo
share/locale/zh_CN/LC_MESSAGES/gnome-chess.mo
share/locale/zh_HK/LC_MESSAGES/gnome-chess.mo
share/locale/zh_TW/LC_MESSAGES/gnome-chess.mo
+share/metainfo/gnome-chess.appdata.xml
diff --git a/games/gnome-klotski/Makefile b/games/gnome-klotski/Makefile
index 92df412cc309..320e6c38b8f3 100644
--- a/games/gnome-klotski/Makefile
+++ b/games/gnome-klotski/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-klotski
-PORTVERSION= 3.22.1
+PORTVERSION= 3.22.3
CATEGORIES= games gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome klotski
diff --git a/games/gnome-klotski/distinfo b/games/gnome-klotski/distinfo
index 8edc12cc35ac..77ea7615df8c 100644
--- a/games/gnome-klotski/distinfo
+++ b/games/gnome-klotski/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481296504
-SHA256 (gnome3/gnome-klotski-3.22.1.tar.xz) = 7860ab0aa1089a4e4573cd66498685638d58a312f30737456c5e27f1f37e2a13
-SIZE (gnome3/gnome-klotski-3.22.1.tar.xz) = 1420512
+TIMESTAMP = 1526112914
+SHA256 (gnome/gnome-klotski-3.22.3.tar.xz) = eee480149cabe2cb2d2a68fcba637e020b94baf3e085b9fd7fd4b58b84062c5f
+SIZE (gnome/gnome-klotski-3.22.3.tar.xz) = 664380
diff --git a/games/gnome-klotski/pkg-plist b/games/gnome-klotski/pkg-plist
index 643550159133..f96bcaa0112e 100644
--- a/games/gnome-klotski/pkg-plist
+++ b/games/gnome-klotski/pkg-plist
@@ -1,6 +1,5 @@
bin/gnome-klotski
man/man6/gnome-klotski.6.gz
-share/appdata/gnome-klotski.appdata.xml
share/applications/gnome-klotski.desktop
%%DATADIR%%/gnome-klotski.svg
share/help/C/gnome-klotski/figures/gnotski_start_window.png
@@ -55,6 +54,10 @@ share/help/oc/gnome-klotski/figures/gnotski_start_window.png
share/help/oc/gnome-klotski/figures/gnotski_win.png
share/help/oc/gnome-klotski/index.docbook
share/help/oc/gnome-klotski/legal.xml
+share/help/pl/gnome-klotski/figures/gnotski_start_window.png
+share/help/pl/gnome-klotski/figures/gnotski_win.png
+share/help/pl/gnome-klotski/index.docbook
+share/help/pl/gnome-klotski/legal.xml
share/help/sl/gnome-klotski/figures/gnotski_start_window.png
share/help/sl/gnome-klotski/figures/gnotski_win.png
share/help/sl/gnome-klotski/index.docbook
@@ -171,3 +174,4 @@ share/locale/xh/LC_MESSAGES/gnome-klotski.mo
share/locale/zh_CN/LC_MESSAGES/gnome-klotski.mo
share/locale/zh_HK/LC_MESSAGES/gnome-klotski.mo
share/locale/zh_TW/LC_MESSAGES/gnome-klotski.mo
+share/metainfo/gnome-klotski.appdata.xml
diff --git a/games/gnome-mines/Makefile b/games/gnome-mines/Makefile
index d61f4e264449..582bc1d36720 100644
--- a/games/gnome-mines/Makefile
+++ b/games/gnome-mines/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-mines
-PORTVERSION= 3.24.0
+PORTVERSION= 3.28.0
CATEGORIES= games gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome minesweeper
@@ -20,11 +20,11 @@ LIB_DEPENDS= libgnome-games-support-1.so:games/libgnome-games-support \
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome localbase pathfix pkgconfig tar:xz
-USE_GNOME= cairo gtk30 intlhack librsvg2 libxml2:build
+USES= gettext gnome localbase meson pkgconfig python:3.6+,build tar:xz
+USE_GNOME= gtk30 librsvg2
INSTALLS_ICONS= yes
-GNU_CONFIGURE= yes
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.mines.gschema.xml
.include <bsd.port.mk>
diff --git a/games/gnome-mines/distinfo b/games/gnome-mines/distinfo
index 5035380f8f3f..6c125b4b41bc 100644
--- a/games/gnome-mines/distinfo
+++ b/games/gnome-mines/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494624261
-SHA256 (gnome3/gnome-mines-3.24.0.tar.xz) = e663af29235a5c3f03d90f135487f57e5fd9137480dafb0ae9efc0da855602f6
-SIZE (gnome3/gnome-mines-3.24.0.tar.xz) = 3145152
+TIMESTAMP = 1526107621
+SHA256 (gnome/gnome-mines-3.28.0.tar.xz) = 6e77d79056b19c2c805250cb759e5f78711fb1b1f7250b0edaecc6ae302c859b
+SIZE (gnome/gnome-mines-3.28.0.tar.xz) = 453532
diff --git a/games/gnome-mines/pkg-descr b/games/gnome-mines/pkg-descr
index 1ba112d30fe8..c131ff01cf79 100644
--- a/games/gnome-mines/pkg-descr
+++ b/games/gnome-mines/pkg-descr
@@ -1,4 +1,4 @@
Mines (or gnomine) is a puzzle game where you locate mines floating in an
-ocean using only your brain and a little bit of luck.
+ocean using only your brain and a little bit of luck.
WWW: https://wiki.gnome.org/Apps/Mines
diff --git a/games/gnome-mines/pkg-plist b/games/gnome-mines/pkg-plist
index d5d74599d5e4..e4b35c1984b9 100644
--- a/games/gnome-mines/pkg-plist
+++ b/games/gnome-mines/pkg-plist
@@ -1,9 +1,6 @@
bin/gnome-mines
man/man6/gnome-mines.6.gz
-share/appdata/gnome-mines.appdata.xml
share/applications/gnome-mines.desktop
-%%DATADIR%%/gnome-mines.css
-%%DATADIR%%/interface.ui
%%DATADIR%%/themes/bgcolors/1mines.svg
%%DATADIR%%/themes/bgcolors/2mines.svg
%%DATADIR%%/themes/bgcolors/3mines.svg
@@ -53,23 +50,11 @@ share/help/C/gnome-mines/board-size.page
share/help/C/gnome-mines/bug-filing.page
share/help/C/gnome-mines/develop.page
share/help/C/gnome-mines/documentation.page
-share/help/C/gnome-mines/figures/easy-hints-1.png
-share/help/C/gnome-mines/figures/easy-hints-2.png
-share/help/C/gnome-mines/figures/easy-hints-3.png
share/help/C/gnome-mines/figures/flag-question.svg
share/help/C/gnome-mines/figures/flag.svg
share/help/C/gnome-mines/figures/flags.png
-share/help/C/gnome-mines/figures/gnome-mines.png
-share/help/C/gnome-mines/figures/hard-hints-1.png
-share/help/C/gnome-mines/figures/hard-hints-2.png
-share/help/C/gnome-mines/figures/hard-hints-3.png
-share/help/C/gnome-mines/figures/highscores.png
-share/help/C/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/C/gnome-mines/figures/logo.png
share/help/C/gnome-mines/figures/logo32.png
-share/help/C/gnome-mines/figures/main-window.png
-share/help/C/gnome-mines/figures/preferences.png
-share/help/C/gnome-mines/figures/statusbar.png
share/help/C/gnome-mines/flags.page
share/help/C/gnome-mines/get-help.page
share/help/C/gnome-mines/high-scores.page
@@ -83,23 +68,11 @@ share/help/ca/gnome-mines/board-size.page
share/help/ca/gnome-mines/bug-filing.page
share/help/ca/gnome-mines/develop.page
share/help/ca/gnome-mines/documentation.page
-share/help/ca/gnome-mines/figures/easy-hints-1.png
-share/help/ca/gnome-mines/figures/easy-hints-2.png
-share/help/ca/gnome-mines/figures/easy-hints-3.png
share/help/ca/gnome-mines/figures/flag-question.svg
share/help/ca/gnome-mines/figures/flag.svg
share/help/ca/gnome-mines/figures/flags.png
-share/help/ca/gnome-mines/figures/gnome-mines.png
-share/help/ca/gnome-mines/figures/hard-hints-1.png
-share/help/ca/gnome-mines/figures/hard-hints-2.png
-share/help/ca/gnome-mines/figures/hard-hints-3.png
-share/help/ca/gnome-mines/figures/highscores.png
-share/help/ca/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/ca/gnome-mines/figures/logo.png
share/help/ca/gnome-mines/figures/logo32.png
-share/help/ca/gnome-mines/figures/main-window.png
-share/help/ca/gnome-mines/figures/preferences.png
-share/help/ca/gnome-mines/figures/statusbar.png
share/help/ca/gnome-mines/flags.page
share/help/ca/gnome-mines/get-help.page
share/help/ca/gnome-mines/high-scores.page
@@ -113,23 +86,11 @@ share/help/cs/gnome-mines/board-size.page
share/help/cs/gnome-mines/bug-filing.page
share/help/cs/gnome-mines/develop.page
share/help/cs/gnome-mines/documentation.page
-share/help/cs/gnome-mines/figures/easy-hints-1.png
-share/help/cs/gnome-mines/figures/easy-hints-2.png
-share/help/cs/gnome-mines/figures/easy-hints-3.png
share/help/cs/gnome-mines/figures/flag-question.svg
share/help/cs/gnome-mines/figures/flag.svg
share/help/cs/gnome-mines/figures/flags.png
-share/help/cs/gnome-mines/figures/gnome-mines.png
-share/help/cs/gnome-mines/figures/hard-hints-1.png
-share/help/cs/gnome-mines/figures/hard-hints-2.png
-share/help/cs/gnome-mines/figures/hard-hints-3.png
-share/help/cs/gnome-mines/figures/highscores.png
-share/help/cs/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/cs/gnome-mines/figures/logo.png
share/help/cs/gnome-mines/figures/logo32.png
-share/help/cs/gnome-mines/figures/main-window.png
-share/help/cs/gnome-mines/figures/preferences.png
-share/help/cs/gnome-mines/figures/statusbar.png
share/help/cs/gnome-mines/flags.page
share/help/cs/gnome-mines/get-help.page
share/help/cs/gnome-mines/high-scores.page
@@ -143,23 +104,11 @@ share/help/da/gnome-mines/board-size.page
share/help/da/gnome-mines/bug-filing.page
share/help/da/gnome-mines/develop.page
share/help/da/gnome-mines/documentation.page
-share/help/da/gnome-mines/figures/easy-hints-1.png
-share/help/da/gnome-mines/figures/easy-hints-2.png
-share/help/da/gnome-mines/figures/easy-hints-3.png
share/help/da/gnome-mines/figures/flag-question.svg
share/help/da/gnome-mines/figures/flag.svg
share/help/da/gnome-mines/figures/flags.png
-share/help/da/gnome-mines/figures/gnome-mines.png
-share/help/da/gnome-mines/figures/hard-hints-1.png
-share/help/da/gnome-mines/figures/hard-hints-2.png
-share/help/da/gnome-mines/figures/hard-hints-3.png
-share/help/da/gnome-mines/figures/highscores.png
-share/help/da/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/da/gnome-mines/figures/logo.png
share/help/da/gnome-mines/figures/logo32.png
-share/help/da/gnome-mines/figures/main-window.png
-share/help/da/gnome-mines/figures/preferences.png
-share/help/da/gnome-mines/figures/statusbar.png
share/help/da/gnome-mines/flags.page
share/help/da/gnome-mines/get-help.page
share/help/da/gnome-mines/high-scores.page
@@ -173,23 +122,11 @@ share/help/de/gnome-mines/board-size.page
share/help/de/gnome-mines/bug-filing.page
share/help/de/gnome-mines/develop.page
share/help/de/gnome-mines/documentation.page
-share/help/de/gnome-mines/figures/easy-hints-1.png
-share/help/de/gnome-mines/figures/easy-hints-2.png
-share/help/de/gnome-mines/figures/easy-hints-3.png
share/help/de/gnome-mines/figures/flag-question.svg
share/help/de/gnome-mines/figures/flag.svg
share/help/de/gnome-mines/figures/flags.png
-share/help/de/gnome-mines/figures/gnome-mines.png
-share/help/de/gnome-mines/figures/hard-hints-1.png
-share/help/de/gnome-mines/figures/hard-hints-2.png
-share/help/de/gnome-mines/figures/hard-hints-3.png
-share/help/de/gnome-mines/figures/highscores.png
-share/help/de/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/de/gnome-mines/figures/logo.png
share/help/de/gnome-mines/figures/logo32.png
-share/help/de/gnome-mines/figures/main-window.png
-share/help/de/gnome-mines/figures/preferences.png
-share/help/de/gnome-mines/figures/statusbar.png
share/help/de/gnome-mines/flags.page
share/help/de/gnome-mines/get-help.page
share/help/de/gnome-mines/high-scores.page
@@ -203,23 +140,11 @@ share/help/el/gnome-mines/board-size.page
share/help/el/gnome-mines/bug-filing.page
share/help/el/gnome-mines/develop.page
share/help/el/gnome-mines/documentation.page
-share/help/el/gnome-mines/figures/easy-hints-1.png
-share/help/el/gnome-mines/figures/easy-hints-2.png
-share/help/el/gnome-mines/figures/easy-hints-3.png
share/help/el/gnome-mines/figures/flag-question.svg
share/help/el/gnome-mines/figures/flag.svg
share/help/el/gnome-mines/figures/flags.png
-share/help/el/gnome-mines/figures/gnome-mines.png
-share/help/el/gnome-mines/figures/hard-hints-1.png
-share/help/el/gnome-mines/figures/hard-hints-2.png
-share/help/el/gnome-mines/figures/hard-hints-3.png
-share/help/el/gnome-mines/figures/highscores.png
-share/help/el/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/el/gnome-mines/figures/logo.png
share/help/el/gnome-mines/figures/logo32.png
-share/help/el/gnome-mines/figures/main-window.png
-share/help/el/gnome-mines/figures/preferences.png
-share/help/el/gnome-mines/figures/statusbar.png
share/help/el/gnome-mines/flags.page
share/help/el/gnome-mines/get-help.page
share/help/el/gnome-mines/high-scores.page
@@ -233,23 +158,11 @@ share/help/en_GB/gnome-mines/board-size.page
share/help/en_GB/gnome-mines/bug-filing.page
share/help/en_GB/gnome-mines/develop.page
share/help/en_GB/gnome-mines/documentation.page
-share/help/en_GB/gnome-mines/figures/easy-hints-1.png
-share/help/en_GB/gnome-mines/figures/easy-hints-2.png
-share/help/en_GB/gnome-mines/figures/easy-hints-3.png
share/help/en_GB/gnome-mines/figures/flag-question.svg
share/help/en_GB/gnome-mines/figures/flag.svg
share/help/en_GB/gnome-mines/figures/flags.png
-share/help/en_GB/gnome-mines/figures/gnome-mines.png
-share/help/en_GB/gnome-mines/figures/hard-hints-1.png
-share/help/en_GB/gnome-mines/figures/hard-hints-2.png
-share/help/en_GB/gnome-mines/figures/hard-hints-3.png
-share/help/en_GB/gnome-mines/figures/highscores.png
-share/help/en_GB/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/en_GB/gnome-mines/figures/logo.png
share/help/en_GB/gnome-mines/figures/logo32.png
-share/help/en_GB/gnome-mines/figures/main-window.png
-share/help/en_GB/gnome-mines/figures/preferences.png
-share/help/en_GB/gnome-mines/figures/statusbar.png
share/help/en_GB/gnome-mines/flags.page
share/help/en_GB/gnome-mines/get-help.page
share/help/en_GB/gnome-mines/high-scores.page
@@ -263,23 +176,11 @@ share/help/es/gnome-mines/board-size.page
share/help/es/gnome-mines/bug-filing.page
share/help/es/gnome-mines/develop.page
share/help/es/gnome-mines/documentation.page
-share/help/es/gnome-mines/figures/easy-hints-1.png
-share/help/es/gnome-mines/figures/easy-hints-2.png
-share/help/es/gnome-mines/figures/easy-hints-3.png
share/help/es/gnome-mines/figures/flag-question.svg
share/help/es/gnome-mines/figures/flag.svg
share/help/es/gnome-mines/figures/flags.png
-share/help/es/gnome-mines/figures/gnome-mines.png
-share/help/es/gnome-mines/figures/hard-hints-1.png
-share/help/es/gnome-mines/figures/hard-hints-2.png
-share/help/es/gnome-mines/figures/hard-hints-3.png
-share/help/es/gnome-mines/figures/highscores.png
-share/help/es/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/es/gnome-mines/figures/logo.png
share/help/es/gnome-mines/figures/logo32.png
-share/help/es/gnome-mines/figures/main-window.png
-share/help/es/gnome-mines/figures/preferences.png
-share/help/es/gnome-mines/figures/statusbar.png
share/help/es/gnome-mines/flags.page
share/help/es/gnome-mines/get-help.page
share/help/es/gnome-mines/high-scores.page
@@ -289,57 +190,15 @@ share/help/es/gnome-mines/new-game.page
share/help/es/gnome-mines/rules.page
share/help/es/gnome-mines/shortcuts.page
share/help/es/gnome-mines/translate.page
-share/help/eu/gnome-mines/board-size.page
-share/help/eu/gnome-mines/bug-filing.page
-share/help/eu/gnome-mines/develop.page
-share/help/eu/gnome-mines/documentation.page
-share/help/eu/gnome-mines/figures/easy-hints-1.png
-share/help/eu/gnome-mines/figures/easy-hints-2.png
-share/help/eu/gnome-mines/figures/easy-hints-3.png
-share/help/eu/gnome-mines/figures/flag-question.svg
-share/help/eu/gnome-mines/figures/flag.svg
-share/help/eu/gnome-mines/figures/flags.png
-share/help/eu/gnome-mines/figures/gnome-mines.png
-share/help/eu/gnome-mines/figures/hard-hints-1.png
-share/help/eu/gnome-mines/figures/hard-hints-2.png
-share/help/eu/gnome-mines/figures/hard-hints-3.png
-share/help/eu/gnome-mines/figures/highscores.png
-share/help/eu/gnome-mines/figures/imnotsureflagscheckbox.png
-share/help/eu/gnome-mines/figures/logo.png
-share/help/eu/gnome-mines/figures/logo32.png
-share/help/eu/gnome-mines/figures/main-window.png
-share/help/eu/gnome-mines/figures/preferences.png
-share/help/eu/gnome-mines/figures/statusbar.png
-share/help/eu/gnome-mines/flags.page
-share/help/eu/gnome-mines/get-help.page
-share/help/eu/gnome-mines/high-scores.page
-share/help/eu/gnome-mines/index.page
-share/help/eu/gnome-mines/license.page
-share/help/eu/gnome-mines/new-game.page
-share/help/eu/gnome-mines/rules.page
-share/help/eu/gnome-mines/shortcuts.page
-share/help/eu/gnome-mines/translate.page
share/help/fr/gnome-mines/board-size.page
share/help/fr/gnome-mines/bug-filing.page
share/help/fr/gnome-mines/develop.page
share/help/fr/gnome-mines/documentation.page
-share/help/fr/gnome-mines/figures/easy-hints-1.png
-share/help/fr/gnome-mines/figures/easy-hints-2.png
-share/help/fr/gnome-mines/figures/easy-hints-3.png
share/help/fr/gnome-mines/figures/flag-question.svg
share/help/fr/gnome-mines/figures/flag.svg
share/help/fr/gnome-mines/figures/flags.png
-share/help/fr/gnome-mines/figures/gnome-mines.png
-share/help/fr/gnome-mines/figures/hard-hints-1.png
-share/help/fr/gnome-mines/figures/hard-hints-2.png
-share/help/fr/gnome-mines/figures/hard-hints-3.png
-share/help/fr/gnome-mines/figures/highscores.png
-share/help/fr/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/fr/gnome-mines/figures/logo.png
share/help/fr/gnome-mines/figures/logo32.png
-share/help/fr/gnome-mines/figures/main-window.png
-share/help/fr/gnome-mines/figures/preferences.png
-share/help/fr/gnome-mines/figures/statusbar.png
share/help/fr/gnome-mines/flags.page
share/help/fr/gnome-mines/get-help.page
share/help/fr/gnome-mines/high-scores.page
@@ -353,23 +212,11 @@ share/help/gl/gnome-mines/board-size.page
share/help/gl/gnome-mines/bug-filing.page
share/help/gl/gnome-mines/develop.page
share/help/gl/gnome-mines/documentation.page
-share/help/gl/gnome-mines/figures/easy-hints-1.png
-share/help/gl/gnome-mines/figures/easy-hints-2.png
-share/help/gl/gnome-mines/figures/easy-hints-3.png
share/help/gl/gnome-mines/figures/flag-question.svg
share/help/gl/gnome-mines/figures/flag.svg
share/help/gl/gnome-mines/figures/flags.png
-share/help/gl/gnome-mines/figures/gnome-mines.png
-share/help/gl/gnome-mines/figures/hard-hints-1.png
-share/help/gl/gnome-mines/figures/hard-hints-2.png
-share/help/gl/gnome-mines/figures/hard-hints-3.png
-share/help/gl/gnome-mines/figures/highscores.png
-share/help/gl/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/gl/gnome-mines/figures/logo.png
share/help/gl/gnome-mines/figures/logo32.png
-share/help/gl/gnome-mines/figures/main-window.png
-share/help/gl/gnome-mines/figures/preferences.png
-share/help/gl/gnome-mines/figures/statusbar.png
share/help/gl/gnome-mines/flags.page
share/help/gl/gnome-mines/get-help.page
share/help/gl/gnome-mines/high-scores.page
@@ -383,23 +230,11 @@ share/help/hu/gnome-mines/board-size.page
share/help/hu/gnome-mines/bug-filing.page
share/help/hu/gnome-mines/develop.page
share/help/hu/gnome-mines/documentation.page
-share/help/hu/gnome-mines/figures/easy-hints-1.png
-share/help/hu/gnome-mines/figures/easy-hints-2.png
-share/help/hu/gnome-mines/figures/easy-hints-3.png
share/help/hu/gnome-mines/figures/flag-question.svg
share/help/hu/gnome-mines/figures/flag.svg
share/help/hu/gnome-mines/figures/flags.png
-share/help/hu/gnome-mines/figures/gnome-mines.png
-share/help/hu/gnome-mines/figures/hard-hints-1.png
-share/help/hu/gnome-mines/figures/hard-hints-2.png
-share/help/hu/gnome-mines/figures/hard-hints-3.png
-share/help/hu/gnome-mines/figures/highscores.png
-share/help/hu/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/hu/gnome-mines/figures/logo.png
share/help/hu/gnome-mines/figures/logo32.png
-share/help/hu/gnome-mines/figures/main-window.png
-share/help/hu/gnome-mines/figures/preferences.png
-share/help/hu/gnome-mines/figures/statusbar.png
share/help/hu/gnome-mines/flags.page
share/help/hu/gnome-mines/get-help.page
share/help/hu/gnome-mines/high-scores.page
@@ -413,23 +248,11 @@ share/help/it/gnome-mines/board-size.page
share/help/it/gnome-mines/bug-filing.page
share/help/it/gnome-mines/develop.page
share/help/it/gnome-mines/documentation.page
-share/help/it/gnome-mines/figures/easy-hints-1.png
-share/help/it/gnome-mines/figures/easy-hints-2.png
-share/help/it/gnome-mines/figures/easy-hints-3.png
share/help/it/gnome-mines/figures/flag-question.svg
share/help/it/gnome-mines/figures/flag.svg
share/help/it/gnome-mines/figures/flags.png
-share/help/it/gnome-mines/figures/gnome-mines.png
-share/help/it/gnome-mines/figures/hard-hints-1.png
-share/help/it/gnome-mines/figures/hard-hints-2.png
-share/help/it/gnome-mines/figures/hard-hints-3.png
-share/help/it/gnome-mines/figures/highscores.png
-share/help/it/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/it/gnome-mines/figures/logo.png
share/help/it/gnome-mines/figures/logo32.png
-share/help/it/gnome-mines/figures/main-window.png
-share/help/it/gnome-mines/figures/preferences.png
-share/help/it/gnome-mines/figures/statusbar.png
share/help/it/gnome-mines/flags.page
share/help/it/gnome-mines/get-help.page
share/help/it/gnome-mines/high-scores.page
@@ -443,23 +266,11 @@ share/help/ja/gnome-mines/board-size.page
share/help/ja/gnome-mines/bug-filing.page
share/help/ja/gnome-mines/develop.page
share/help/ja/gnome-mines/documentation.page
-share/help/ja/gnome-mines/figures/easy-hints-1.png
-share/help/ja/gnome-mines/figures/easy-hints-2.png
-share/help/ja/gnome-mines/figures/easy-hints-3.png
share/help/ja/gnome-mines/figures/flag-question.svg
share/help/ja/gnome-mines/figures/flag.svg
share/help/ja/gnome-mines/figures/flags.png
-share/help/ja/gnome-mines/figures/gnome-mines.png
-share/help/ja/gnome-mines/figures/hard-hints-1.png
-share/help/ja/gnome-mines/figures/hard-hints-2.png
-share/help/ja/gnome-mines/figures/hard-hints-3.png
-share/help/ja/gnome-mines/figures/highscores.png
-share/help/ja/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/ja/gnome-mines/figures/logo.png
share/help/ja/gnome-mines/figures/logo32.png
-share/help/ja/gnome-mines/figures/main-window.png
-share/help/ja/gnome-mines/figures/preferences.png
-share/help/ja/gnome-mines/figures/statusbar.png
share/help/ja/gnome-mines/flags.page
share/help/ja/gnome-mines/get-help.page
share/help/ja/gnome-mines/high-scores.page
@@ -473,23 +284,11 @@ share/help/oc/gnome-mines/board-size.page
share/help/oc/gnome-mines/bug-filing.page
share/help/oc/gnome-mines/develop.page
share/help/oc/gnome-mines/documentation.page
-share/help/oc/gnome-mines/figures/easy-hints-1.png
-share/help/oc/gnome-mines/figures/easy-hints-2.png
-share/help/oc/gnome-mines/figures/easy-hints-3.png
share/help/oc/gnome-mines/figures/flag-question.svg
share/help/oc/gnome-mines/figures/flag.svg
share/help/oc/gnome-mines/figures/flags.png
-share/help/oc/gnome-mines/figures/gnome-mines.png
-share/help/oc/gnome-mines/figures/hard-hints-1.png
-share/help/oc/gnome-mines/figures/hard-hints-2.png
-share/help/oc/gnome-mines/figures/hard-hints-3.png
-share/help/oc/gnome-mines/figures/highscores.png
-share/help/oc/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/oc/gnome-mines/figures/logo.png
share/help/oc/gnome-mines/figures/logo32.png
-share/help/oc/gnome-mines/figures/main-window.png
-share/help/oc/gnome-mines/figures/preferences.png
-share/help/oc/gnome-mines/figures/statusbar.png
share/help/oc/gnome-mines/flags.page
share/help/oc/gnome-mines/get-help.page
share/help/oc/gnome-mines/high-scores.page
@@ -499,27 +298,33 @@ share/help/oc/gnome-mines/new-game.page
share/help/oc/gnome-mines/rules.page
share/help/oc/gnome-mines/shortcuts.page
share/help/oc/gnome-mines/translate.page
+share/help/pl/gnome-mines/board-size.page
+share/help/pl/gnome-mines/bug-filing.page
+share/help/pl/gnome-mines/develop.page
+share/help/pl/gnome-mines/documentation.page
+share/help/pl/gnome-mines/figures/flag-question.svg
+share/help/pl/gnome-mines/figures/flag.svg
+share/help/pl/gnome-mines/figures/flags.png
+share/help/pl/gnome-mines/figures/logo.png
+share/help/pl/gnome-mines/figures/logo32.png
+share/help/pl/gnome-mines/flags.page
+share/help/pl/gnome-mines/get-help.page
+share/help/pl/gnome-mines/high-scores.page
+share/help/pl/gnome-mines/index.page
+share/help/pl/gnome-mines/license.page
+share/help/pl/gnome-mines/new-game.page
+share/help/pl/gnome-mines/rules.page
+share/help/pl/gnome-mines/shortcuts.page
+share/help/pl/gnome-mines/translate.page
share/help/pt_BR/gnome-mines/board-size.page
share/help/pt_BR/gnome-mines/bug-filing.page
share/help/pt_BR/gnome-mines/develop.page
share/help/pt_BR/gnome-mines/documentation.page
-share/help/pt_BR/gnome-mines/figures/easy-hints-1.png
-share/help/pt_BR/gnome-mines/figures/easy-hints-2.png
-share/help/pt_BR/gnome-mines/figures/easy-hints-3.png
share/help/pt_BR/gnome-mines/figures/flag-question.svg
share/help/pt_BR/gnome-mines/figures/flag.svg
share/help/pt_BR/gnome-mines/figures/flags.png
-share/help/pt_BR/gnome-mines/figures/gnome-mines.png
-share/help/pt_BR/gnome-mines/figures/hard-hints-1.png
-share/help/pt_BR/gnome-mines/figures/hard-hints-2.png
-share/help/pt_BR/gnome-mines/figures/hard-hints-3.png
-share/help/pt_BR/gnome-mines/figures/highscores.png
-share/help/pt_BR/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/pt_BR/gnome-mines/figures/logo.png
share/help/pt_BR/gnome-mines/figures/logo32.png
-share/help/pt_BR/gnome-mines/figures/main-window.png
-share/help/pt_BR/gnome-mines/figures/preferences.png
-share/help/pt_BR/gnome-mines/figures/statusbar.png
share/help/pt_BR/gnome-mines/flags.page
share/help/pt_BR/gnome-mines/get-help.page
share/help/pt_BR/gnome-mines/high-scores.page
@@ -533,23 +338,11 @@ share/help/sl/gnome-mines/board-size.page
share/help/sl/gnome-mines/bug-filing.page
share/help/sl/gnome-mines/develop.page
share/help/sl/gnome-mines/documentation.page
-share/help/sl/gnome-mines/figures/easy-hints-1.png
-share/help/sl/gnome-mines/figures/easy-hints-2.png
-share/help/sl/gnome-mines/figures/easy-hints-3.png
share/help/sl/gnome-mines/figures/flag-question.svg
share/help/sl/gnome-mines/figures/flag.svg
share/help/sl/gnome-mines/figures/flags.png
-share/help/sl/gnome-mines/figures/gnome-mines.png
-share/help/sl/gnome-mines/figures/hard-hints-1.png
-share/help/sl/gnome-mines/figures/hard-hints-2.png
-share/help/sl/gnome-mines/figures/hard-hints-3.png
-share/help/sl/gnome-mines/figures/highscores.png
-share/help/sl/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/sl/gnome-mines/figures/logo.png
share/help/sl/gnome-mines/figures/logo32.png
-share/help/sl/gnome-mines/figures/main-window.png
-share/help/sl/gnome-mines/figures/preferences.png
-share/help/sl/gnome-mines/figures/statusbar.png
share/help/sl/gnome-mines/flags.page
share/help/sl/gnome-mines/get-help.page
share/help/sl/gnome-mines/high-scores.page
@@ -563,23 +356,11 @@ share/help/sr/gnome-mines/board-size.page
share/help/sr/gnome-mines/bug-filing.page
share/help/sr/gnome-mines/develop.page
share/help/sr/gnome-mines/documentation.page
-share/help/sr/gnome-mines/figures/easy-hints-1.png
-share/help/sr/gnome-mines/figures/easy-hints-2.png
-share/help/sr/gnome-mines/figures/easy-hints-3.png
share/help/sr/gnome-mines/figures/flag-question.svg
share/help/sr/gnome-mines/figures/flag.svg
share/help/sr/gnome-mines/figures/flags.png
-share/help/sr/gnome-mines/figures/gnome-mines.png
-share/help/sr/gnome-mines/figures/hard-hints-1.png
-share/help/sr/gnome-mines/figures/hard-hints-2.png
-share/help/sr/gnome-mines/figures/hard-hints-3.png
-share/help/sr/gnome-mines/figures/highscores.png
-share/help/sr/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/sr/gnome-mines/figures/logo.png
share/help/sr/gnome-mines/figures/logo32.png
-share/help/sr/gnome-mines/figures/main-window.png
-share/help/sr/gnome-mines/figures/preferences.png
-share/help/sr/gnome-mines/figures/statusbar.png
share/help/sr/gnome-mines/flags.page
share/help/sr/gnome-mines/get-help.page
share/help/sr/gnome-mines/high-scores.page
@@ -593,23 +374,11 @@ share/help/sr@latin/gnome-mines/board-size.page
share/help/sr@latin/gnome-mines/bug-filing.page
share/help/sr@latin/gnome-mines/develop.page
share/help/sr@latin/gnome-mines/documentation.page
-share/help/sr@latin/gnome-mines/figures/easy-hints-1.png
-share/help/sr@latin/gnome-mines/figures/easy-hints-2.png
-share/help/sr@latin/gnome-mines/figures/easy-hints-3.png
share/help/sr@latin/gnome-mines/figures/flag-question.svg
share/help/sr@latin/gnome-mines/figures/flag.svg
share/help/sr@latin/gnome-mines/figures/flags.png
-share/help/sr@latin/gnome-mines/figures/gnome-mines.png
-share/help/sr@latin/gnome-mines/figures/hard-hints-1.png
-share/help/sr@latin/gnome-mines/figures/hard-hints-2.png
-share/help/sr@latin/gnome-mines/figures/hard-hints-3.png
-share/help/sr@latin/gnome-mines/figures/highscores.png
-share/help/sr@latin/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/sr@latin/gnome-mines/figures/logo.png
share/help/sr@latin/gnome-mines/figures/logo32.png
-share/help/sr@latin/gnome-mines/figures/main-window.png
-share/help/sr@latin/gnome-mines/figures/preferences.png
-share/help/sr@latin/gnome-mines/figures/statusbar.png
share/help/sr@latin/gnome-mines/flags.page
share/help/sr@latin/gnome-mines/get-help.page
share/help/sr@latin/gnome-mines/high-scores.page
@@ -623,23 +392,11 @@ share/help/sv/gnome-mines/board-size.page
share/help/sv/gnome-mines/bug-filing.page
share/help/sv/gnome-mines/develop.page
share/help/sv/gnome-mines/documentation.page
-share/help/sv/gnome-mines/figures/easy-hints-1.png
-share/help/sv/gnome-mines/figures/easy-hints-2.png
-share/help/sv/gnome-mines/figures/easy-hints-3.png
share/help/sv/gnome-mines/figures/flag-question.svg
share/help/sv/gnome-mines/figures/flag.svg
share/help/sv/gnome-mines/figures/flags.png
-share/help/sv/gnome-mines/figures/gnome-mines.png
-share/help/sv/gnome-mines/figures/hard-hints-1.png
-share/help/sv/gnome-mines/figures/hard-hints-2.png
-share/help/sv/gnome-mines/figures/hard-hints-3.png
-share/help/sv/gnome-mines/figures/highscores.png
-share/help/sv/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/sv/gnome-mines/figures/logo.png
share/help/sv/gnome-mines/figures/logo32.png
-share/help/sv/gnome-mines/figures/main-window.png
-share/help/sv/gnome-mines/figures/preferences.png
-share/help/sv/gnome-mines/figures/statusbar.png
share/help/sv/gnome-mines/flags.page
share/help/sv/gnome-mines/get-help.page
share/help/sv/gnome-mines/high-scores.page
@@ -653,23 +410,11 @@ share/help/zh_CN/gnome-mines/board-size.page
share/help/zh_CN/gnome-mines/bug-filing.page
share/help/zh_CN/gnome-mines/develop.page
share/help/zh_CN/gnome-mines/documentation.page
-share/help/zh_CN/gnome-mines/figures/easy-hints-1.png
-share/help/zh_CN/gnome-mines/figures/easy-hints-2.png
-share/help/zh_CN/gnome-mines/figures/easy-hints-3.png
share/help/zh_CN/gnome-mines/figures/flag-question.svg
share/help/zh_CN/gnome-mines/figures/flag.svg
share/help/zh_CN/gnome-mines/figures/flags.png
-share/help/zh_CN/gnome-mines/figures/gnome-mines.png
-share/help/zh_CN/gnome-mines/figures/hard-hints-1.png
-share/help/zh_CN/gnome-mines/figures/hard-hints-2.png
-share/help/zh_CN/gnome-mines/figures/hard-hints-3.png
-share/help/zh_CN/gnome-mines/figures/highscores.png
-share/help/zh_CN/gnome-mines/figures/imnotsureflagscheckbox.png
share/help/zh_CN/gnome-mines/figures/logo.png
share/help/zh_CN/gnome-mines/figures/logo32.png
-share/help/zh_CN/gnome-mines/figures/main-window.png
-share/help/zh_CN/gnome-mines/figures/preferences.png
-share/help/zh_CN/gnome-mines/figures/statusbar.png
share/help/zh_CN/gnome-mines/flags.page
share/help/zh_CN/gnome-mines/get-help.page
share/help/zh_CN/gnome-mines/high-scores.page
@@ -683,7 +428,6 @@ share/icons/hicolor/16x16/actions/flag-symbolic.svg
share/icons/hicolor/16x16/apps/gnome-mines.png
share/icons/hicolor/22x22/apps/gnome-mines.png
share/icons/hicolor/24x24/apps/gnome-mines.png
-share/icons/hicolor/256x256/apps/gnome-mines.png
share/icons/hicolor/32x32/apps/gnome-mines.png
share/icons/hicolor/48x48/apps/gnome-mines.png
share/icons/hicolor/scalable/apps/gnome-mines-symbolic.svg
@@ -777,3 +521,4 @@ share/locale/xh/LC_MESSAGES/gnome-mines.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mines.mo
share/locale/zh_HK/LC_MESSAGES/gnome-mines.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mines.mo
+share/metainfo/gnome-mines.appdata.xml
diff --git a/games/gnome-robots/Makefile b/games/gnome-robots/Makefile
index a0880d0b522f..8aaf3c0a3fee 100644
--- a/games/gnome-robots/Makefile
+++ b/games/gnome-robots/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-robots
-PORTVERSION= 3.22.1
+PORTVERSION= 3.22.3
CATEGORIES= games gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome robots
diff --git a/games/gnome-robots/distinfo b/games/gnome-robots/distinfo
index 42d800a408bc..b47d3ffab7ac 100644
--- a/games/gnome-robots/distinfo
+++ b/games/gnome-robots/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479040963
-SHA256 (gnome3/gnome-robots-3.22.1.tar.xz) = 5cd4564d7eb876fe4ef332dc568bcf7b1515d8ec9f66e53c2bae5331e0182dd4
-SIZE (gnome3/gnome-robots-3.22.1.tar.xz) = 1622820
+TIMESTAMP = 1526112808
+SHA256 (gnome/gnome-robots-3.22.3.tar.xz) = 937394c01892aa7a64ceac87cc80e4c845ced8ca50d29a4d7e9fd6964f93ec37
+SIZE (gnome/gnome-robots-3.22.3.tar.xz) = 540824
diff --git a/games/gnome-robots/pkg-plist b/games/gnome-robots/pkg-plist
index c4dad091ed1c..038e0bf7e971 100644
--- a/games/gnome-robots/pkg-plist
+++ b/games/gnome-robots/pkg-plist
@@ -1,6 +1,5 @@
bin/gnome-robots
man/man6/gnome-robots.6.gz
-share/appdata/gnome-robots.appdata.xml
share/applications/gnome-robots.desktop
@unexec [ -s %D/share/games/gnobots2.classic_robots-safe.scores ] || rm -f %D/share/games/gnobots2.classic_robots-safe.scores
@unexec [ -s %D/share/games/gnobots2.classic_robots-super-safe.scores ] || rm -f %D/share/games/gnobots2.classic_robots-super-safe.scores
@@ -457,6 +456,38 @@ share/help/oc/gnome-robots/index.page
share/help/oc/gnome-robots/legal.xml
share/help/oc/gnome-robots/moves.page
share/help/oc/gnome-robots/scores.page
+share/help/pl/gnome-robots/appearance.page
+share/help/pl/gnome-robots/basics.page
+share/help/pl/gnome-robots/controls-change.page
+share/help/pl/gnome-robots/controls-default.page
+share/help/pl/gnome-robots/figures/anthills-high-risk.png
+share/help/pl/gnome-robots/figures/anthills-low-risk.png
+share/help/pl/gnome-robots/figures/boo-high-risk.png
+share/help/pl/gnome-robots/figures/boo-low-risk.png
+share/help/pl/gnome-robots/figures/cows-high-risk.png
+share/help/pl/gnome-robots/figures/cows-low-risk.png
+share/help/pl/gnome-robots/figures/eggs-high-risk.png
+share/help/pl/gnome-robots/figures/eggs-low-risk.png
+share/help/pl/gnome-robots/figures/gnome-robots.png
+share/help/pl/gnome-robots/figures/gnomes-high-risk.png
+share/help/pl/gnome-robots/figures/gnomes-low-risk.png
+share/help/pl/gnome-robots/figures/mice-high-risk.png
+share/help/pl/gnome-robots/figures/mice-low-risk.png
+share/help/pl/gnome-robots/figures/robots-high-risk.png
+share/help/pl/gnome-robots/figures/robots-low-risk.png
+share/help/pl/gnome-robots/figures/spills-high-risk.png
+share/help/pl/gnome-robots/figures/spills-low-risk.png
+share/help/pl/gnome-robots/figures/stormclouds-high-risk.png
+share/help/pl/gnome-robots/figures/stormclouds-low-risk.png
+share/help/pl/gnome-robots/figures/toasters-high-risk.png
+share/help/pl/gnome-robots/figures/toasters-low-risk.png
+share/help/pl/gnome-robots/figures/ufo-high-risk.png
+share/help/pl/gnome-robots/figures/ufo-low-risk.png
+share/help/pl/gnome-robots/game-types.page
+share/help/pl/gnome-robots/index.page
+share/help/pl/gnome-robots/legal.xml
+share/help/pl/gnome-robots/moves.page
+share/help/pl/gnome-robots/scores.page
share/help/sl/gnome-robots/appearance.page
share/help/sl/gnome-robots/basics.page
share/help/sl/gnome-robots/controls-change.page
@@ -715,3 +746,4 @@ share/locale/xh/LC_MESSAGES/gnome-robots.mo
share/locale/zh_CN/LC_MESSAGES/gnome-robots.mo
share/locale/zh_HK/LC_MESSAGES/gnome-robots.mo
share/locale/zh_TW/LC_MESSAGES/gnome-robots.mo
+share/metainfo/gnome-robots.appdata.xml
diff --git a/games/gnome-sudoku/Makefile b/games/gnome-sudoku/Makefile
index 17ba90411bba..9de8dabae276 100644
--- a/games/gnome-sudoku/Makefile
+++ b/games/gnome-sudoku/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-sudoku
-PORTVERSION= 3.24.0
-PORTREVISION= 1
+PORTVERSION= 3.28.0
CATEGORIES= games gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Sudoku game for gnome
@@ -23,9 +22,8 @@ LIB_DEPENDS= libgee-0.8.so:devel/libgee \
PORTSCOUT= limitw:1,even
-USES= compiler:c++11-lang gettext gmake gnome localbase pathfix \
- pkgconfig python:3.3+ shebangfix tar:xz
-USE_GNOME= cairo gtk30 intlhack libxml2:build pygobject3
+USES= compiler:c++11-lang gettext gmake gnome pkgconfig tar:xz
+USE_GNOME= cairo gtk30
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/games/gnome-sudoku/distinfo b/games/gnome-sudoku/distinfo
index 67b1d8b846b2..ea183b9c10eb 100644
--- a/games/gnome-sudoku/distinfo
+++ b/games/gnome-sudoku/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494626113
-SHA256 (gnome3/gnome-sudoku-3.24.0.tar.xz) = 04a29447889448ee5d5840cb5b2fd05ce6031c38a24809ce4919647ee6f485d7
-SIZE (gnome3/gnome-sudoku-3.24.0.tar.xz) = 2890256
+TIMESTAMP = 1526112483
+SHA256 (gnome/gnome-sudoku-3.28.0.tar.xz) = 5b758187200ea42fec9e5ec66c09e355a3b0a9a6817ea3b5966f3815eda7641d
+SIZE (gnome/gnome-sudoku-3.28.0.tar.xz) = 793364
diff --git a/games/gnome-sudoku/pkg-plist b/games/gnome-sudoku/pkg-plist
index c12316e5212c..50e7270a7e13 100644
--- a/games/gnome-sudoku/pkg-plist
+++ b/games/gnome-sudoku/pkg-plist
@@ -1,637 +1,489 @@
bin/gnome-sudoku
man/man6/gnome-sudoku.6.gz
-share/appdata/gnome-sudoku.appdata.xml
share/applications/gnome-sudoku.desktop
%%DATADIR%%/images/footprints.png
share/help/C/gnome-sudoku/basics.page
share/help/C/gnome-sudoku/bug-filing.page
-share/help/C/gnome-sudoku/commandline.page
share/help/C/gnome-sudoku/develop.page
share/help/C/gnome-sudoku/documentation.page
+share/help/C/gnome-sudoku/earmarks.page
share/help/C/gnome-sudoku/figures/logo.png
share/help/C/gnome-sudoku/figures/logo32.png
-share/help/C/gnome-sudoku/figures/possible-numbers.png
-share/help/C/gnome-sudoku/figures/resuming.png
share/help/C/gnome-sudoku/figures/rowcolumnbox.png
-share/help/C/gnome-sudoku/figures/stats-very-hard.png
share/help/C/gnome-sudoku/figures/strategy1.png
share/help/C/gnome-sudoku/figures/strategy2.png
-share/help/C/gnome-sudoku/figures/trackers.webm
share/help/C/gnome-sudoku/highlighting.page
-share/help/C/gnome-sudoku/hints.page
share/help/C/gnome-sudoku/index.page
share/help/C/gnome-sudoku/keyboard-shortcuts.page
share/help/C/gnome-sudoku/legal.xml
share/help/C/gnome-sudoku/license.page
-share/help/C/gnome-sudoku/notes.page
share/help/C/gnome-sudoku/print-blank-puzzles.page
share/help/C/gnome-sudoku/print-inprogress-game.page
share/help/C/gnome-sudoku/rules.page
share/help/C/gnome-sudoku/save-resume.page
-share/help/C/gnome-sudoku/statistics.page
share/help/C/gnome-sudoku/strategy.page
-share/help/C/gnome-sudoku/toolbar.page
-share/help/C/gnome-sudoku/trackers.page
share/help/C/gnome-sudoku/translate.page
share/help/ca/gnome-sudoku/basics.page
share/help/ca/gnome-sudoku/bug-filing.page
-share/help/ca/gnome-sudoku/commandline.page
share/help/ca/gnome-sudoku/develop.page
share/help/ca/gnome-sudoku/documentation.page
+share/help/ca/gnome-sudoku/earmarks.page
share/help/ca/gnome-sudoku/figures/logo.png
share/help/ca/gnome-sudoku/figures/logo32.png
-share/help/ca/gnome-sudoku/figures/possible-numbers.png
-share/help/ca/gnome-sudoku/figures/resuming.png
share/help/ca/gnome-sudoku/figures/rowcolumnbox.png
-share/help/ca/gnome-sudoku/figures/stats-very-hard.png
share/help/ca/gnome-sudoku/figures/strategy1.png
share/help/ca/gnome-sudoku/figures/strategy2.png
-share/help/ca/gnome-sudoku/figures/trackers.webm
share/help/ca/gnome-sudoku/highlighting.page
-share/help/ca/gnome-sudoku/hints.page
share/help/ca/gnome-sudoku/index.page
share/help/ca/gnome-sudoku/keyboard-shortcuts.page
share/help/ca/gnome-sudoku/legal.xml
share/help/ca/gnome-sudoku/license.page
-share/help/ca/gnome-sudoku/notes.page
share/help/ca/gnome-sudoku/print-blank-puzzles.page
share/help/ca/gnome-sudoku/print-inprogress-game.page
share/help/ca/gnome-sudoku/rules.page
share/help/ca/gnome-sudoku/save-resume.page
-share/help/ca/gnome-sudoku/statistics.page
share/help/ca/gnome-sudoku/strategy.page
-share/help/ca/gnome-sudoku/toolbar.page
-share/help/ca/gnome-sudoku/trackers.page
share/help/ca/gnome-sudoku/translate.page
share/help/cs/gnome-sudoku/basics.page
share/help/cs/gnome-sudoku/bug-filing.page
-share/help/cs/gnome-sudoku/commandline.page
share/help/cs/gnome-sudoku/develop.page
share/help/cs/gnome-sudoku/documentation.page
+share/help/cs/gnome-sudoku/earmarks.page
share/help/cs/gnome-sudoku/figures/logo.png
share/help/cs/gnome-sudoku/figures/logo32.png
-share/help/cs/gnome-sudoku/figures/possible-numbers.png
-share/help/cs/gnome-sudoku/figures/resuming.png
share/help/cs/gnome-sudoku/figures/rowcolumnbox.png
-share/help/cs/gnome-sudoku/figures/stats-very-hard.png
share/help/cs/gnome-sudoku/figures/strategy1.png
share/help/cs/gnome-sudoku/figures/strategy2.png
-share/help/cs/gnome-sudoku/figures/trackers.webm
share/help/cs/gnome-sudoku/highlighting.page
-share/help/cs/gnome-sudoku/hints.page
share/help/cs/gnome-sudoku/index.page
share/help/cs/gnome-sudoku/keyboard-shortcuts.page
share/help/cs/gnome-sudoku/legal.xml
share/help/cs/gnome-sudoku/license.page
-share/help/cs/gnome-sudoku/notes.page
share/help/cs/gnome-sudoku/print-blank-puzzles.page
share/help/cs/gnome-sudoku/print-inprogress-game.page
share/help/cs/gnome-sudoku/rules.page
share/help/cs/gnome-sudoku/save-resume.page
-share/help/cs/gnome-sudoku/statistics.page
share/help/cs/gnome-sudoku/strategy.page
-share/help/cs/gnome-sudoku/toolbar.page
-share/help/cs/gnome-sudoku/trackers.page
share/help/cs/gnome-sudoku/translate.page
share/help/da/gnome-sudoku/basics.page
share/help/da/gnome-sudoku/bug-filing.page
-share/help/da/gnome-sudoku/commandline.page
share/help/da/gnome-sudoku/develop.page
share/help/da/gnome-sudoku/documentation.page
+share/help/da/gnome-sudoku/earmarks.page
share/help/da/gnome-sudoku/figures/logo.png
share/help/da/gnome-sudoku/figures/logo32.png
-share/help/da/gnome-sudoku/figures/possible-numbers.png
-share/help/da/gnome-sudoku/figures/resuming.png
share/help/da/gnome-sudoku/figures/rowcolumnbox.png
-share/help/da/gnome-sudoku/figures/stats-very-hard.png
share/help/da/gnome-sudoku/figures/strategy1.png
share/help/da/gnome-sudoku/figures/strategy2.png
-share/help/da/gnome-sudoku/figures/trackers.webm
share/help/da/gnome-sudoku/highlighting.page
-share/help/da/gnome-sudoku/hints.page
share/help/da/gnome-sudoku/index.page
share/help/da/gnome-sudoku/keyboard-shortcuts.page
share/help/da/gnome-sudoku/legal.xml
share/help/da/gnome-sudoku/license.page
-share/help/da/gnome-sudoku/notes.page
share/help/da/gnome-sudoku/print-blank-puzzles.page
share/help/da/gnome-sudoku/print-inprogress-game.page
share/help/da/gnome-sudoku/rules.page
share/help/da/gnome-sudoku/save-resume.page
-share/help/da/gnome-sudoku/statistics.page
share/help/da/gnome-sudoku/strategy.page
-share/help/da/gnome-sudoku/toolbar.page
-share/help/da/gnome-sudoku/trackers.page
share/help/da/gnome-sudoku/translate.page
share/help/de/gnome-sudoku/basics.page
share/help/de/gnome-sudoku/bug-filing.page
-share/help/de/gnome-sudoku/commandline.page
share/help/de/gnome-sudoku/develop.page
share/help/de/gnome-sudoku/documentation.page
+share/help/de/gnome-sudoku/earmarks.page
share/help/de/gnome-sudoku/figures/logo.png
share/help/de/gnome-sudoku/figures/logo32.png
-share/help/de/gnome-sudoku/figures/possible-numbers.png
-share/help/de/gnome-sudoku/figures/resuming.png
share/help/de/gnome-sudoku/figures/rowcolumnbox.png
-share/help/de/gnome-sudoku/figures/stats-very-hard.png
share/help/de/gnome-sudoku/figures/strategy1.png
share/help/de/gnome-sudoku/figures/strategy2.png
-share/help/de/gnome-sudoku/figures/trackers.webm
share/help/de/gnome-sudoku/highlighting.page
-share/help/de/gnome-sudoku/hints.page
share/help/de/gnome-sudoku/index.page
share/help/de/gnome-sudoku/keyboard-shortcuts.page
share/help/de/gnome-sudoku/legal.xml
share/help/de/gnome-sudoku/license.page
-share/help/de/gnome-sudoku/notes.page
share/help/de/gnome-sudoku/print-blank-puzzles.page
share/help/de/gnome-sudoku/print-inprogress-game.page
share/help/de/gnome-sudoku/rules.page
share/help/de/gnome-sudoku/save-resume.page
-share/help/de/gnome-sudoku/statistics.page
share/help/de/gnome-sudoku/strategy.page
-share/help/de/gnome-sudoku/toolbar.page
-share/help/de/gnome-sudoku/trackers.page
share/help/de/gnome-sudoku/translate.page
share/help/el/gnome-sudoku/basics.page
share/help/el/gnome-sudoku/bug-filing.page
-share/help/el/gnome-sudoku/commandline.page
share/help/el/gnome-sudoku/develop.page
share/help/el/gnome-sudoku/documentation.page
+share/help/el/gnome-sudoku/earmarks.page
share/help/el/gnome-sudoku/figures/logo.png
share/help/el/gnome-sudoku/figures/logo32.png
-share/help/el/gnome-sudoku/figures/possible-numbers.png
-share/help/el/gnome-sudoku/figures/resuming.png
share/help/el/gnome-sudoku/figures/rowcolumnbox.png
-share/help/el/gnome-sudoku/figures/stats-very-hard.png
share/help/el/gnome-sudoku/figures/strategy1.png
share/help/el/gnome-sudoku/figures/strategy2.png
-share/help/el/gnome-sudoku/figures/trackers.webm
share/help/el/gnome-sudoku/highlighting.page
-share/help/el/gnome-sudoku/hints.page
share/help/el/gnome-sudoku/index.page
share/help/el/gnome-sudoku/keyboard-shortcuts.page
share/help/el/gnome-sudoku/legal.xml
share/help/el/gnome-sudoku/license.page
-share/help/el/gnome-sudoku/notes.page
share/help/el/gnome-sudoku/print-blank-puzzles.page
share/help/el/gnome-sudoku/print-inprogress-game.page
share/help/el/gnome-sudoku/rules.page
share/help/el/gnome-sudoku/save-resume.page
-share/help/el/gnome-sudoku/statistics.page
share/help/el/gnome-sudoku/strategy.page
-share/help/el/gnome-sudoku/toolbar.page
-share/help/el/gnome-sudoku/trackers.page
share/help/el/gnome-sudoku/translate.page
share/help/en_GB/gnome-sudoku/basics.page
share/help/en_GB/gnome-sudoku/bug-filing.page
-share/help/en_GB/gnome-sudoku/commandline.page
share/help/en_GB/gnome-sudoku/develop.page
share/help/en_GB/gnome-sudoku/documentation.page
+share/help/en_GB/gnome-sudoku/earmarks.page
share/help/en_GB/gnome-sudoku/figures/logo.png
share/help/en_GB/gnome-sudoku/figures/logo32.png
-share/help/en_GB/gnome-sudoku/figures/possible-numbers.png
-share/help/en_GB/gnome-sudoku/figures/resuming.png
share/help/en_GB/gnome-sudoku/figures/rowcolumnbox.png
-share/help/en_GB/gnome-sudoku/figures/stats-very-hard.png
share/help/en_GB/gnome-sudoku/figures/strategy1.png
share/help/en_GB/gnome-sudoku/figures/strategy2.png
-share/help/en_GB/gnome-sudoku/figures/trackers.webm
share/help/en_GB/gnome-sudoku/highlighting.page
-share/help/en_GB/gnome-sudoku/hints.page
share/help/en_GB/gnome-sudoku/index.page
share/help/en_GB/gnome-sudoku/keyboard-shortcuts.page
share/help/en_GB/gnome-sudoku/legal.xml
share/help/en_GB/gnome-sudoku/license.page
-share/help/en_GB/gnome-sudoku/notes.page
share/help/en_GB/gnome-sudoku/print-blank-puzzles.page
share/help/en_GB/gnome-sudoku/print-inprogress-game.page
share/help/en_GB/gnome-sudoku/rules.page
share/help/en_GB/gnome-sudoku/save-resume.page
-share/help/en_GB/gnome-sudoku/statistics.page
share/help/en_GB/gnome-sudoku/strategy.page
-share/help/en_GB/gnome-sudoku/toolbar.page
-share/help/en_GB/gnome-sudoku/trackers.page
share/help/en_GB/gnome-sudoku/translate.page
share/help/es/gnome-sudoku/basics.page
share/help/es/gnome-sudoku/bug-filing.page
-share/help/es/gnome-sudoku/commandline.page
share/help/es/gnome-sudoku/develop.page
share/help/es/gnome-sudoku/documentation.page
+share/help/es/gnome-sudoku/earmarks.page
share/help/es/gnome-sudoku/figures/logo.png
share/help/es/gnome-sudoku/figures/logo32.png
-share/help/es/gnome-sudoku/figures/possible-numbers.png
-share/help/es/gnome-sudoku/figures/resuming.png
share/help/es/gnome-sudoku/figures/rowcolumnbox.png
-share/help/es/gnome-sudoku/figures/stats-very-hard.png
share/help/es/gnome-sudoku/figures/strategy1.png
share/help/es/gnome-sudoku/figures/strategy2.png
-share/help/es/gnome-sudoku/figures/trackers.webm
share/help/es/gnome-sudoku/highlighting.page
-share/help/es/gnome-sudoku/hints.page
share/help/es/gnome-sudoku/index.page
share/help/es/gnome-sudoku/keyboard-shortcuts.page
share/help/es/gnome-sudoku/legal.xml
share/help/es/gnome-sudoku/license.page
-share/help/es/gnome-sudoku/notes.page
share/help/es/gnome-sudoku/print-blank-puzzles.page
share/help/es/gnome-sudoku/print-inprogress-game.page
share/help/es/gnome-sudoku/rules.page
share/help/es/gnome-sudoku/save-resume.page
-share/help/es/gnome-sudoku/statistics.page
share/help/es/gnome-sudoku/strategy.page
-share/help/es/gnome-sudoku/toolbar.page
-share/help/es/gnome-sudoku/trackers.page
share/help/es/gnome-sudoku/translate.page
share/help/eu/gnome-sudoku/basics.page
share/help/eu/gnome-sudoku/bug-filing.page
-share/help/eu/gnome-sudoku/commandline.page
share/help/eu/gnome-sudoku/develop.page
share/help/eu/gnome-sudoku/documentation.page
+share/help/eu/gnome-sudoku/earmarks.page
share/help/eu/gnome-sudoku/figures/logo.png
share/help/eu/gnome-sudoku/figures/logo32.png
-share/help/eu/gnome-sudoku/figures/possible-numbers.png
-share/help/eu/gnome-sudoku/figures/resuming.png
share/help/eu/gnome-sudoku/figures/rowcolumnbox.png
-share/help/eu/gnome-sudoku/figures/stats-very-hard.png
share/help/eu/gnome-sudoku/figures/strategy1.png
share/help/eu/gnome-sudoku/figures/strategy2.png
-share/help/eu/gnome-sudoku/figures/trackers.webm
share/help/eu/gnome-sudoku/highlighting.page
-share/help/eu/gnome-sudoku/hints.page
share/help/eu/gnome-sudoku/index.page
share/help/eu/gnome-sudoku/keyboard-shortcuts.page
share/help/eu/gnome-sudoku/legal.xml
share/help/eu/gnome-sudoku/license.page
-share/help/eu/gnome-sudoku/notes.page
share/help/eu/gnome-sudoku/print-blank-puzzles.page
share/help/eu/gnome-sudoku/print-inprogress-game.page
share/help/eu/gnome-sudoku/rules.page
share/help/eu/gnome-sudoku/save-resume.page
-share/help/eu/gnome-sudoku/statistics.page
share/help/eu/gnome-sudoku/strategy.page
-share/help/eu/gnome-sudoku/toolbar.page
-share/help/eu/gnome-sudoku/trackers.page
share/help/eu/gnome-sudoku/translate.page
share/help/fr/gnome-sudoku/basics.page
share/help/fr/gnome-sudoku/bug-filing.page
-share/help/fr/gnome-sudoku/commandline.page
share/help/fr/gnome-sudoku/develop.page
share/help/fr/gnome-sudoku/documentation.page
+share/help/fr/gnome-sudoku/earmarks.page
share/help/fr/gnome-sudoku/figures/logo.png
share/help/fr/gnome-sudoku/figures/logo32.png
-share/help/fr/gnome-sudoku/figures/possible-numbers.png
-share/help/fr/gnome-sudoku/figures/resuming.png
share/help/fr/gnome-sudoku/figures/rowcolumnbox.png
-share/help/fr/gnome-sudoku/figures/stats-very-hard.png
share/help/fr/gnome-sudoku/figures/strategy1.png
share/help/fr/gnome-sudoku/figures/strategy2.png
-share/help/fr/gnome-sudoku/figures/trackers.webm
share/help/fr/gnome-sudoku/highlighting.page
-share/help/fr/gnome-sudoku/hints.page
share/help/fr/gnome-sudoku/index.page
share/help/fr/gnome-sudoku/keyboard-shortcuts.page
share/help/fr/gnome-sudoku/legal.xml
share/help/fr/gnome-sudoku/license.page
-share/help/fr/gnome-sudoku/notes.page
share/help/fr/gnome-sudoku/print-blank-puzzles.page
share/help/fr/gnome-sudoku/print-inprogress-game.page
share/help/fr/gnome-sudoku/rules.page
share/help/fr/gnome-sudoku/save-resume.page
-share/help/fr/gnome-sudoku/statistics.page
share/help/fr/gnome-sudoku/strategy.page
-share/help/fr/gnome-sudoku/toolbar.page
-share/help/fr/gnome-sudoku/trackers.page
share/help/fr/gnome-sudoku/translate.page
share/help/gl/gnome-sudoku/basics.page
share/help/gl/gnome-sudoku/bug-filing.page
-share/help/gl/gnome-sudoku/commandline.page
share/help/gl/gnome-sudoku/develop.page
share/help/gl/gnome-sudoku/documentation.page
+share/help/gl/gnome-sudoku/earmarks.page
share/help/gl/gnome-sudoku/figures/logo.png
share/help/gl/gnome-sudoku/figures/logo32.png
-share/help/gl/gnome-sudoku/figures/possible-numbers.png
-share/help/gl/gnome-sudoku/figures/resuming.png
share/help/gl/gnome-sudoku/figures/rowcolumnbox.png
-share/help/gl/gnome-sudoku/figures/stats-very-hard.png
share/help/gl/gnome-sudoku/figures/strategy1.png
share/help/gl/gnome-sudoku/figures/strategy2.png
-share/help/gl/gnome-sudoku/figures/trackers.webm
share/help/gl/gnome-sudoku/highlighting.page
-share/help/gl/gnome-sudoku/hints.page
share/help/gl/gnome-sudoku/index.page
share/help/gl/gnome-sudoku/keyboard-shortcuts.page
share/help/gl/gnome-sudoku/legal.xml
share/help/gl/gnome-sudoku/license.page
-share/help/gl/gnome-sudoku/notes.page
share/help/gl/gnome-sudoku/print-blank-puzzles.page
share/help/gl/gnome-sudoku/print-inprogress-game.page
share/help/gl/gnome-sudoku/rules.page
share/help/gl/gnome-sudoku/save-resume.page
-share/help/gl/gnome-sudoku/statistics.page
share/help/gl/gnome-sudoku/strategy.page
-share/help/gl/gnome-sudoku/toolbar.page
-share/help/gl/gnome-sudoku/trackers.page
share/help/gl/gnome-sudoku/translate.page
share/help/hu/gnome-sudoku/basics.page
share/help/hu/gnome-sudoku/bug-filing.page
-share/help/hu/gnome-sudoku/commandline.page
share/help/hu/gnome-sudoku/develop.page
share/help/hu/gnome-sudoku/documentation.page
+share/help/hu/gnome-sudoku/earmarks.page
share/help/hu/gnome-sudoku/figures/logo.png
share/help/hu/gnome-sudoku/figures/logo32.png
-share/help/hu/gnome-sudoku/figures/possible-numbers.png
-share/help/hu/gnome-sudoku/figures/resuming.png
share/help/hu/gnome-sudoku/figures/rowcolumnbox.png
-share/help/hu/gnome-sudoku/figures/stats-very-hard.png
share/help/hu/gnome-sudoku/figures/strategy1.png
share/help/hu/gnome-sudoku/figures/strategy2.png
-share/help/hu/gnome-sudoku/figures/trackers.webm
share/help/hu/gnome-sudoku/highlighting.page
-share/help/hu/gnome-sudoku/hints.page
share/help/hu/gnome-sudoku/index.page
share/help/hu/gnome-sudoku/keyboard-shortcuts.page
share/help/hu/gnome-sudoku/legal.xml
share/help/hu/gnome-sudoku/license.page
-share/help/hu/gnome-sudoku/notes.page
share/help/hu/gnome-sudoku/print-blank-puzzles.page
share/help/hu/gnome-sudoku/print-inprogress-game.page
share/help/hu/gnome-sudoku/rules.page
share/help/hu/gnome-sudoku/save-resume.page
-share/help/hu/gnome-sudoku/statistics.page
share/help/hu/gnome-sudoku/strategy.page
-share/help/hu/gnome-sudoku/toolbar.page
-share/help/hu/gnome-sudoku/trackers.page
share/help/hu/gnome-sudoku/translate.page
share/help/it/gnome-sudoku/basics.page
share/help/it/gnome-sudoku/bug-filing.page
-share/help/it/gnome-sudoku/commandline.page
share/help/it/gnome-sudoku/develop.page
share/help/it/gnome-sudoku/documentation.page
+share/help/it/gnome-sudoku/earmarks.page
share/help/it/gnome-sudoku/figures/logo.png
share/help/it/gnome-sudoku/figures/logo32.png
-share/help/it/gnome-sudoku/figures/possible-numbers.png
-share/help/it/gnome-sudoku/figures/resuming.png
share/help/it/gnome-sudoku/figures/rowcolumnbox.png
-share/help/it/gnome-sudoku/figures/stats-very-hard.png
share/help/it/gnome-sudoku/figures/strategy1.png
share/help/it/gnome-sudoku/figures/strategy2.png
-share/help/it/gnome-sudoku/figures/trackers.webm
share/help/it/gnome-sudoku/highlighting.page
-share/help/it/gnome-sudoku/hints.page
share/help/it/gnome-sudoku/index.page
share/help/it/gnome-sudoku/keyboard-shortcuts.page
share/help/it/gnome-sudoku/legal.xml
share/help/it/gnome-sudoku/license.page
-share/help/it/gnome-sudoku/notes.page
share/help/it/gnome-sudoku/print-blank-puzzles.page
share/help/it/gnome-sudoku/print-inprogress-game.page
share/help/it/gnome-sudoku/rules.page
share/help/it/gnome-sudoku/save-resume.page
-share/help/it/gnome-sudoku/statistics.page
share/help/it/gnome-sudoku/strategy.page
-share/help/it/gnome-sudoku/toolbar.page
-share/help/it/gnome-sudoku/trackers.page
share/help/it/gnome-sudoku/translate.page
+share/help/ko/gnome-sudoku/basics.page
+share/help/ko/gnome-sudoku/bug-filing.page
+share/help/ko/gnome-sudoku/develop.page
+share/help/ko/gnome-sudoku/documentation.page
+share/help/ko/gnome-sudoku/earmarks.page
+share/help/ko/gnome-sudoku/figures/logo.png
+share/help/ko/gnome-sudoku/figures/logo32.png
+share/help/ko/gnome-sudoku/figures/rowcolumnbox.png
+share/help/ko/gnome-sudoku/figures/strategy1.png
+share/help/ko/gnome-sudoku/figures/strategy2.png
+share/help/ko/gnome-sudoku/highlighting.page
+share/help/ko/gnome-sudoku/index.page
+share/help/ko/gnome-sudoku/keyboard-shortcuts.page
+share/help/ko/gnome-sudoku/legal.xml
+share/help/ko/gnome-sudoku/license.page
+share/help/ko/gnome-sudoku/print-blank-puzzles.page
+share/help/ko/gnome-sudoku/print-inprogress-game.page
+share/help/ko/gnome-sudoku/rules.page
+share/help/ko/gnome-sudoku/save-resume.page
+share/help/ko/gnome-sudoku/strategy.page
+share/help/ko/gnome-sudoku/translate.page
share/help/oc/gnome-sudoku/basics.page
share/help/oc/gnome-sudoku/bug-filing.page
-share/help/oc/gnome-sudoku/commandline.page
share/help/oc/gnome-sudoku/develop.page
share/help/oc/gnome-sudoku/documentation.page
+share/help/oc/gnome-sudoku/earmarks.page
share/help/oc/gnome-sudoku/figures/logo.png
share/help/oc/gnome-sudoku/figures/logo32.png
-share/help/oc/gnome-sudoku/figures/possible-numbers.png
-share/help/oc/gnome-sudoku/figures/resuming.png
share/help/oc/gnome-sudoku/figures/rowcolumnbox.png
-share/help/oc/gnome-sudoku/figures/stats-very-hard.png
share/help/oc/gnome-sudoku/figures/strategy1.png
share/help/oc/gnome-sudoku/figures/strategy2.png
-share/help/oc/gnome-sudoku/figures/trackers.webm
share/help/oc/gnome-sudoku/highlighting.page
-share/help/oc/gnome-sudoku/hints.page
share/help/oc/gnome-sudoku/index.page
share/help/oc/gnome-sudoku/keyboard-shortcuts.page
share/help/oc/gnome-sudoku/legal.xml
share/help/oc/gnome-sudoku/license.page
-share/help/oc/gnome-sudoku/notes.page
share/help/oc/gnome-sudoku/print-blank-puzzles.page
share/help/oc/gnome-sudoku/print-inprogress-game.page
share/help/oc/gnome-sudoku/rules.page
share/help/oc/gnome-sudoku/save-resume.page
-share/help/oc/gnome-sudoku/statistics.page
share/help/oc/gnome-sudoku/strategy.page
-share/help/oc/gnome-sudoku/toolbar.page
-share/help/oc/gnome-sudoku/trackers.page
share/help/oc/gnome-sudoku/translate.page
+share/help/pl/gnome-sudoku/basics.page
+share/help/pl/gnome-sudoku/bug-filing.page
+share/help/pl/gnome-sudoku/develop.page
+share/help/pl/gnome-sudoku/documentation.page
+share/help/pl/gnome-sudoku/earmarks.page
+share/help/pl/gnome-sudoku/figures/logo.png
+share/help/pl/gnome-sudoku/figures/logo32.png
+share/help/pl/gnome-sudoku/figures/rowcolumnbox.png
+share/help/pl/gnome-sudoku/figures/strategy1.png
+share/help/pl/gnome-sudoku/figures/strategy2.png
+share/help/pl/gnome-sudoku/highlighting.page
+share/help/pl/gnome-sudoku/index.page
+share/help/pl/gnome-sudoku/keyboard-shortcuts.page
+share/help/pl/gnome-sudoku/legal.xml
+share/help/pl/gnome-sudoku/license.page
+share/help/pl/gnome-sudoku/print-blank-puzzles.page
+share/help/pl/gnome-sudoku/print-inprogress-game.page
+share/help/pl/gnome-sudoku/rules.page
+share/help/pl/gnome-sudoku/save-resume.page
+share/help/pl/gnome-sudoku/strategy.page
+share/help/pl/gnome-sudoku/translate.page
share/help/pt_BR/gnome-sudoku/basics.page
share/help/pt_BR/gnome-sudoku/bug-filing.page
-share/help/pt_BR/gnome-sudoku/commandline.page
share/help/pt_BR/gnome-sudoku/develop.page
share/help/pt_BR/gnome-sudoku/documentation.page
+share/help/pt_BR/gnome-sudoku/earmarks.page
share/help/pt_BR/gnome-sudoku/figures/logo.png
share/help/pt_BR/gnome-sudoku/figures/logo32.png
-share/help/pt_BR/gnome-sudoku/figures/possible-numbers.png
-share/help/pt_BR/gnome-sudoku/figures/resuming.png
share/help/pt_BR/gnome-sudoku/figures/rowcolumnbox.png
-share/help/pt_BR/gnome-sudoku/figures/stats-very-hard.png
share/help/pt_BR/gnome-sudoku/figures/strategy1.png
share/help/pt_BR/gnome-sudoku/figures/strategy2.png
-share/help/pt_BR/gnome-sudoku/figures/trackers.webm
share/help/pt_BR/gnome-sudoku/highlighting.page
-share/help/pt_BR/gnome-sudoku/hints.page
share/help/pt_BR/gnome-sudoku/index.page
share/help/pt_BR/gnome-sudoku/keyboard-shortcuts.page
share/help/pt_BR/gnome-sudoku/legal.xml
share/help/pt_BR/gnome-sudoku/license.page
-share/help/pt_BR/gnome-sudoku/notes.page
share/help/pt_BR/gnome-sudoku/print-blank-puzzles.page
share/help/pt_BR/gnome-sudoku/print-inprogress-game.page
share/help/pt_BR/gnome-sudoku/rules.page
share/help/pt_BR/gnome-sudoku/save-resume.page
-share/help/pt_BR/gnome-sudoku/statistics.page
share/help/pt_BR/gnome-sudoku/strategy.page
-share/help/pt_BR/gnome-sudoku/toolbar.page
-share/help/pt_BR/gnome-sudoku/trackers.page
share/help/pt_BR/gnome-sudoku/translate.page
share/help/ru/gnome-sudoku/basics.page
share/help/ru/gnome-sudoku/bug-filing.page
-share/help/ru/gnome-sudoku/commandline.page
share/help/ru/gnome-sudoku/develop.page
share/help/ru/gnome-sudoku/documentation.page
+share/help/ru/gnome-sudoku/earmarks.page
share/help/ru/gnome-sudoku/figures/logo.png
share/help/ru/gnome-sudoku/figures/logo32.png
-share/help/ru/gnome-sudoku/figures/possible-numbers.png
-share/help/ru/gnome-sudoku/figures/resuming.png
share/help/ru/gnome-sudoku/figures/rowcolumnbox.png
-share/help/ru/gnome-sudoku/figures/stats-very-hard.png
share/help/ru/gnome-sudoku/figures/strategy1.png
share/help/ru/gnome-sudoku/figures/strategy2.png
-share/help/ru/gnome-sudoku/figures/trackers.webm
share/help/ru/gnome-sudoku/highlighting.page
-share/help/ru/gnome-sudoku/hints.page
share/help/ru/gnome-sudoku/index.page
share/help/ru/gnome-sudoku/keyboard-shortcuts.page
share/help/ru/gnome-sudoku/legal.xml
share/help/ru/gnome-sudoku/license.page
-share/help/ru/gnome-sudoku/notes.page
share/help/ru/gnome-sudoku/print-blank-puzzles.page
share/help/ru/gnome-sudoku/print-inprogress-game.page
share/help/ru/gnome-sudoku/rules.page
share/help/ru/gnome-sudoku/save-resume.page
-share/help/ru/gnome-sudoku/statistics.page
share/help/ru/gnome-sudoku/strategy.page
-share/help/ru/gnome-sudoku/toolbar.page
-share/help/ru/gnome-sudoku/trackers.page
share/help/ru/gnome-sudoku/translate.page
share/help/sl/gnome-sudoku/basics.page
share/help/sl/gnome-sudoku/bug-filing.page
-share/help/sl/gnome-sudoku/commandline.page
share/help/sl/gnome-sudoku/develop.page
share/help/sl/gnome-sudoku/documentation.page
+share/help/sl/gnome-sudoku/earmarks.page
share/help/sl/gnome-sudoku/figures/logo.png
share/help/sl/gnome-sudoku/figures/logo32.png
-share/help/sl/gnome-sudoku/figures/possible-numbers.png
-share/help/sl/gnome-sudoku/figures/resuming.png
share/help/sl/gnome-sudoku/figures/rowcolumnbox.png
-share/help/sl/gnome-sudoku/figures/stats-very-hard.png
share/help/sl/gnome-sudoku/figures/strategy1.png
share/help/sl/gnome-sudoku/figures/strategy2.png
-share/help/sl/gnome-sudoku/figures/trackers.webm
share/help/sl/gnome-sudoku/highlighting.page
-share/help/sl/gnome-sudoku/hints.page
share/help/sl/gnome-sudoku/index.page
share/help/sl/gnome-sudoku/keyboard-shortcuts.page
share/help/sl/gnome-sudoku/legal.xml
share/help/sl/gnome-sudoku/license.page
-share/help/sl/gnome-sudoku/notes.page
share/help/sl/gnome-sudoku/print-blank-puzzles.page
share/help/sl/gnome-sudoku/print-inprogress-game.page
share/help/sl/gnome-sudoku/rules.page
share/help/sl/gnome-sudoku/save-resume.page
-share/help/sl/gnome-sudoku/statistics.page
share/help/sl/gnome-sudoku/strategy.page
-share/help/sl/gnome-sudoku/toolbar.page
-share/help/sl/gnome-sudoku/trackers.page
share/help/sl/gnome-sudoku/translate.page
share/help/sr/gnome-sudoku/basics.page
share/help/sr/gnome-sudoku/bug-filing.page
-share/help/sr/gnome-sudoku/commandline.page
share/help/sr/gnome-sudoku/develop.page
share/help/sr/gnome-sudoku/documentation.page
+share/help/sr/gnome-sudoku/earmarks.page
share/help/sr/gnome-sudoku/figures/logo.png
share/help/sr/gnome-sudoku/figures/logo32.png
-share/help/sr/gnome-sudoku/figures/possible-numbers.png
-share/help/sr/gnome-sudoku/figures/resuming.png
share/help/sr/gnome-sudoku/figures/rowcolumnbox.png
-share/help/sr/gnome-sudoku/figures/stats-very-hard.png
share/help/sr/gnome-sudoku/figures/strategy1.png
share/help/sr/gnome-sudoku/figures/strategy2.png
-share/help/sr/gnome-sudoku/figures/trackers.webm
share/help/sr/gnome-sudoku/highlighting.page
-share/help/sr/gnome-sudoku/hints.page
share/help/sr/gnome-sudoku/index.page
share/help/sr/gnome-sudoku/keyboard-shortcuts.page
share/help/sr/gnome-sudoku/legal.xml
share/help/sr/gnome-sudoku/license.page
-share/help/sr/gnome-sudoku/notes.page
share/help/sr/gnome-sudoku/print-blank-puzzles.page
share/help/sr/gnome-sudoku/print-inprogress-game.page
share/help/sr/gnome-sudoku/rules.page
share/help/sr/gnome-sudoku/save-resume.page
-share/help/sr/gnome-sudoku/statistics.page
share/help/sr/gnome-sudoku/strategy.page
-share/help/sr/gnome-sudoku/toolbar.page
-share/help/sr/gnome-sudoku/trackers.page
share/help/sr/gnome-sudoku/translate.page
share/help/sr@latin/gnome-sudoku/basics.page
share/help/sr@latin/gnome-sudoku/bug-filing.page
-share/help/sr@latin/gnome-sudoku/commandline.page
share/help/sr@latin/gnome-sudoku/develop.page
share/help/sr@latin/gnome-sudoku/documentation.page
+share/help/sr@latin/gnome-sudoku/earmarks.page
share/help/sr@latin/gnome-sudoku/figures/logo.png
share/help/sr@latin/gnome-sudoku/figures/logo32.png
-share/help/sr@latin/gnome-sudoku/figures/possible-numbers.png
-share/help/sr@latin/gnome-sudoku/figures/resuming.png
share/help/sr@latin/gnome-sudoku/figures/rowcolumnbox.png
-share/help/sr@latin/gnome-sudoku/figures/stats-very-hard.png
share/help/sr@latin/gnome-sudoku/figures/strategy1.png
share/help/sr@latin/gnome-sudoku/figures/strategy2.png
-share/help/sr@latin/gnome-sudoku/figures/trackers.webm
share/help/sr@latin/gnome-sudoku/highlighting.page
-share/help/sr@latin/gnome-sudoku/hints.page
share/help/sr@latin/gnome-sudoku/index.page
share/help/sr@latin/gnome-sudoku/keyboard-shortcuts.page
share/help/sr@latin/gnome-sudoku/legal.xml
share/help/sr@latin/gnome-sudoku/license.page
-share/help/sr@latin/gnome-sudoku/notes.page
share/help/sr@latin/gnome-sudoku/print-blank-puzzles.page
share/help/sr@latin/gnome-sudoku/print-inprogress-game.page
share/help/sr@latin/gnome-sudoku/rules.page
share/help/sr@latin/gnome-sudoku/save-resume.page
-share/help/sr@latin/gnome-sudoku/statistics.page
share/help/sr@latin/gnome-sudoku/strategy.page
-share/help/sr@latin/gnome-sudoku/toolbar.page
-share/help/sr@latin/gnome-sudoku/trackers.page
share/help/sr@latin/gnome-sudoku/translate.page
share/help/sv/gnome-sudoku/basics.page
share/help/sv/gnome-sudoku/bug-filing.page
-share/help/sv/gnome-sudoku/commandline.page
share/help/sv/gnome-sudoku/develop.page
share/help/sv/gnome-sudoku/documentation.page
+share/help/sv/gnome-sudoku/earmarks.page
share/help/sv/gnome-sudoku/figures/logo.png
share/help/sv/gnome-sudoku/figures/logo32.png
-share/help/sv/gnome-sudoku/figures/possible-numbers.png
-share/help/sv/gnome-sudoku/figures/resuming.png
share/help/sv/gnome-sudoku/figures/rowcolumnbox.png
-share/help/sv/gnome-sudoku/figures/stats-very-hard.png
share/help/sv/gnome-sudoku/figures/strategy1.png
share/help/sv/gnome-sudoku/figures/strategy2.png
-share/help/sv/gnome-sudoku/figures/trackers.webm
share/help/sv/gnome-sudoku/highlighting.page
-share/help/sv/gnome-sudoku/hints.page
share/help/sv/gnome-sudoku/index.page
share/help/sv/gnome-sudoku/keyboard-shortcuts.page
share/help/sv/gnome-sudoku/legal.xml
share/help/sv/gnome-sudoku/license.page
-share/help/sv/gnome-sudoku/notes.page
share/help/sv/gnome-sudoku/print-blank-puzzles.page
share/help/sv/gnome-sudoku/print-inprogress-game.page
share/help/sv/gnome-sudoku/rules.page
share/help/sv/gnome-sudoku/save-resume.page
-share/help/sv/gnome-sudoku/statistics.page
share/help/sv/gnome-sudoku/strategy.page
-share/help/sv/gnome-sudoku/toolbar.page
-share/help/sv/gnome-sudoku/trackers.page
share/help/sv/gnome-sudoku/translate.page
share/help/zh_CN/gnome-sudoku/basics.page
share/help/zh_CN/gnome-sudoku/bug-filing.page
-share/help/zh_CN/gnome-sudoku/commandline.page
share/help/zh_CN/gnome-sudoku/develop.page
share/help/zh_CN/gnome-sudoku/documentation.page
+share/help/zh_CN/gnome-sudoku/earmarks.page
share/help/zh_CN/gnome-sudoku/figures/logo.png
share/help/zh_CN/gnome-sudoku/figures/logo32.png
-share/help/zh_CN/gnome-sudoku/figures/possible-numbers.png
-share/help/zh_CN/gnome-sudoku/figures/resuming.png
share/help/zh_CN/gnome-sudoku/figures/rowcolumnbox.png
-share/help/zh_CN/gnome-sudoku/figures/stats-very-hard.png
share/help/zh_CN/gnome-sudoku/figures/strategy1.png
share/help/zh_CN/gnome-sudoku/figures/strategy2.png
-share/help/zh_CN/gnome-sudoku/figures/trackers.webm
share/help/zh_CN/gnome-sudoku/highlighting.page
-share/help/zh_CN/gnome-sudoku/hints.page
share/help/zh_CN/gnome-sudoku/index.page
share/help/zh_CN/gnome-sudoku/keyboard-shortcuts.page
share/help/zh_CN/gnome-sudoku/legal.xml
share/help/zh_CN/gnome-sudoku/license.page
-share/help/zh_CN/gnome-sudoku/notes.page
share/help/zh_CN/gnome-sudoku/print-blank-puzzles.page
share/help/zh_CN/gnome-sudoku/print-inprogress-game.page
share/help/zh_CN/gnome-sudoku/rules.page
share/help/zh_CN/gnome-sudoku/save-resume.page
-share/help/zh_CN/gnome-sudoku/statistics.page
share/help/zh_CN/gnome-sudoku/strategy.page
-share/help/zh_CN/gnome-sudoku/toolbar.page
-share/help/zh_CN/gnome-sudoku/trackers.page
share/help/zh_CN/gnome-sudoku/translate.page
share/icons/hicolor/16x16/apps/gnome-sudoku.png
share/icons/hicolor/22x22/apps/gnome-sudoku.png
@@ -729,3 +581,4 @@ share/locale/xh/LC_MESSAGES/gnome-sudoku.mo
share/locale/zh_CN/LC_MESSAGES/gnome-sudoku.mo
share/locale/zh_HK/LC_MESSAGES/gnome-sudoku.mo
share/locale/zh_TW/LC_MESSAGES/gnome-sudoku.mo
+share/metainfo/gnome-sudoku.appdata.xml
diff --git a/games/gnome-taquin/Makefile b/games/gnome-taquin/Makefile
index 242fb5cafe04..ca50cb882e2d 100644
--- a/games/gnome-taquin/Makefile
+++ b/games/gnome-taquin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-taquin
-PORTVERSION= 3.22.0
+PORTVERSION= 3.28.0
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/games/gnome-taquin/distinfo b/games/gnome-taquin/distinfo
index f661192c1f9c..4e9cfc80d27c 100644
--- a/games/gnome-taquin/distinfo
+++ b/games/gnome-taquin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481305164
-SHA256 (gnome3/gnome-taquin-3.22.0.tar.xz) = 780af247856b91095a9a2e1a6b425e4e3a78520659e2157eddb421377e8ce982
-SIZE (gnome3/gnome-taquin-3.22.0.tar.xz) = 5030156
+TIMESTAMP = 1525984179
+SHA256 (gnome3/gnome-taquin-3.28.0.tar.xz) = a9cbaff0bddec8915138b0a831e4a2c391d663e7024753941d447c06ad18ca24
+SIZE (gnome3/gnome-taquin-3.28.0.tar.xz) = 4550056
diff --git a/games/gnome-taquin/pkg-plist b/games/gnome-taquin/pkg-plist
index 813dba28876b..aa8020093605 100644
--- a/games/gnome-taquin/pkg-plist
+++ b/games/gnome-taquin/pkg-plist
@@ -1,6 +1,5 @@
bin/gnome-taquin
man/man6/gnome-taquin.6.gz
-share/appdata/org.gnome.taquin.appdata.xml
share/applications/org.gnome.taquin.desktop
share/dbus-1/services/org.gnome.taquin.service
%%DATADIR%%/sounds/gameover.ogg
@@ -17,11 +16,8 @@ share/dbus-1/services/org.gnome.taquin.service
share/help/C/gnome-taquin/15-Puzzle.page
share/help/C/gnome-taquin/16-Puzzle.page
share/help/C/gnome-taquin/beginning.page
-share/help/C/gnome-taquin/figures/fifteen.png
share/help/C/gnome-taquin/figures/logo.png
share/help/C/gnome-taquin/figures/logo32.png
-share/help/C/gnome-taquin/figures/sixteen.png
-share/help/C/gnome-taquin/figures/start-screen.png
share/help/C/gnome-taquin/index.page
share/help/C/gnome-taquin/legal.xml
share/help/C/gnome-taquin/license.page
@@ -30,11 +26,8 @@ share/help/C/gnome-taquin/start-screen.page
share/help/cs/gnome-taquin/15-Puzzle.page
share/help/cs/gnome-taquin/16-Puzzle.page
share/help/cs/gnome-taquin/beginning.page
-share/help/cs/gnome-taquin/figures/fifteen.png
share/help/cs/gnome-taquin/figures/logo.png
share/help/cs/gnome-taquin/figures/logo32.png
-share/help/cs/gnome-taquin/figures/sixteen.png
-share/help/cs/gnome-taquin/figures/start-screen.png
share/help/cs/gnome-taquin/index.page
share/help/cs/gnome-taquin/legal.xml
share/help/cs/gnome-taquin/license.page
@@ -43,11 +36,8 @@ share/help/cs/gnome-taquin/start-screen.page
share/help/de/gnome-taquin/15-Puzzle.page
share/help/de/gnome-taquin/16-Puzzle.page
share/help/de/gnome-taquin/beginning.page
-share/help/de/gnome-taquin/figures/fifteen.png
share/help/de/gnome-taquin/figures/logo.png
share/help/de/gnome-taquin/figures/logo32.png
-share/help/de/gnome-taquin/figures/sixteen.png
-share/help/de/gnome-taquin/figures/start-screen.png
share/help/de/gnome-taquin/index.page
share/help/de/gnome-taquin/legal.xml
share/help/de/gnome-taquin/license.page
@@ -56,11 +46,8 @@ share/help/de/gnome-taquin/start-screen.page
share/help/el/gnome-taquin/15-Puzzle.page
share/help/el/gnome-taquin/16-Puzzle.page
share/help/el/gnome-taquin/beginning.page
-share/help/el/gnome-taquin/figures/fifteen.png
share/help/el/gnome-taquin/figures/logo.png
share/help/el/gnome-taquin/figures/logo32.png
-share/help/el/gnome-taquin/figures/sixteen.png
-share/help/el/gnome-taquin/figures/start-screen.png
share/help/el/gnome-taquin/index.page
share/help/el/gnome-taquin/legal.xml
share/help/el/gnome-taquin/license.page
@@ -69,11 +56,8 @@ share/help/el/gnome-taquin/start-screen.page
share/help/es/gnome-taquin/15-Puzzle.page
share/help/es/gnome-taquin/16-Puzzle.page
share/help/es/gnome-taquin/beginning.page
-share/help/es/gnome-taquin/figures/fifteen.png
share/help/es/gnome-taquin/figures/logo.png
share/help/es/gnome-taquin/figures/logo32.png
-share/help/es/gnome-taquin/figures/sixteen.png
-share/help/es/gnome-taquin/figures/start-screen.png
share/help/es/gnome-taquin/index.page
share/help/es/gnome-taquin/legal.xml
share/help/es/gnome-taquin/license.page
@@ -82,37 +66,48 @@ share/help/es/gnome-taquin/start-screen.page
share/help/fr/gnome-taquin/15-Puzzle.page
share/help/fr/gnome-taquin/16-Puzzle.page
share/help/fr/gnome-taquin/beginning.page
-share/help/fr/gnome-taquin/figures/fifteen.png
share/help/fr/gnome-taquin/figures/logo.png
share/help/fr/gnome-taquin/figures/logo32.png
-share/help/fr/gnome-taquin/figures/sixteen.png
-share/help/fr/gnome-taquin/figures/start-screen.png
share/help/fr/gnome-taquin/index.page
share/help/fr/gnome-taquin/legal.xml
share/help/fr/gnome-taquin/license.page
share/help/fr/gnome-taquin/shortcuts.page
share/help/fr/gnome-taquin/start-screen.page
+share/help/gl/gnome-taquin/15-Puzzle.page
+share/help/gl/gnome-taquin/16-Puzzle.page
+share/help/gl/gnome-taquin/beginning.page
+share/help/gl/gnome-taquin/figures/logo.png
+share/help/gl/gnome-taquin/figures/logo32.png
+share/help/gl/gnome-taquin/index.page
+share/help/gl/gnome-taquin/legal.xml
+share/help/gl/gnome-taquin/license.page
+share/help/gl/gnome-taquin/shortcuts.page
+share/help/gl/gnome-taquin/start-screen.page
share/help/hu/gnome-taquin/15-Puzzle.page
share/help/hu/gnome-taquin/16-Puzzle.page
share/help/hu/gnome-taquin/beginning.page
-share/help/hu/gnome-taquin/figures/fifteen.png
share/help/hu/gnome-taquin/figures/logo.png
share/help/hu/gnome-taquin/figures/logo32.png
-share/help/hu/gnome-taquin/figures/sixteen.png
-share/help/hu/gnome-taquin/figures/start-screen.png
share/help/hu/gnome-taquin/index.page
share/help/hu/gnome-taquin/legal.xml
share/help/hu/gnome-taquin/license.page
share/help/hu/gnome-taquin/shortcuts.page
share/help/hu/gnome-taquin/start-screen.page
+share/help/pl/gnome-taquin/15-Puzzle.page
+share/help/pl/gnome-taquin/16-Puzzle.page
+share/help/pl/gnome-taquin/beginning.page
+share/help/pl/gnome-taquin/figures/logo.png
+share/help/pl/gnome-taquin/figures/logo32.png
+share/help/pl/gnome-taquin/index.page
+share/help/pl/gnome-taquin/legal.xml
+share/help/pl/gnome-taquin/license.page
+share/help/pl/gnome-taquin/shortcuts.page
+share/help/pl/gnome-taquin/start-screen.page
share/help/sv/gnome-taquin/15-Puzzle.page
share/help/sv/gnome-taquin/16-Puzzle.page
share/help/sv/gnome-taquin/beginning.page
-share/help/sv/gnome-taquin/figures/fifteen.png
share/help/sv/gnome-taquin/figures/logo.png
share/help/sv/gnome-taquin/figures/logo32.png
-share/help/sv/gnome-taquin/figures/sixteen.png
-share/help/sv/gnome-taquin/figures/start-screen.png
share/help/sv/gnome-taquin/index.page
share/help/sv/gnome-taquin/legal.xml
share/help/sv/gnome-taquin/license.page
@@ -129,6 +124,7 @@ share/locale/an/LC_MESSAGES/gnome-taquin.mo
share/locale/bg/LC_MESSAGES/gnome-taquin.mo
share/locale/bs/LC_MESSAGES/gnome-taquin.mo
share/locale/ca/LC_MESSAGES/gnome-taquin.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-taquin.mo
share/locale/cs/LC_MESSAGES/gnome-taquin.mo
share/locale/da/LC_MESSAGES/gnome-taquin.mo
share/locale/de/LC_MESSAGES/gnome-taquin.mo
@@ -143,6 +139,7 @@ share/locale/fr/LC_MESSAGES/gnome-taquin.mo
share/locale/fur/LC_MESSAGES/gnome-taquin.mo
share/locale/gl/LC_MESSAGES/gnome-taquin.mo
share/locale/he/LC_MESSAGES/gnome-taquin.mo
+share/locale/hr/LC_MESSAGES/gnome-taquin.mo
share/locale/hu/LC_MESSAGES/gnome-taquin.mo
share/locale/id/LC_MESSAGES/gnome-taquin.mo
share/locale/it/LC_MESSAGES/gnome-taquin.mo
@@ -150,6 +147,8 @@ share/locale/ko/LC_MESSAGES/gnome-taquin.mo
share/locale/lt/LC_MESSAGES/gnome-taquin.mo
share/locale/lv/LC_MESSAGES/gnome-taquin.mo
share/locale/nb/LC_MESSAGES/gnome-taquin.mo
+share/locale/ne/LC_MESSAGES/gnome-taquin.mo
+share/locale/nl/LC_MESSAGES/gnome-taquin.mo
share/locale/oc/LC_MESSAGES/gnome-taquin.mo
share/locale/pa/LC_MESSAGES/gnome-taquin.mo
share/locale/pl/LC_MESSAGES/gnome-taquin.mo
@@ -164,5 +163,7 @@ share/locale/sv/LC_MESSAGES/gnome-taquin.mo
share/locale/tr/LC_MESSAGES/gnome-taquin.mo
share/locale/uk/LC_MESSAGES/gnome-taquin.mo
share/locale/vi/LC_MESSAGES/gnome-taquin.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-taquin.mo
share/locale/zh_HK/LC_MESSAGES/gnome-taquin.mo
share/locale/zh_TW/LC_MESSAGES/gnome-taquin.mo
+share/metainfo/org.gnome.taquin.appdata.xml
diff --git a/games/goldencheetah/Makefile b/games/goldencheetah/Makefile
index 49eceb4bf166..de51d62e4123 100644
--- a/games/goldencheetah/Makefile
+++ b/games/goldencheetah/Makefile
@@ -4,7 +4,7 @@
PORTNAME= GoldenCheetah
PORTVERSION= 3.2
DISTVERSIONPREFIX= V
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MAINTAINER= trebbu@googlemail.com
diff --git a/games/goldencheetah/files/patch-src_CalDAV.cpp b/games/goldencheetah/files/patch-src_CalDAV.cpp
new file mode 100644
index 000000000000..aa9a27bc41fa
--- /dev/null
+++ b/games/goldencheetah/files/patch-src_CalDAV.cpp
@@ -0,0 +1,21 @@
+From a771b9629aab39de1ab1edd0e8b5180af2ab53a0 Mon Sep 17 00:00:00 2001
+From: Mark Liversedge <liversedge@gmail.com>
+Date: Sun, 29 Oct 2017 15:03:44 +0000
+Subject: [PATCH] libical 2 compatibility
+
+.. isUTC no longer present (and was never needed anyway).
+---
+ src/Cloud/CalDAV.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- src/CalDAV.cpp.orig 2015-08-12 08:43:33 UTC
++++ src/CalDAV.cpp
+@@ -274,7 +274,7 @@ icalcomponent *createEvent(RideItem *rideItem)
+ atime.hour = utc.time().hour();
+ atime.minute = utc.time().minute();
+ atime.second = utc.time().second();
+- atime.is_utc = 1; // this is UTC is_utc is redundant but kept for completeness
++ //atime.is_utc = 1; // this is UTC is_utc is redundant but kept for completeness
+ atime.is_date = 0; // this is a date AND time
+ atime.is_daylight = 0; // no daylight savings - its UTC
+ atime.zone = icaltimezone_get_utc_timezone(); // set UTC timezone
diff --git a/games/hitori/Makefile b/games/hitori/Makefile
index 47bbcd501749..8ef283f1af1d 100644
--- a/games/hitori/Makefile
+++ b/games/hitori/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hitori
-PORTVERSION= 3.22.3
+PORTVERSION= 3.22.4
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/games/hitori/distinfo b/games/hitori/distinfo
index 7b9592620fbd..70b2948aa88f 100644
--- a/games/hitori/distinfo
+++ b/games/hitori/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494626802
-SHA256 (gnome3/hitori-3.22.3.tar.xz) = ba21368d6d8475ae8cf0d39b62dab5eaec26ce82b3f067af50f1eded3a43b360
-SIZE (gnome3/hitori-3.22.3.tar.xz) = 462592
+TIMESTAMP = 1516392744
+SHA256 (gnome3/hitori-3.22.4.tar.xz) = dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3
+SIZE (gnome3/hitori-3.22.4.tar.xz) = 471136
diff --git a/games/hitori/pkg-plist b/games/hitori/pkg-plist
index 15630470a10a..af0d880b5c00 100644
--- a/games/hitori/pkg-plist
+++ b/games/hitori/pkg-plist
@@ -64,6 +64,13 @@ share/help/hu/hitori/index.page
share/help/hu/hitori/legal.xml
share/help/hu/hitori/playing.page
share/help/hu/hitori/strategy.page
+share/help/pl/hitori/customization.page
+share/help/pl/hitori/figures/hitori_main_window.png
+share/help/pl/hitori/game.page
+share/help/pl/hitori/index.page
+share/help/pl/hitori/legal.xml
+share/help/pl/hitori/playing.page
+share/help/pl/hitori/strategy.page
share/help/ro/hitori/customization.page
share/help/ro/hitori/figures/hitori_main_window.png
share/help/ro/hitori/game.page
@@ -125,13 +132,15 @@ share/locale/it/LC_MESSAGES/hitori.mo
share/locale/ko/LC_MESSAGES/hitori.mo
share/locale/lt/LC_MESSAGES/hitori.mo
share/locale/lv/LC_MESSAGES/hitori.mo
+share/locale/ml/LC_MESSAGES/hitori.mo
share/locale/nb/LC_MESSAGES/hitori.mo
share/locale/ne/LC_MESSAGES/hitori.mo
+share/locale/nl/LC_MESSAGES/hitori.mo
share/locale/oc/LC_MESSAGES/hitori.mo
share/locale/pa/LC_MESSAGES/hitori.mo
share/locale/pl/LC_MESSAGES/hitori.mo
-share/locale/pt_BR/LC_MESSAGES/hitori.mo
share/locale/pt/LC_MESSAGES/hitori.mo
+share/locale/pt_BR/LC_MESSAGES/hitori.mo
share/locale/ro/LC_MESSAGES/hitori.mo
share/locale/ru/LC_MESSAGES/hitori.mo
share/locale/sk/LC_MESSAGES/hitori.mo
diff --git a/games/iagno/Makefile b/games/iagno/Makefile
index ae1abab18342..6cc5748966f9 100644
--- a/games/iagno/Makefile
+++ b/games/iagno/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= iagno
-PORTVERSION= 3.22.0
+PORTVERSION= 3.28.0
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/games/iagno/distinfo b/games/iagno/distinfo
index 59082588bc01..5b50b911d57b 100644
--- a/games/iagno/distinfo
+++ b/games/iagno/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481306405
-SHA256 (gnome3/iagno-3.22.0.tar.xz) = e7070c55f1f74cd9345388ee120f0e6cc47392868c2601664c26a0fa2672fe13
-SIZE (gnome3/iagno-3.22.0.tar.xz) = 1815048
+TIMESTAMP = 1525984496
+SHA256 (gnome3/iagno-3.28.0.tar.xz) = dd8082b68e22df08e43bbfd01141d5a20cf0582e45c90c4e72dce4fc76c00a8a
+SIZE (gnome3/iagno-3.28.0.tar.xz) = 749476
diff --git a/games/iagno/pkg-plist b/games/iagno/pkg-plist
index eddae5f46cc3..893ff4868d3b 100644
--- a/games/iagno/pkg-plist
+++ b/games/iagno/pkg-plist
@@ -1,6 +1,5 @@
bin/iagno
man/man6/iagno.6.gz
-share/appdata/iagno.appdata.xml
share/applications/iagno.desktop
share/help/C/iagno/2player.page
share/help/C/iagno/ai-game.page
@@ -10,7 +9,6 @@ share/help/C/iagno/develop.page
share/help/C/iagno/documentation.page
share/help/C/iagno/figures/block.png
share/help/C/iagno/figures/first.png
-share/help/C/iagno/figures/iagno-gameover.png
share/help/C/iagno/figures/iagno-video.ogv
share/help/C/iagno/figures/logo.png
share/help/C/iagno/figures/logo32.png
@@ -32,7 +30,6 @@ share/help/ca/iagno/develop.page
share/help/ca/iagno/documentation.page
share/help/ca/iagno/figures/block.png
share/help/ca/iagno/figures/first.png
-share/help/ca/iagno/figures/iagno-gameover.png
share/help/ca/iagno/figures/iagno-video.ogv
share/help/ca/iagno/figures/logo.png
share/help/ca/iagno/figures/logo32.png
@@ -54,7 +51,6 @@ share/help/cs/iagno/develop.page
share/help/cs/iagno/documentation.page
share/help/cs/iagno/figures/block.png
share/help/cs/iagno/figures/first.png
-share/help/cs/iagno/figures/iagno-gameover.png
share/help/cs/iagno/figures/iagno-video.ogv
share/help/cs/iagno/figures/logo.png
share/help/cs/iagno/figures/logo32.png
@@ -76,7 +72,6 @@ share/help/de/iagno/develop.page
share/help/de/iagno/documentation.page
share/help/de/iagno/figures/block.png
share/help/de/iagno/figures/first.png
-share/help/de/iagno/figures/iagno-gameover.png
share/help/de/iagno/figures/iagno-video.ogv
share/help/de/iagno/figures/logo.png
share/help/de/iagno/figures/logo32.png
@@ -98,7 +93,6 @@ share/help/el/iagno/develop.page
share/help/el/iagno/documentation.page
share/help/el/iagno/figures/block.png
share/help/el/iagno/figures/first.png
-share/help/el/iagno/figures/iagno-gameover.png
share/help/el/iagno/figures/iagno-video.ogv
share/help/el/iagno/figures/logo.png
share/help/el/iagno/figures/logo32.png
@@ -120,7 +114,6 @@ share/help/en_GB/iagno/develop.page
share/help/en_GB/iagno/documentation.page
share/help/en_GB/iagno/figures/block.png
share/help/en_GB/iagno/figures/first.png
-share/help/en_GB/iagno/figures/iagno-gameover.png
share/help/en_GB/iagno/figures/iagno-video.ogv
share/help/en_GB/iagno/figures/logo.png
share/help/en_GB/iagno/figures/logo32.png
@@ -142,7 +135,6 @@ share/help/es/iagno/develop.page
share/help/es/iagno/documentation.page
share/help/es/iagno/figures/block.png
share/help/es/iagno/figures/first.png
-share/help/es/iagno/figures/iagno-gameover.png
share/help/es/iagno/figures/iagno-video.ogv
share/help/es/iagno/figures/logo.png
share/help/es/iagno/figures/logo32.png
@@ -164,7 +156,6 @@ share/help/eu/iagno/develop.page
share/help/eu/iagno/documentation.page
share/help/eu/iagno/figures/block.png
share/help/eu/iagno/figures/first.png
-share/help/eu/iagno/figures/iagno-gameover.png
share/help/eu/iagno/figures/iagno-video.ogv
share/help/eu/iagno/figures/logo.png
share/help/eu/iagno/figures/logo32.png
@@ -186,7 +177,6 @@ share/help/fr/iagno/develop.page
share/help/fr/iagno/documentation.page
share/help/fr/iagno/figures/block.png
share/help/fr/iagno/figures/first.png
-share/help/fr/iagno/figures/iagno-gameover.png
share/help/fr/iagno/figures/iagno-video.ogv
share/help/fr/iagno/figures/logo.png
share/help/fr/iagno/figures/logo32.png
@@ -208,7 +198,6 @@ share/help/gl/iagno/develop.page
share/help/gl/iagno/documentation.page
share/help/gl/iagno/figures/block.png
share/help/gl/iagno/figures/first.png
-share/help/gl/iagno/figures/iagno-gameover.png
share/help/gl/iagno/figures/iagno-video.ogv
share/help/gl/iagno/figures/logo.png
share/help/gl/iagno/figures/logo32.png
@@ -230,7 +219,6 @@ share/help/hu/iagno/develop.page
share/help/hu/iagno/documentation.page
share/help/hu/iagno/figures/block.png
share/help/hu/iagno/figures/first.png
-share/help/hu/iagno/figures/iagno-gameover.png
share/help/hu/iagno/figures/iagno-video.ogv
share/help/hu/iagno/figures/logo.png
share/help/hu/iagno/figures/logo32.png
@@ -252,7 +240,6 @@ share/help/it/iagno/develop.page
share/help/it/iagno/documentation.page
share/help/it/iagno/figures/block.png
share/help/it/iagno/figures/first.png
-share/help/it/iagno/figures/iagno-gameover.png
share/help/it/iagno/figures/iagno-video.ogv
share/help/it/iagno/figures/logo.png
share/help/it/iagno/figures/logo32.png
@@ -274,7 +261,6 @@ share/help/oc/iagno/develop.page
share/help/oc/iagno/documentation.page
share/help/oc/iagno/figures/block.png
share/help/oc/iagno/figures/first.png
-share/help/oc/iagno/figures/iagno-gameover.png
share/help/oc/iagno/figures/iagno-video.ogv
share/help/oc/iagno/figures/logo.png
share/help/oc/iagno/figures/logo32.png
@@ -288,6 +274,27 @@ share/help/oc/iagno/shortcuts.page
share/help/oc/iagno/sound.page
share/help/oc/iagno/strategy.page
share/help/oc/iagno/translate.page
+share/help/pl/iagno/2player.page
+share/help/pl/iagno/ai-game.page
+share/help/pl/iagno/bug-filing.page
+share/help/pl/iagno/change-color.page
+share/help/pl/iagno/develop.page
+share/help/pl/iagno/documentation.page
+share/help/pl/iagno/figures/block.png
+share/help/pl/iagno/figures/first.png
+share/help/pl/iagno/figures/iagno-video.ogv
+share/help/pl/iagno/figures/logo.png
+share/help/pl/iagno/figures/logo32.png
+share/help/pl/iagno/figures/start.png
+share/help/pl/iagno/index.page
+share/help/pl/iagno/legal.xml
+share/help/pl/iagno/license.page
+share/help/pl/iagno/play.page
+share/help/pl/iagno/rules.page
+share/help/pl/iagno/shortcuts.page
+share/help/pl/iagno/sound.page
+share/help/pl/iagno/strategy.page
+share/help/pl/iagno/translate.page
share/help/pt_BR/iagno/2player.page
share/help/pt_BR/iagno/ai-game.page
share/help/pt_BR/iagno/bug-filing.page
@@ -296,7 +303,6 @@ share/help/pt_BR/iagno/develop.page
share/help/pt_BR/iagno/documentation.page
share/help/pt_BR/iagno/figures/block.png
share/help/pt_BR/iagno/figures/first.png
-share/help/pt_BR/iagno/figures/iagno-gameover.png
share/help/pt_BR/iagno/figures/iagno-video.ogv
share/help/pt_BR/iagno/figures/logo.png
share/help/pt_BR/iagno/figures/logo32.png
@@ -318,7 +324,6 @@ share/help/sl/iagno/develop.page
share/help/sl/iagno/documentation.page
share/help/sl/iagno/figures/block.png
share/help/sl/iagno/figures/first.png
-share/help/sl/iagno/figures/iagno-gameover.png
share/help/sl/iagno/figures/iagno-video.ogv
share/help/sl/iagno/figures/logo.png
share/help/sl/iagno/figures/logo32.png
@@ -340,7 +345,6 @@ share/help/sr/iagno/develop.page
share/help/sr/iagno/documentation.page
share/help/sr/iagno/figures/block.png
share/help/sr/iagno/figures/first.png
-share/help/sr/iagno/figures/iagno-gameover.png
share/help/sr/iagno/figures/iagno-video.ogv
share/help/sr/iagno/figures/logo.png
share/help/sr/iagno/figures/logo32.png
@@ -362,7 +366,6 @@ share/help/sr@latin/iagno/develop.page
share/help/sr@latin/iagno/documentation.page
share/help/sr@latin/iagno/figures/block.png
share/help/sr@latin/iagno/figures/first.png
-share/help/sr@latin/iagno/figures/iagno-gameover.png
share/help/sr@latin/iagno/figures/iagno-video.ogv
share/help/sr@latin/iagno/figures/logo.png
share/help/sr@latin/iagno/figures/logo32.png
@@ -384,7 +387,6 @@ share/help/sv/iagno/develop.page
share/help/sv/iagno/documentation.page
share/help/sv/iagno/figures/block.png
share/help/sv/iagno/figures/first.png
-share/help/sv/iagno/figures/iagno-gameover.png
share/help/sv/iagno/figures/iagno-video.ogv
share/help/sv/iagno/figures/logo.png
share/help/sv/iagno/figures/logo32.png
@@ -406,7 +408,6 @@ share/help/zh_CN/iagno/develop.page
share/help/zh_CN/iagno/documentation.page
share/help/zh_CN/iagno/figures/block.png
share/help/zh_CN/iagno/figures/first.png
-share/help/zh_CN/iagno/figures/iagno-gameover.png
share/help/zh_CN/iagno/figures/iagno-video.ogv
share/help/zh_CN/iagno/figures/logo.png
share/help/zh_CN/iagno/figures/logo32.png
@@ -425,10 +426,10 @@ share/help/zh_CN/iagno/translate.page
%%DATADIR%%/themes/key/adwaita.theme
%%DATADIR%%/themes/key/classic.theme
%%DATADIR%%/themes/key/high_contrast.theme
+%%DATADIR%%/themes/key/sun_and_star.theme
%%DATADIR%%/themes/svg/black_and_white.svg
%%DATADIR%%/themes/svg/high_contrast.svg
%%DATADIR%%/themes/svg/sun_and_star.svg
-%%DATADIR%%/themes/key/sun_and_star.theme
share/icons/hicolor/16x16/apps/iagno.png
share/icons/hicolor/22x22/apps/iagno.png
share/icons/hicolor/24x24/apps/iagno.png
@@ -527,3 +528,4 @@ share/locale/xh/LC_MESSAGES/iagno.mo
share/locale/zh_CN/LC_MESSAGES/iagno.mo
share/locale/zh_HK/LC_MESSAGES/iagno.mo
share/locale/zh_TW/LC_MESSAGES/iagno.mo
+share/metainfo/iagno.appdata.xml
diff --git a/games/libgnome-games-support/Makefile b/games/libgnome-games-support/Makefile
index 34a5b3222339..cf3b4961a53a 100644
--- a/games/libgnome-games-support/Makefile
+++ b/games/libgnome-games-support/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
PORTNAME= libgnome-games-support
-PORTVERSION= 1.2.2
+PORTVERSION= 1.4.1
CATEGORIES= games gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Small library intended for internal use by GNOME Games
diff --git a/games/libgnome-games-support/distinfo b/games/libgnome-games-support/distinfo
index fb2297d75873..114ffd882fec 100644
--- a/games/libgnome-games-support/distinfo
+++ b/games/libgnome-games-support/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497849645
-SHA256 (gnome3/libgnome-games-support-1.2.2.tar.xz) = 4fefcf500ccd629b39925cb56903a0c8208cbc8d9236bca08d3a00561f7b0b13
-SIZE (gnome3/libgnome-games-support-1.2.2.tar.xz) = 341928
+TIMESTAMP = 1525547933
+SHA256 (gnome/libgnome-games-support-1.4.1.tar.xz) = 61430205046e0df843bafca9ab341d3678c1939d7c047b2fb28f26c12c73f4c8
+SIZE (gnome/libgnome-games-support-1.4.1.tar.xz) = 335548
diff --git a/games/libgnome-games-support/pkg-plist b/games/libgnome-games-support/pkg-plist
index 82a61a2a9c73..c4d09457b019 100644
--- a/games/libgnome-games-support/pkg-plist
+++ b/games/libgnome-games-support/pkg-plist
@@ -1,11 +1,13 @@
include/gnome-games-support-1/libgnome-games-support.h
lib/libgnome-games-support-1.so
-lib/libgnome-games-support-1.so.2
-lib/libgnome-games-support-1.so.2.0.4
+lib/libgnome-games-support-1.so.3
+lib/libgnome-games-support-1.so.3.0.0
libdata/pkgconfig/libgnome-games-support-1.pc
+share/locale/ar/LC_MESSAGES/libgnome-games-support.mo
share/locale/be/LC_MESSAGES/libgnome-games-support.mo
share/locale/bg/LC_MESSAGES/libgnome-games-support.mo
share/locale/ca/LC_MESSAGES/libgnome-games-support.mo
+share/locale/ca@valencia/LC_MESSAGES/libgnome-games-support.mo
share/locale/cs/LC_MESSAGES/libgnome-games-support.mo
share/locale/da/LC_MESSAGES/libgnome-games-support.mo
share/locale/de/LC_MESSAGES/libgnome-games-support.mo
@@ -27,7 +29,10 @@ share/locale/it/LC_MESSAGES/libgnome-games-support.mo
share/locale/ko/LC_MESSAGES/libgnome-games-support.mo
share/locale/lt/LC_MESSAGES/libgnome-games-support.mo
share/locale/lv/LC_MESSAGES/libgnome-games-support.mo
+share/locale/ml/LC_MESSAGES/libgnome-games-support.mo
share/locale/nb/LC_MESSAGES/libgnome-games-support.mo
+share/locale/ne/LC_MESSAGES/libgnome-games-support.mo
+share/locale/nl/LC_MESSAGES/libgnome-games-support.mo
share/locale/oc/LC_MESSAGES/libgnome-games-support.mo
share/locale/pl/LC_MESSAGES/libgnome-games-support.mo
share/locale/pt/LC_MESSAGES/libgnome-games-support.mo
diff --git a/games/lightsoff/Makefile b/games/lightsoff/Makefile
index 3ea1f52b880c..0d5a5bfd5552 100644
--- a/games/lightsoff/Makefile
+++ b/games/lightsoff/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= lightsoff
-PORTVERSION= 3.24.0
-PORTREVISION= 1
+PORTVERSION= 3.28.0
CATEGORIES= games gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome ligthsoff
diff --git a/games/lightsoff/distinfo b/games/lightsoff/distinfo
index 6fd683e741bc..debf4bc4540f 100644
--- a/games/lightsoff/distinfo
+++ b/games/lightsoff/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494627266
-SHA256 (gnome3/lightsoff-3.24.0.tar.xz) = 5d1bb7de4b3f5c7814e5599a5171cfdeef74e774a8a6dbd992c893a5af6bd8ce
-SIZE (gnome3/lightsoff-3.24.0.tar.xz) = 1943672
+TIMESTAMP = 1526108098
+SHA256 (gnome/lightsoff-3.28.0.tar.xz) = 6f9caccc7b3dad27bf21c6218329db02f86d96922e7b96cea50f5e65fe4c9067
+SIZE (gnome/lightsoff-3.28.0.tar.xz) = 863120
diff --git a/games/lightsoff/pkg-plist b/games/lightsoff/pkg-plist
index c002bf90ea89..4a85b1066637 100644
--- a/games/lightsoff/pkg-plist
+++ b/games/lightsoff/pkg-plist
@@ -1,5 +1,4 @@
bin/lightsoff
-share/appdata/lightsoff.appdata.xml
share/applications/lightsoff.desktop
share/help/C/lightsoff/basic.page
share/help/C/lightsoff/bug-filing.page
@@ -155,6 +154,20 @@ share/help/ko/lightsoff/license.page
share/help/ko/lightsoff/rules.page
share/help/ko/lightsoff/strategy.page
share/help/ko/lightsoff/translate.page
+share/help/pl/lightsoff/basic.page
+share/help/pl/lightsoff/bug-filing.page
+share/help/pl/lightsoff/develop.page
+share/help/pl/lightsoff/documentation.page
+share/help/pl/lightsoff/figures/lightsoff.jpg
+share/help/pl/lightsoff/figures/lightsoff.ogv
+share/help/pl/lightsoff/figures/lightsoff_logo.jpg
+share/help/pl/lightsoff/figures/lo1.jpg
+share/help/pl/lightsoff/index.page
+share/help/pl/lightsoff/legal.xml
+share/help/pl/lightsoff/license.page
+share/help/pl/lightsoff/rules.page
+share/help/pl/lightsoff/strategy.page
+share/help/pl/lightsoff/translate.page
share/help/pt_BR/lightsoff/basic.page
share/help/pt_BR/lightsoff/bug-filing.page
share/help/pt_BR/lightsoff/develop.page
@@ -334,3 +347,4 @@ share/locale/xh/LC_MESSAGES/lightsoff.mo
share/locale/zh_CN/LC_MESSAGES/lightsoff.mo
share/locale/zh_HK/LC_MESSAGES/lightsoff.mo
share/locale/zh_TW/LC_MESSAGES/lightsoff.mo
+share/metainfo/lightsoff.appdata.xml
diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index 34c9ce578a3b..e8088608dba2 100644
--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@@ -13,6 +13,8 @@ COMMENT= GTK+ based MUD client
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
+BROKEN= Does not build with recent devel/glib20
+
LIB_DEPENDS= libcurl.so:ftp/curl \
libpcre.so:devel/pcre \
libpng.so:graphics/png \
diff --git a/games/swell-foop/Makefile b/games/swell-foop/Makefile
index d80cb734612f..b0ffa641f897 100644
--- a/games/swell-foop/Makefile
+++ b/games/swell-foop/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= swell-foop
-PORTVERSION= 3.24.0
-PORTREVISION= 1
+PORTVERSION= 3.28.0
CATEGORIES= games gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome swell-foop
@@ -16,20 +15,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= vala:lang/vala \
itstool:textproc/itstool
-LIB_DEPENDS= libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
- libclutter-1.0.so:graphics/clutter \
- libcogl.so:graphics/cogl \
- libjson-glib-1.0.so:devel/json-glib
+LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
+ libclutter-gtk-1.0.so:graphics/clutter-gtk3
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome localbase pathfix \
- pkgconfig tar:xz
-USE_GNOME= cairo gtk30 intlhack libxml2:build
-USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
+USES= gettext gnome localbase meson \
+ pkgconfig python:3.6+,build tar:xz
+USE_GNOME= gtk30
INSTALLS_ICONS= yes
-USE_GL= egl gl
-GNU_CONFIGURE= yes
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.swell-foop.gschema.xml
diff --git a/games/swell-foop/distinfo b/games/swell-foop/distinfo
index 0efa48501743..e9687fba57da 100644
--- a/games/swell-foop/distinfo
+++ b/games/swell-foop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494627632
-SHA256 (gnome3/swell-foop-3.24.0.tar.xz) = 1b2d444e4d399e300afe07a243423c8b3ab1ca32828c749e0be9af48a5904a11
-SIZE (gnome3/swell-foop-3.24.0.tar.xz) = 2313656
+TIMESTAMP = 1526108194
+SHA256 (gnome/swell-foop-3.28.0.tar.xz) = c44c07a3d817118f72917e9b57db9b0856a9a0c69362ed40b8bb9ef8b47955fa
+SIZE (gnome/swell-foop-3.28.0.tar.xz) = 1302920
diff --git a/games/swell-foop/pkg-plist b/games/swell-foop/pkg-plist
index db06f4c6d274..3c465628a87e 100644
--- a/games/swell-foop/pkg-plist
+++ b/games/swell-foop/pkg-plist
@@ -1,5 +1,4 @@
bin/swell-foop
-share/appdata/swell-foop.appdata.xml
share/applications/swell-foop.desktop
share/help/C/swell-foop/figures/play1.png
share/help/C/swell-foop/figures/play2.png
@@ -85,6 +84,13 @@ share/help/oc/swell-foop/figures/play4.png
share/help/oc/swell-foop/figures/start-up.png
share/help/oc/swell-foop/index.docbook
share/help/oc/swell-foop/legal.xml
+share/help/pl/swell-foop/figures/play1.png
+share/help/pl/swell-foop/figures/play2.png
+share/help/pl/swell-foop/figures/play3.png
+share/help/pl/swell-foop/figures/play4.png
+share/help/pl/swell-foop/figures/start-up.png
+share/help/pl/swell-foop/index.docbook
+share/help/pl/swell-foop/legal.xml
share/help/pt_BR/swell-foop/figures/play1.png
share/help/pt_BR/swell-foop/figures/play2.png
share/help/pt_BR/swell-foop/figures/play3.png
@@ -232,6 +238,7 @@ share/locale/xh/LC_MESSAGES/swell-foop.mo
share/locale/zh_CN/LC_MESSAGES/swell-foop.mo
share/locale/zh_HK/LC_MESSAGES/swell-foop.mo
share/locale/zh_TW/LC_MESSAGES/swell-foop.mo
+share/metainfo/swell-foop.appdata.xml
%%DATADIR%%/preferences.ui
%%DATADIR%%/swell-foop.css
%%DATADIR%%/themes/colors/bkg.svg
diff --git a/graphics/Makefile b/graphics/Makefile
index 575217955d4f..064d29460857 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -83,7 +83,6 @@
SUBDIR += cadubi
SUBDIR += caffe
SUBDIR += cairo
- SUBDIR += cairo-reference
SUBDIR += cairomm
SUBDIR += cal3d
SUBDIR += camera
diff --git a/graphics/cairo-reference/Makefile b/graphics/cairo-reference/Makefile
deleted file mode 100644
index 3a2f9b536b8b..000000000000
--- a/graphics/cairo-reference/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 0
-
-REFERENCE_SRC= ${WRKSRC}/doc/public
-
-.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/graphics/cairo-reference/pkg-descr b/graphics/cairo-reference/pkg-descr
deleted file mode 100644
index 097f223e1859..000000000000
--- a/graphics/cairo-reference/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port contains the programming reference for graphics/cairo.
-
-WWW: https://www.cairographics.org/
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 786c7b0f5733..8c7cbc5e0872 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= cairo
-PORTVERSION= 1.14.8
-PORTREVISION= 3
+PORTVERSION= 1.15.12
PORTEPOCH= 2
CATEGORIES= graphics
-MASTER_SITES= http://cairographics.org/releases/
+#MASTER_SITES= http://cairographics.org/releases/
+MASTER_SITES= http://cairographics.org/snapshots/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Vector graphics library with cross-device output support
@@ -16,10 +16,6 @@ LICENSE_COMB= dual
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING-LGPL-2.1
LICENSE_FILE_MPL11= ${WRKSRC}/COPYING-MPL-1.1
-USES= tar:xz
-
-.if !defined(REFERENCE_PORT)
-
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libpng.so:graphics/png \
libfontconfig.so:x11-fonts/fontconfig
@@ -30,10 +26,9 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
--disable-directfb \
--enable-tee
-USES+= cpe gnome libtool pathfix pkgconfig
+USES= cpe gnome libtool pathfix pkgconfig tar:xz
CPE_VENDOR= cairographics
USE_XORG= pixman
-USE_GNOME= referencehack
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
@@ -44,30 +39,35 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
--disable-wgl \
--enable-tee
-OPTIONS_DEFINE= OPENGL XCB GLIB X11
+OPTIONS_DEFINE= OPENGL XCB GLIB X11 DOCS
OPTIONS_DEFAULT=OPENGL XCB GLIB X11
OPTIONS_SLAVE= ${ARCH:tu}
-XCB_DESC= Enable XCB (X C-language Binding) Support
-GLIB_DESC= Enable GObject Functions Feature
OPTIONS_SUB= yes
+
X11_USE= xorg=x11,xext,xrender
X11_CONFIGURE_ENABLE=xlib
+
OPENGL_USE= gl=gl,egl xorg=xorgproto:both
OPENGL_CONFIGURE_ENABLE=gl egl
OPENGL_IMPLIES= X11
+
+GLIB_DESC= Enable GObject Functions Feature
GLIB_USES= gettext-runtime
GLIB_USE= gnome=glib20
GLIB_CONFIGURE_ENABLE= gobject
+
+XCB_DESC= Enable XCB (X C-language Binding) Support
XCB_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil
XCB_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil
XCB_USE= xorg=xcb
XCB_CONFIGURE_ENABLE= xcb
+
# this has another option --enable-xlib-xcb=auto but it is buggy.
MIPS_BUILD_DEPENDS= ${LOCALBASE}/include/atomic_ops.h:devel/libatomic_ops
MIPS_USES= localbase
MIPS_CONFIGURE_ENV= cairo_cv_atomic_primitives="libatomic-ops"
-PLIST_SUB+= LIBVER=2.11400.8
+PLIST_SUB+= LIBVER=2.11512.0
post-patch:
@${REINPLACE_CMD} -e '/strings/s/ - / -a /' \
@@ -83,6 +83,8 @@ post-patch:
${WRKSRC}/util/*/Makefile.in \
${WRKSRC}/boilerplate/Makefile.in
-.include <bsd.port.mk>
+post-patch-DOCS-off:
+ @${REINPLACE_CMD} -e 's|public||g' \
+ ${WRKSRC}/doc/Makefile.in
-.endif
+.include <bsd.port.mk>
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 47b297bab1d3..0d9a029fe440 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488198143
-SHA256 (cairo-1.14.8.tar.xz) = d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20
-SIZE (cairo-1.14.8.tar.xz) = 35392464
+TIMESTAMP = 1526801051
+SHA256 (cairo-1.15.12.tar.xz) = 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9
+SIZE (cairo-1.15.12.tar.xz) = 41883440
diff --git a/graphics/cairo/files/patch-src_cairo-ft-font.c b/graphics/cairo/files/patch-src_cairo-ft-font.c
new file mode 100644
index 000000000000..95a02188f384
--- /dev/null
+++ b/graphics/cairo/files/patch-src_cairo-ft-font.c
@@ -0,0 +1,51 @@
+From 7554822dd0b52d33ec7898e81b59e97164b00142 Mon Sep 17 00:00:00 2001
+From: Uli Schlachter <psychon@znc.in>
+Date: Sat, 21 Apr 2018 09:37:06 +0200
+Subject: [PATCH] Fix assertion failure in the freetype backend
+
+Fonts are kept in a hash table, so when creating a new font, the code
+first checks the hash table for an already-existing entry and only then
+is a new instance really created. There is an assert that checks that
+the key used for the hash table lookup is the same as the instance that
+is created later has, because otherwise the hash table was checked
+incorrectly.
+
+This assert failed in some conditions.
+
+Fix this by fixing some places that initialised ft hash keys in a wrong
+way.
+
+Patch by Behdad Esfahbod and submitted via bugzilla.
+
+Source: https://bugs.freedesktop.org/show_bug.cgi?id=105746#c4
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=105746
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+ src/cairo-ft-font.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
+index 79aef78f5b0d..9b10708988d7 100644
+--- src/cairo-ft-font.c
++++ src/cairo-ft-font.c
+@@ -445,7 +445,7 @@ _cairo_ft_unscaled_font_init (cairo_ft_unscaled_font_t *unscaled,
+
+ if (from_face) {
+ unscaled->from_face = TRUE;
+- _cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, face->face_index, face);
++ _cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, id, face);
+
+
+ unscaled->have_color = FT_HAS_COLOR (face) != 0;
+@@ -640,7 +640,7 @@ static cairo_status_t
+ _cairo_ft_unscaled_font_create_from_face (FT_Face face,
+ cairo_ft_unscaled_font_t **out)
+ {
+- return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, 0, face, out);
++ return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, face->face_index, face, out);
+ }
+
+ static cairo_bool_t
+--
+2.17.0
+
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index 9967b4da831d..f79cbf2e2d2d 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -18,16 +18,10 @@ include/cairo/cairo-version.h
include/cairo/cairo.h
lib/cairo/cairo-fdr.a
lib/cairo/cairo-fdr.so
-lib/cairo/cairo-fdr.so.0
-lib/cairo/cairo-fdr.so.0.0.0
%%GLIB%%lib/cairo/cairo-sphinx.a
%%GLIB%%lib/cairo/cairo-sphinx.so
-%%GLIB%%lib/cairo/cairo-sphinx.so.0
-%%GLIB%%lib/cairo/cairo-sphinx.so.0.0.0
lib/cairo/libcairo-trace.a
lib/cairo/libcairo-trace.so
-lib/cairo/libcairo-trace.so.0
-lib/cairo/libcairo-trace.so.0.0.0
%%GLIB%%lib/libcairo-gobject.a
%%GLIB%%lib/libcairo-gobject.so
%%GLIB%%lib/libcairo-gobject.so.2
@@ -40,7 +34,6 @@ lib/libcairo.a
lib/libcairo.so
lib/libcairo.so.2
lib/libcairo.so.%%LIBVER%%
-libdata/pkgconfig/cairo.pc
%%OPENGL%%libdata/pkgconfig/cairo-egl.pc
libdata/pkgconfig/cairo-fc.pc
libdata/pkgconfig/cairo-ft.pc
@@ -53,8 +46,73 @@ libdata/pkgconfig/cairo-ps.pc
libdata/pkgconfig/cairo-script.pc
libdata/pkgconfig/cairo-svg.pc
libdata/pkgconfig/cairo-tee.pc
-%%XCB%%libdata/pkgconfig/cairo-xcb.pc
%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
-%%X11%%libdata/pkgconfig/cairo-xlib.pc
-@comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
+%%XCB%%libdata/pkgconfig/cairo-xcb.pc
%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
+%%X11%%libdata/pkgconfig/cairo-xlib.pc
+libdata/pkgconfig/cairo.pc
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-errors.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-memory.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-overloading.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-path.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-patterns.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-return-values.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-streams.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/bindings-surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Error-handling.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-FreeType-Fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Image-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-PDF-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-PNG-Support.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Paths.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-PostScript-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Quartz-(CGFont)-Fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Quartz-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Raster-Sources.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Recording-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Regions.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-SVG-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Script-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Tags-and-Links.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Transformations.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Types.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-User-Fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Version-Information.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Win32-Fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-Win32-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XCB-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XLib-Surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-XLib-XRender-Backend.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-device-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-font-face-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-font-options-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-matrix-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-pattern-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-scaled-font-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-surface-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-cairo-t.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-drawing.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-support.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-surfaces.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo-text.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/cairo.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/cairo/home.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.10.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.12.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.14.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.2.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.4.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.6.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-1.8.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index-all.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/index.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/language-bindings.html
+%%PORTDOCS%%%%DOCSDIR%%/cairo/left-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/left.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/right-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/right.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/style.css
+%%PORTDOCS%%%%DOCSDIR%%/cairo/up-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/cairo/up.png
diff --git a/graphics/clutter-gtk3/Makefile b/graphics/clutter-gtk3/Makefile
index be877a6ff5a5..b4968daa680b 100644
--- a/graphics/clutter-gtk3/Makefile
+++ b/graphics/clutter-gtk3/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= clutter-gtk
-PORTVERSION= 1.8.2
+PORTVERSION= 1.8.4
CATEGORIES= graphics
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
@@ -10,19 +10,17 @@ PKGNAMESUFFIX= 3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GTK+ Integration library for Clutter
-LICENSE= LGPL20+
+LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcogl.so:graphics/cogl \
libclutter-1.0.so:graphics/clutter \
libjson-glib-1.0.so:devel/json-glib
-USES= gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
-GNU_CONFIGURE= yes
+USES= gettext gnome localbase meson pkgconfig tar:xz
USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
USE_GL= egl
USE_LDCONFIG= yes
-INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/graphics/clutter-gtk3/distinfo b/graphics/clutter-gtk3/distinfo
index 28dc7fbb5110..3517d274290b 100644
--- a/graphics/clutter-gtk3/distinfo
+++ b/graphics/clutter-gtk3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496858585
-SHA256 (clutter-gtk-1.8.2.tar.xz) = da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94
-SIZE (clutter-gtk-1.8.2.tar.xz) = 326964
+TIMESTAMP = 1515940365
+SHA256 (clutter-gtk-1.8.4.tar.xz) = 521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06
+SIZE (clutter-gtk-1.8.4.tar.xz) = 331508
diff --git a/graphics/clutter-gtk3/files/patch-Makefile.in b/graphics/clutter-gtk3/files/patch-Makefile.in
deleted file mode 100644
index dbf879223e62..000000000000
--- a/graphics/clutter-gtk3/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2011-01-15 14:30:57.000000000 +0000
-+++ Makefile.in 2011-01-15 14:31:19.000000000 +0000
-@@ -313,7 +313,7 @@
- QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
- QUIET_RM_0 = @echo ' RM '$@;
- ACLOCAL_AMFLAGS = -I build/autotools
--SUBDIRS = build clutter-gtk doc examples po
-+SUBDIRS = build clutter-gtk examples po
- pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = clutter-gtk-1.0.pc
- EXTRA_DIST = clutter-gtk.pc.in
diff --git a/graphics/clutter-gtk3/pkg-plist b/graphics/clutter-gtk3/pkg-plist
index c21bf50156e9..fee8f2da8d5a 100644
--- a/graphics/clutter-gtk3/pkg-plist
+++ b/graphics/clutter-gtk3/pkg-plist
@@ -8,7 +8,7 @@ include/clutter-gtk-1.0/clutter-gtk/gtk-clutter-window.h
lib/girepository-1.0/GtkClutter-1.0.typelib
lib/libclutter-gtk-1.0.so
lib/libclutter-gtk-1.0.so.0
-lib/libclutter-gtk-1.0.so.0.800.2
+lib/libclutter-gtk-1.0.so.0.800.4
libdata/pkgconfig/clutter-gtk-1.0.pc
share/gir-1.0/GtkClutter-1.0.gir
share/locale/ja/LC_MESSAGES/cluttergtk-1.0.mo
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index bf694ca0ac55..d063633c7173 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= colord
-PORTVERSION= 1.2.12
+PORTVERSION= 1.3.5
CATEGORIES= graphics
MASTER_SITES= http://www.freedesktop.org/software/colord/releases/
diff --git a/graphics/colord/distinfo b/graphics/colord/distinfo
index 498d724faca7..a00ab243af91 100644
--- a/graphics/colord/distinfo
+++ b/graphics/colord/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479744381
-SHA256 (colord-1.2.12.tar.xz) = d5241864c16a37f9e40d38d5009255456495a67f170ce0dc9250774442d68c3a
-SIZE (colord-1.2.12.tar.xz) = 1214992
+TIMESTAMP = 1516460331
+SHA256 (colord-1.3.5.tar.xz) = 2daa8ffd2a532d7094927cd1a4af595b8310cea66f7707edcf6ab743460feed2
+SIZE (colord-1.3.5.tar.xz) = 1263488
diff --git a/graphics/colord/files/patch-Makefile.in b/graphics/colord/files/patch-Makefile.in
index 00cad60faaf5..4366397e093f 100644
--- a/graphics/colord/files/patch-Makefile.in
+++ b/graphics/colord/files/patch-Makefile.in
@@ -1,10 +1,10 @@
---- Makefile.in.orig 2016-11-21 22:27:07 UTC
-+++ Makefile.in
-@@ -92,7 +92,6 @@ host_triplet = @host@
- @HAVE_UNIX_TRUE@am__append_1 = \
- @HAVE_UNIX_TRUE@ man \
- @HAVE_UNIX_TRUE@ policy \
--@HAVE_UNIX_TRUE@ rules \
- @HAVE_UNIX_TRUE@ src
+--- Makefile.in.orig 2016-12-26 19:58:23.811313000 +0100
++++ Makefile.in 2016-12-26 19:58:44.434394000 +0100
+@@ -92,7 +92,6 @@
+ @HAVE_DAEMON_TRUE@am__append_1 = \
+ @HAVE_DAEMON_TRUE@ man \
+ @HAVE_DAEMON_TRUE@ policy \
+-@HAVE_DAEMON_TRUE@ rules \
+ @HAVE_DAEMON_TRUE@ src
subdir = .
diff --git a/graphics/colord/pkg-plist b/graphics/colord/pkg-plist
index 93b35caedc75..d6171a232cb6 100644
--- a/graphics/colord/pkg-plist
+++ b/graphics/colord/pkg-plist
@@ -42,13 +42,14 @@ lib/girepository-1.0/Colord-1.0.typelib
lib/libcolord.a
lib/libcolord.so
lib/libcolord.so.2
-lib/libcolord.so.2.0.4
+lib/libcolord.so.2.0.5
lib/libcolordcompat.a
lib/libcolordcompat.so
lib/libcolordprivate.a
lib/libcolordprivate.so
lib/libcolordprivate.so.2
-lib/libcolordprivate.so.2.0.4
+lib/libcolordprivate.so.2.0.5
+@comment lib/systemd/user/colord-session.service
libdata/pkgconfig/colord.pc
libexec/colord
libexec/colord-session
@@ -77,10 +78,10 @@ share/color/icc/colord/EktaSpacePS5.icc
%%PPROFILES%%share/color/icc/colord/FOGRA40L_SC_paper.icc
%%PPROFILES%%share/color/icc/colord/FOGRA45L_lwc.icc
%%PPROFILES%%share/color/icc/colord/FOGRA47L_uncoated.icc
+%%PPROFILES%%share/color/icc/colord/GRACoL_TR006_coated.icc
share/color/icc/colord/Gamma5000K.icc
share/color/icc/colord/Gamma5500K.icc
share/color/icc/colord/Gamma6500K.icc
-%%PPROFILES%%share/color/icc/colord/GRACoL_TR006_coated.icc
%%PPROFILES%%share/color/icc/colord/IFRA26S_2004_newsprint.icc
share/color/icc/colord/NTSC-RGB.icc
share/color/icc/colord/PAL-RGB.icc
@@ -88,8 +89,8 @@ share/color/icc/colord/ProPhotoRGB.icc
share/color/icc/colord/SMPTE-C-RGB.icc
%%PPROFILES%%share/color/icc/colord/SNAP_TR002_newsprint.icc
%%PPROFILES%%share/color/icc/colord/SWOP_TR003_coated_3.icc
-share/color/icc/colord/SwappedRedAndGreen.icc
%%PPROFILES%%share/color/icc/colord/SWOP_TR005_coated_5.icc
+share/color/icc/colord/SwappedRedAndGreen.icc
share/color/icc/colord/WideGamutRGB.icc
share/color/icc/colord/sRGB.icc
share/color/icc/colord/x11-colors.icc
@@ -168,24 +169,24 @@ share/locale/he/LC_MESSAGES/colord.mo
share/locale/hi/LC_MESSAGES/colord.mo
share/locale/hu/LC_MESSAGES/colord.mo
share/locale/id/LC_MESSAGES/colord.mo
+share/locale/is/LC_MESSAGES/colord.mo
share/locale/it/LC_MESSAGES/colord.mo
-share/locale/it_IT/LC_MESSAGES/colord.mo
share/locale/ja/LC_MESSAGES/colord.mo
share/locale/kk/LC_MESSAGES/colord.mo
share/locale/kn/LC_MESSAGES/colord.mo
share/locale/ko/LC_MESSAGES/colord.mo
+share/locale/lt/LC_MESSAGES/colord.mo
share/locale/lv/LC_MESSAGES/colord.mo
share/locale/ml/LC_MESSAGES/colord.mo
share/locale/mr/LC_MESSAGES/colord.mo
share/locale/nb/LC_MESSAGES/colord.mo
-share/locale/nb_NO/LC_MESSAGES/colord.mo
share/locale/nl/LC_MESSAGES/colord.mo
+share/locale/oc/LC_MESSAGES/colord.mo
share/locale/or/LC_MESSAGES/colord.mo
share/locale/pa/LC_MESSAGES/colord.mo
share/locale/pl/LC_MESSAGES/colord.mo
share/locale/pt/LC_MESSAGES/colord.mo
share/locale/pt_BR/LC_MESSAGES/colord.mo
-share/locale/pt_PT/LC_MESSAGES/colord.mo
share/locale/ro/LC_MESSAGES/colord.mo
share/locale/ru/LC_MESSAGES/colord.mo
share/locale/sk/LC_MESSAGES/colord.mo
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index b38fe0fb9fc1..28029001ffe2 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= eog-plugins
-PORTVERSION= 3.16.6
+PORTVERSION= 3.26.2
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -18,12 +18,17 @@ LIB_DEPENDS= libgdata.so:devel/libgdata \
libjson-glib-1.0.so:devel/json-glib \
libsoup-2.4.so:devel/libsoup \
libexif.so:graphics/libexif \
- libpeas-1.0.so:devel/libpeas
+ libpeas-1.0.so:devel/libpeas \
+ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+ libclutter-1.0.so:graphics/clutter \
+ libcogl.so:graphics/cogl \
+ libjson-glib-1.0.so:devel/json-glib \
+ libsoup-2.4.so:devel/libsoup
RUN_DEPENDS= eog:graphics/eog
PORTSCOUT= limitw:1,even
-USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection libxml2
+USE_GNOME= cairo gdkpixbuf2 gtk30 introspection libxml2
USES= gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
diff --git a/graphics/eog-plugins/distinfo b/graphics/eog-plugins/distinfo
index 840a59d384fd..9e5ea12e67f6 100644
--- a/graphics/eog-plugins/distinfo
+++ b/graphics/eog-plugins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496239084
-SHA256 (gnome3/eog-plugins-3.16.6.tar.xz) = 51ca356a29bbedfc48ce3fd1de1efe9339af38020c301df79dae6b67cd34ed96
-SIZE (gnome3/eog-plugins-3.16.6.tar.xz) = 398836
+TIMESTAMP = 1523036732
+SHA256 (gnome3/eog-plugins-3.26.2.tar.xz) = 1ecd0551b2d3a3e5b8ad942bac5349f85bbe76c336861996a79c6ec7e7e11ff1
+SIZE (gnome3/eog-plugins-3.26.2.tar.xz) = 469072
diff --git a/graphics/eog-plugins/pkg-plist b/graphics/eog-plugins/pkg-plist
index 8eef1d9e3355..5a7d7ce4457a 100644
--- a/graphics/eog-plugins/pkg-plist
+++ b/graphics/eog-plugins/pkg-plist
@@ -1,15 +1,17 @@
+%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYTHON_SUFFIX%%.pyc
lib/eog/plugins/exif-display.plugin
%%PYTHON%%lib/eog/plugins/export-to-folder.plugin
%%PYTHON%%lib/eog/plugins/export-to-folder.py
-%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/eog/plugins/fit-to-width.plugin
%%PYTHON%%lib/eog/plugins/fullscreenbg.plugin
%%PYTHON%%lib/eog/plugins/fullscreenbg.py
-%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
lib/eog/plugins/hide-titlebar.plugin
lib/eog/plugins/libexif-display.so
lib/eog/plugins/libfit-to-width.so
@@ -25,26 +27,24 @@ lib/eog/plugins/light-theme.plugin
lib/eog/plugins/postasa.plugin
%%PYTHON%%lib/eog/plugins/pythonconsole.plugin
%%PYTHON%%lib/eog/plugins/pythonconsole/__init__.py
-%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON%%lib/eog/plugins/pythonconsole/config.py
%%PYTHON%%lib/eog/plugins/pythonconsole/console.py
lib/eog/plugins/send-by-mail.plugin
%%PYTHON%%lib/eog/plugins/slideshowshuffle.plugin
%%PYTHON%%lib/eog/plugins/slideshowshuffle.py
-%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
share/appdata/eog-exif-display.metainfo.xml
%%PYTHON%%share/appdata/eog-export-to-folder.metainfo.xml
share/appdata/eog-fit-to-width.metainfo.xml
%%PYTHON%%share/appdata/eog-fullscreenbg.metainfo.xml
share/appdata/eog-hide-titlebar.metainfo.xml
share/appdata/eog-light-theme.metainfo.xml
-%%PYTHON%%share/appdata/eog-map.metainfo.xml
+%%CHAMPLAIN%%share/appdata/eog-map.metainfo.xml
%%PYTHON%%share/appdata/eog-maximize-windows.metainfo.xml
share/appdata/eog-postasa.metainfo.xml
%%PYTHON%%share/appdata/eog-pythonconsole.metainfo.xml
@@ -70,6 +70,7 @@ share/locale/es/LC_MESSAGES/eog-plugins.mo
share/locale/eu/LC_MESSAGES/eog-plugins.mo
share/locale/fi/LC_MESSAGES/eog-plugins.mo
share/locale/fr/LC_MESSAGES/eog-plugins.mo
+share/locale/fur/LC_MESSAGES/eog-plugins.mo
share/locale/gl/LC_MESSAGES/eog-plugins.mo
share/locale/gu/LC_MESSAGES/eog-plugins.mo
share/locale/he/LC_MESSAGES/eog-plugins.mo
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index b8b98e33855a..f4b84ce377db 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= eog
-PORTVERSION= 3.24.1
+PORTVERSION= 3.28.2
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -21,13 +21,12 @@ RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake gnome jpeg libtool localbase \
- pathfix pkgconfig tar:xz
-USE_GNOME= cairo intltool librsvg2 gtk30 gnomedesktop3 introspection
+USES= desktop-file-utils gettext gnome jpeg localbase \
+ meson pkgconfig python:build,3.4+ shebangfix tar:xz
+USE_GNOME= cairo librsvg2 gtk30 gnomedesktop3 introspection
USE_XORG= x11
INSTALLS_ICONS= yes
-GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
+SHEBANG_FILES= ${WRKSRC}/meson_post_install.py
GLIB_SCHEMAS= org.gnome.eog.enums.xml \
org.gnome.eog.gschema.xml
@@ -39,11 +38,11 @@ OPTIONS_DEFINE= EXIF EXEMPI
OPTIONS_DEFAULT=EXIF EXEMPI
EXIF_DESC= Digital camera file meta-data support
-EXIF_CONFIGURE_WITH= libexif
+EXIF_MESON_TRUE= libexif
EXIF_LIB_DEPENDS= libexif.so:graphics/libexif
EXEMPI_DESC= XMP support
-EXEMPI_CONFIGURE_WITH= xmp
+EXEMPI_MESON_TRUE= xmp
EXEMPI_LIB_DEPENDS= libexempi.so:textproc/exempi
.include <bsd.port.options.mk>
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index c285a6b1be7e..cff4065de75d 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496238448
-SHA256 (gnome3/eog-3.24.1.tar.xz) = f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7
-SIZE (gnome3/eog-3.24.1.tar.xz) = 4632496
+TIMESTAMP = 1525958536
+SHA256 (gnome3/eog-3.28.2.tar.xz) = c046e7e184e5bb3ccb44eadc75cd9278ce682cc849c016036e3fe313b1cb5abd
+SIZE (gnome3/eog-3.28.2.tar.xz) = 5172840
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 4255d3d25db9..1ff6ae50642c 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -32,7 +32,6 @@ lib/eog/plugins/reload.plugin
%%EXIF%%lib/eog/plugins/statusbar-date.plugin
libdata/pkgconfig/eog.pc
share/GConf/gsettings/eog.convert
-share/appdata/eog.appdata.xml
share/applications/eog.desktop
%%DATADIR%%/gir-1.0/Eog-%%VERSION%%.gir
%%DATADIR%%/icons/hicolor/16x16/actions/eog-plugin.png
@@ -46,55 +45,6 @@ share/applications/eog.desktop
%%DATADIR%%/icons/hicolor/scalable/actions/eog-image-gallery-symbolic.svg
%%DATADIR%%/icons/hicolor/scalable/actions/eog-plugin.svg
%%DATADIR%%/icons/hicolor/scalable/actions/slideshow-play.svg
-share/gtk-doc/html/eog/EogClipboardHandler.html
-share/gtk-doc/html/eog/EogFileChooser.html
-share/gtk-doc/html/eog/EogImageSaveInfo.html
-share/gtk-doc/html/eog/EogScrollView.html
-share/gtk-doc/html/eog/EogSidebar.html
-share/gtk-doc/html/eog/EogStatusbar.html
-share/gtk-doc/html/eog/EogWindowActivatable.html
-share/gtk-doc/html/eog/annotation-glossary.html
-share/gtk-doc/html/eog/api-index.html
-share/gtk-doc/html/eog/ch01.html
-share/gtk-doc/html/eog/ch02.html
-share/gtk-doc/html/eog/ch03.html
-share/gtk-doc/html/eog/ch04.html
-share/gtk-doc/html/eog/ch05.html
-share/gtk-doc/html/eog/ch06.html
-share/gtk-doc/html/eog/eog-EogJobScheduler.html
-share/gtk-doc/html/eog/eog-eog-application.html
-share/gtk-doc/html/eog/eog-eog-config-keys.html
-share/gtk-doc/html/eog/eog-eog-debug.html
-share/gtk-doc/html/eog/eog-eog-error-message-area.html
-share/gtk-doc/html/eog/eog-eog-exif-util.html
-share/gtk-doc/html/eog/eog-eog-image.html
-share/gtk-doc/html/eog/eog-eog-jobs.html
-share/gtk-doc/html/eog/eog-eog-list-store.html
-share/gtk-doc/html/eog/eog-eog-pixbuf-util.html
-share/gtk-doc/html/eog/eog-eog-print.html
-share/gtk-doc/html/eog/eog-eog-properties-dialog.html
-share/gtk-doc/html/eog/eog-eog-save-as-dialog-helper.html
-share/gtk-doc/html/eog/eog-eog-session.html
-share/gtk-doc/html/eog/eog-eog-thumb-nav.html
-share/gtk-doc/html/eog/eog-eog-thumb-view.html
-share/gtk-doc/html/eog/eog-eog-thumbnail.html
-share/gtk-doc/html/eog/eog-eog-transform.html
-share/gtk-doc/html/eog/eog-eog-uri-converter.html
-share/gtk-doc/html/eog/eog-eog-util.html
-share/gtk-doc/html/eog/eog-eog-window.html
-share/gtk-doc/html/eog/eog-zoom.html
-share/gtk-doc/html/eog/eog.devhelp2
-share/gtk-doc/html/eog/home.png
-share/gtk-doc/html/eog/index.html
-share/gtk-doc/html/eog/left-insensitive.png
-share/gtk-doc/html/eog/left.png
-share/gtk-doc/html/eog/pt01.html
-share/gtk-doc/html/eog/right-insensitive.png
-share/gtk-doc/html/eog/right.png
-share/gtk-doc/html/eog/rn01.html
-share/gtk-doc/html/eog/style.css
-share/gtk-doc/html/eog/up-insensitive.png
-share/gtk-doc/html/eog/up.png
share/help/C/eog/bug-filing.page
share/help/C/eog/commandline.page
share/help/C/eog/copy-paste.page
@@ -104,7 +54,6 @@ share/help/C/eog/develop.page
share/help/C/eog/documentation.page
share/help/C/eog/edit.page
share/help/C/eog/figures/eog-logo.png
-share/help/C/eog/figures/eog-toolbar-editor.png
share/help/C/eog/figures/eog-trail.png
share/help/C/eog/figures/image-view-prefs.png
share/help/C/eog/figures/multiple-convert.png
@@ -138,7 +87,6 @@ share/help/C/eog/print.page
share/help/C/eog/rename-multiple.page
share/help/C/eog/shortcuts.page
share/help/C/eog/slideshow.page
-share/help/C/eog/toolbar.page
share/help/C/eog/translate.page
share/help/C/eog/view.page
share/help/C/eog/zoom.page
@@ -151,7 +99,6 @@ share/help/ar/eog/develop.page
share/help/ar/eog/documentation.page
share/help/ar/eog/edit.page
share/help/ar/eog/figures/eog-logo.png
-share/help/ar/eog/figures/eog-toolbar-editor.png
share/help/ar/eog/figures/eog-trail.png
share/help/ar/eog/figures/image-view-prefs.png
share/help/ar/eog/figures/multiple-convert.png
@@ -185,7 +132,6 @@ share/help/ar/eog/print.page
share/help/ar/eog/rename-multiple.page
share/help/ar/eog/shortcuts.page
share/help/ar/eog/slideshow.page
-share/help/ar/eog/toolbar.page
share/help/ar/eog/translate.page
share/help/ar/eog/view.page
share/help/ar/eog/zoom.page
@@ -198,7 +144,6 @@ share/help/ca/eog/develop.page
share/help/ca/eog/documentation.page
share/help/ca/eog/edit.page
share/help/ca/eog/figures/eog-logo.png
-share/help/ca/eog/figures/eog-toolbar-editor.png
share/help/ca/eog/figures/eog-trail.png
share/help/ca/eog/figures/image-view-prefs.png
share/help/ca/eog/figures/multiple-convert.png
@@ -232,7 +177,6 @@ share/help/ca/eog/print.page
share/help/ca/eog/rename-multiple.page
share/help/ca/eog/shortcuts.page
share/help/ca/eog/slideshow.page
-share/help/ca/eog/toolbar.page
share/help/ca/eog/translate.page
share/help/ca/eog/view.page
share/help/ca/eog/zoom.page
@@ -245,7 +189,6 @@ share/help/cs/eog/develop.page
share/help/cs/eog/documentation.page
share/help/cs/eog/edit.page
share/help/cs/eog/figures/eog-logo.png
-share/help/cs/eog/figures/eog-toolbar-editor.png
share/help/cs/eog/figures/eog-trail.png
share/help/cs/eog/figures/image-view-prefs.png
share/help/cs/eog/figures/multiple-convert.png
@@ -279,7 +222,6 @@ share/help/cs/eog/print.page
share/help/cs/eog/rename-multiple.page
share/help/cs/eog/shortcuts.page
share/help/cs/eog/slideshow.page
-share/help/cs/eog/toolbar.page
share/help/cs/eog/translate.page
share/help/cs/eog/view.page
share/help/cs/eog/zoom.page
@@ -292,7 +234,6 @@ share/help/da/eog/develop.page
share/help/da/eog/documentation.page
share/help/da/eog/edit.page
share/help/da/eog/figures/eog-logo.png
-share/help/da/eog/figures/eog-toolbar-editor.png
share/help/da/eog/figures/eog-trail.png
share/help/da/eog/figures/image-view-prefs.png
share/help/da/eog/figures/multiple-convert.png
@@ -326,7 +267,6 @@ share/help/da/eog/print.page
share/help/da/eog/rename-multiple.page
share/help/da/eog/shortcuts.page
share/help/da/eog/slideshow.page
-share/help/da/eog/toolbar.page
share/help/da/eog/translate.page
share/help/da/eog/view.page
share/help/da/eog/zoom.page
@@ -339,7 +279,6 @@ share/help/de/eog/develop.page
share/help/de/eog/documentation.page
share/help/de/eog/edit.page
share/help/de/eog/figures/eog-logo.png
-share/help/de/eog/figures/eog-toolbar-editor.png
share/help/de/eog/figures/eog-trail.png
share/help/de/eog/figures/image-view-prefs.png
share/help/de/eog/figures/multiple-convert.png
@@ -373,7 +312,6 @@ share/help/de/eog/print.page
share/help/de/eog/rename-multiple.page
share/help/de/eog/shortcuts.page
share/help/de/eog/slideshow.page
-share/help/de/eog/toolbar.page
share/help/de/eog/translate.page
share/help/de/eog/view.page
share/help/de/eog/zoom.page
@@ -386,7 +324,6 @@ share/help/el/eog/develop.page
share/help/el/eog/documentation.page
share/help/el/eog/edit.page
share/help/el/eog/figures/eog-logo.png
-share/help/el/eog/figures/eog-toolbar-editor.png
share/help/el/eog/figures/eog-trail.png
share/help/el/eog/figures/image-view-prefs.png
share/help/el/eog/figures/multiple-convert.png
@@ -420,7 +357,6 @@ share/help/el/eog/print.page
share/help/el/eog/rename-multiple.page
share/help/el/eog/shortcuts.page
share/help/el/eog/slideshow.page
-share/help/el/eog/toolbar.page
share/help/el/eog/translate.page
share/help/el/eog/view.page
share/help/el/eog/zoom.page
@@ -433,7 +369,6 @@ share/help/en_GB/eog/develop.page
share/help/en_GB/eog/documentation.page
share/help/en_GB/eog/edit.page
share/help/en_GB/eog/figures/eog-logo.png
-share/help/en_GB/eog/figures/eog-toolbar-editor.png
share/help/en_GB/eog/figures/eog-trail.png
share/help/en_GB/eog/figures/image-view-prefs.png
share/help/en_GB/eog/figures/multiple-convert.png
@@ -467,7 +402,6 @@ share/help/en_GB/eog/print.page
share/help/en_GB/eog/rename-multiple.page
share/help/en_GB/eog/shortcuts.page
share/help/en_GB/eog/slideshow.page
-share/help/en_GB/eog/toolbar.page
share/help/en_GB/eog/translate.page
share/help/en_GB/eog/view.page
share/help/en_GB/eog/zoom.page
@@ -480,7 +414,6 @@ share/help/es/eog/develop.page
share/help/es/eog/documentation.page
share/help/es/eog/edit.page
share/help/es/eog/figures/eog-logo.png
-share/help/es/eog/figures/eog-toolbar-editor.png
share/help/es/eog/figures/eog-trail.png
share/help/es/eog/figures/image-view-prefs.png
share/help/es/eog/figures/multiple-convert.png
@@ -514,7 +447,6 @@ share/help/es/eog/print.page
share/help/es/eog/rename-multiple.page
share/help/es/eog/shortcuts.page
share/help/es/eog/slideshow.page
-share/help/es/eog/toolbar.page
share/help/es/eog/translate.page
share/help/es/eog/view.page
share/help/es/eog/zoom.page
@@ -527,7 +459,6 @@ share/help/eu/eog/develop.page
share/help/eu/eog/documentation.page
share/help/eu/eog/edit.page
share/help/eu/eog/figures/eog-logo.png
-share/help/eu/eog/figures/eog-toolbar-editor.png
share/help/eu/eog/figures/eog-trail.png
share/help/eu/eog/figures/image-view-prefs.png
share/help/eu/eog/figures/multiple-convert.png
@@ -561,7 +492,6 @@ share/help/eu/eog/print.page
share/help/eu/eog/rename-multiple.page
share/help/eu/eog/shortcuts.page
share/help/eu/eog/slideshow.page
-share/help/eu/eog/toolbar.page
share/help/eu/eog/translate.page
share/help/eu/eog/view.page
share/help/eu/eog/zoom.page
@@ -574,7 +504,6 @@ share/help/fi/eog/develop.page
share/help/fi/eog/documentation.page
share/help/fi/eog/edit.page
share/help/fi/eog/figures/eog-logo.png
-share/help/fi/eog/figures/eog-toolbar-editor.png
share/help/fi/eog/figures/eog-trail.png
share/help/fi/eog/figures/image-view-prefs.png
share/help/fi/eog/figures/multiple-convert.png
@@ -608,7 +537,6 @@ share/help/fi/eog/print.page
share/help/fi/eog/rename-multiple.page
share/help/fi/eog/shortcuts.page
share/help/fi/eog/slideshow.page
-share/help/fi/eog/toolbar.page
share/help/fi/eog/translate.page
share/help/fi/eog/view.page
share/help/fi/eog/zoom.page
@@ -621,7 +549,6 @@ share/help/fr/eog/develop.page
share/help/fr/eog/documentation.page
share/help/fr/eog/edit.page
share/help/fr/eog/figures/eog-logo.png
-share/help/fr/eog/figures/eog-toolbar-editor.png
share/help/fr/eog/figures/eog-trail.png
share/help/fr/eog/figures/image-view-prefs.png
share/help/fr/eog/figures/multiple-convert.png
@@ -655,7 +582,6 @@ share/help/fr/eog/print.page
share/help/fr/eog/rename-multiple.page
share/help/fr/eog/shortcuts.page
share/help/fr/eog/slideshow.page
-share/help/fr/eog/toolbar.page
share/help/fr/eog/translate.page
share/help/fr/eog/view.page
share/help/fr/eog/zoom.page
@@ -668,7 +594,6 @@ share/help/gl/eog/develop.page
share/help/gl/eog/documentation.page
share/help/gl/eog/edit.page
share/help/gl/eog/figures/eog-logo.png
-share/help/gl/eog/figures/eog-toolbar-editor.png
share/help/gl/eog/figures/eog-trail.png
share/help/gl/eog/figures/image-view-prefs.png
share/help/gl/eog/figures/multiple-convert.png
@@ -702,7 +627,6 @@ share/help/gl/eog/print.page
share/help/gl/eog/rename-multiple.page
share/help/gl/eog/shortcuts.page
share/help/gl/eog/slideshow.page
-share/help/gl/eog/toolbar.page
share/help/gl/eog/translate.page
share/help/gl/eog/view.page
share/help/gl/eog/zoom.page
@@ -715,7 +639,6 @@ share/help/hu/eog/develop.page
share/help/hu/eog/documentation.page
share/help/hu/eog/edit.page
share/help/hu/eog/figures/eog-logo.png
-share/help/hu/eog/figures/eog-toolbar-editor.png
share/help/hu/eog/figures/eog-trail.png
share/help/hu/eog/figures/image-view-prefs.png
share/help/hu/eog/figures/multiple-convert.png
@@ -749,7 +672,6 @@ share/help/hu/eog/print.page
share/help/hu/eog/rename-multiple.page
share/help/hu/eog/shortcuts.page
share/help/hu/eog/slideshow.page
-share/help/hu/eog/toolbar.page
share/help/hu/eog/translate.page
share/help/hu/eog/view.page
share/help/hu/eog/zoom.page
@@ -762,7 +684,6 @@ share/help/it/eog/develop.page
share/help/it/eog/documentation.page
share/help/it/eog/edit.page
share/help/it/eog/figures/eog-logo.png
-share/help/it/eog/figures/eog-toolbar-editor.png
share/help/it/eog/figures/eog-trail.png
share/help/it/eog/figures/image-view-prefs.png
share/help/it/eog/figures/multiple-convert.png
@@ -796,7 +717,6 @@ share/help/it/eog/print.page
share/help/it/eog/rename-multiple.page
share/help/it/eog/shortcuts.page
share/help/it/eog/slideshow.page
-share/help/it/eog/toolbar.page
share/help/it/eog/translate.page
share/help/it/eog/view.page
share/help/it/eog/zoom.page
@@ -809,7 +729,6 @@ share/help/ja/eog/develop.page
share/help/ja/eog/documentation.page
share/help/ja/eog/edit.page
share/help/ja/eog/figures/eog-logo.png
-share/help/ja/eog/figures/eog-toolbar-editor.png
share/help/ja/eog/figures/eog-trail.png
share/help/ja/eog/figures/image-view-prefs.png
share/help/ja/eog/figures/multiple-convert.png
@@ -843,7 +762,6 @@ share/help/ja/eog/print.page
share/help/ja/eog/rename-multiple.page
share/help/ja/eog/shortcuts.page
share/help/ja/eog/slideshow.page
-share/help/ja/eog/toolbar.page
share/help/ja/eog/translate.page
share/help/ja/eog/view.page
share/help/ja/eog/zoom.page
@@ -856,7 +774,6 @@ share/help/ko/eog/develop.page
share/help/ko/eog/documentation.page
share/help/ko/eog/edit.page
share/help/ko/eog/figures/eog-logo.png
-share/help/ko/eog/figures/eog-toolbar-editor.png
share/help/ko/eog/figures/eog-trail.png
share/help/ko/eog/figures/image-view-prefs.png
share/help/ko/eog/figures/multiple-convert.png
@@ -890,7 +807,6 @@ share/help/ko/eog/print.page
share/help/ko/eog/rename-multiple.page
share/help/ko/eog/shortcuts.page
share/help/ko/eog/slideshow.page
-share/help/ko/eog/toolbar.page
share/help/ko/eog/translate.page
share/help/ko/eog/view.page
share/help/ko/eog/zoom.page
@@ -903,7 +819,6 @@ share/help/lv/eog/develop.page
share/help/lv/eog/documentation.page
share/help/lv/eog/edit.page
share/help/lv/eog/figures/eog-logo.png
-share/help/lv/eog/figures/eog-toolbar-editor.png
share/help/lv/eog/figures/eog-trail.png
share/help/lv/eog/figures/image-view-prefs.png
share/help/lv/eog/figures/multiple-convert.png
@@ -937,7 +852,6 @@ share/help/lv/eog/print.page
share/help/lv/eog/rename-multiple.page
share/help/lv/eog/shortcuts.page
share/help/lv/eog/slideshow.page
-share/help/lv/eog/toolbar.page
share/help/lv/eog/translate.page
share/help/lv/eog/view.page
share/help/lv/eog/zoom.page
@@ -950,7 +864,6 @@ share/help/oc/eog/develop.page
share/help/oc/eog/documentation.page
share/help/oc/eog/edit.page
share/help/oc/eog/figures/eog-logo.png
-share/help/oc/eog/figures/eog-toolbar-editor.png
share/help/oc/eog/figures/eog-trail.png
share/help/oc/eog/figures/image-view-prefs.png
share/help/oc/eog/figures/multiple-convert.png
@@ -984,7 +897,6 @@ share/help/oc/eog/print.page
share/help/oc/eog/rename-multiple.page
share/help/oc/eog/shortcuts.page
share/help/oc/eog/slideshow.page
-share/help/oc/eog/toolbar.page
share/help/oc/eog/translate.page
share/help/oc/eog/view.page
share/help/oc/eog/zoom.page
@@ -997,7 +909,6 @@ share/help/pa/eog/develop.page
share/help/pa/eog/documentation.page
share/help/pa/eog/edit.page
share/help/pa/eog/figures/eog-logo.png
-share/help/pa/eog/figures/eog-toolbar-editor.png
share/help/pa/eog/figures/eog-trail.png
share/help/pa/eog/figures/image-view-prefs.png
share/help/pa/eog/figures/multiple-convert.png
@@ -1031,10 +942,54 @@ share/help/pa/eog/print.page
share/help/pa/eog/rename-multiple.page
share/help/pa/eog/shortcuts.page
share/help/pa/eog/slideshow.page
-share/help/pa/eog/toolbar.page
share/help/pa/eog/translate.page
share/help/pa/eog/view.page
share/help/pa/eog/zoom.page
+share/help/pl/eog/bug-filing.page
+share/help/pl/eog/commandline.page
+share/help/pl/eog/copy-paste.page
+share/help/pl/eog/default.page
+share/help/pl/eog/desktop-background.page
+share/help/pl/eog/develop.page
+share/help/pl/eog/documentation.page
+share/help/pl/eog/edit.page
+share/help/pl/eog/figures/eog-logo.png
+share/help/pl/eog/figures/eog-trail.png
+share/help/pl/eog/figures/image-view-prefs.png
+share/help/pl/eog/figures/multiple-convert.png
+share/help/pl/eog/figures/multiple-rename-count.png
+share/help/pl/eog/figures/plugin-send-by-mail.png
+share/help/pl/eog/figures/plugins-all.png
+share/help/pl/eog/figures/prefs-plugins-date.png
+share/help/pl/eog/figures/prefs-plugins-fullscreen.png
+share/help/pl/eog/figures/prefs-plugins.png
+share/help/pl/eog/figures/slideshow-prefs.png
+share/help/pl/eog/flip-rotate.page
+share/help/pl/eog/format-change.page
+share/help/pl/eog/formats-save.page
+share/help/pl/eog/formats-view.page
+share/help/pl/eog/index.page
+share/help/pl/eog/introduction.page
+share/help/pl/eog/legal.xml
+share/help/pl/eog/license.page
+share/help/pl/eog/open.page
+share/help/pl/eog/plugin-exif-digital.page
+share/help/pl/eog/plugin-fullscreen-background.page
+share/help/pl/eog/plugin-fullscreen-double-click.page
+share/help/pl/eog/plugin-picasa.page
+share/help/pl/eog/plugin-python-console.page
+share/help/pl/eog/plugin-send-by-mail.page
+share/help/pl/eog/plugin-slideshow-shuffle.page
+share/help/pl/eog/plugin-zoom-width.page
+share/help/pl/eog/plugins.page
+share/help/pl/eog/preferences.page
+share/help/pl/eog/print.page
+share/help/pl/eog/rename-multiple.page
+share/help/pl/eog/shortcuts.page
+share/help/pl/eog/slideshow.page
+share/help/pl/eog/translate.page
+share/help/pl/eog/view.page
+share/help/pl/eog/zoom.page
share/help/pt_BR/eog/bug-filing.page
share/help/pt_BR/eog/commandline.page
share/help/pt_BR/eog/copy-paste.page
@@ -1044,7 +999,6 @@ share/help/pt_BR/eog/develop.page
share/help/pt_BR/eog/documentation.page
share/help/pt_BR/eog/edit.page
share/help/pt_BR/eog/figures/eog-logo.png
-share/help/pt_BR/eog/figures/eog-toolbar-editor.png
share/help/pt_BR/eog/figures/eog-trail.png
share/help/pt_BR/eog/figures/image-view-prefs.png
share/help/pt_BR/eog/figures/multiple-convert.png
@@ -1078,7 +1032,6 @@ share/help/pt_BR/eog/print.page
share/help/pt_BR/eog/rename-multiple.page
share/help/pt_BR/eog/shortcuts.page
share/help/pt_BR/eog/slideshow.page
-share/help/pt_BR/eog/toolbar.page
share/help/pt_BR/eog/translate.page
share/help/pt_BR/eog/view.page
share/help/pt_BR/eog/zoom.page
@@ -1091,7 +1044,6 @@ share/help/ro/eog/develop.page
share/help/ro/eog/documentation.page
share/help/ro/eog/edit.page
share/help/ro/eog/figures/eog-logo.png
-share/help/ro/eog/figures/eog-toolbar-editor.png
share/help/ro/eog/figures/eog-trail.png
share/help/ro/eog/figures/image-view-prefs.png
share/help/ro/eog/figures/multiple-convert.png
@@ -1125,7 +1077,6 @@ share/help/ro/eog/print.page
share/help/ro/eog/rename-multiple.page
share/help/ro/eog/shortcuts.page
share/help/ro/eog/slideshow.page
-share/help/ro/eog/toolbar.page
share/help/ro/eog/translate.page
share/help/ro/eog/view.page
share/help/ro/eog/zoom.page
@@ -1138,7 +1089,6 @@ share/help/ru/eog/develop.page
share/help/ru/eog/documentation.page
share/help/ru/eog/edit.page
share/help/ru/eog/figures/eog-logo.png
-share/help/ru/eog/figures/eog-toolbar-editor.png
share/help/ru/eog/figures/eog-trail.png
share/help/ru/eog/figures/image-view-prefs.png
share/help/ru/eog/figures/multiple-convert.png
@@ -1172,7 +1122,6 @@ share/help/ru/eog/print.page
share/help/ru/eog/rename-multiple.page
share/help/ru/eog/shortcuts.page
share/help/ru/eog/slideshow.page
-share/help/ru/eog/toolbar.page
share/help/ru/eog/translate.page
share/help/ru/eog/view.page
share/help/ru/eog/zoom.page
@@ -1185,7 +1134,6 @@ share/help/sl/eog/develop.page
share/help/sl/eog/documentation.page
share/help/sl/eog/edit.page
share/help/sl/eog/figures/eog-logo.png
-share/help/sl/eog/figures/eog-toolbar-editor.png
share/help/sl/eog/figures/eog-trail.png
share/help/sl/eog/figures/image-view-prefs.png
share/help/sl/eog/figures/multiple-convert.png
@@ -1219,7 +1167,6 @@ share/help/sl/eog/print.page
share/help/sl/eog/rename-multiple.page
share/help/sl/eog/shortcuts.page
share/help/sl/eog/slideshow.page
-share/help/sl/eog/toolbar.page
share/help/sl/eog/translate.page
share/help/sl/eog/view.page
share/help/sl/eog/zoom.page
@@ -1232,7 +1179,6 @@ share/help/sv/eog/develop.page
share/help/sv/eog/documentation.page
share/help/sv/eog/edit.page
share/help/sv/eog/figures/eog-logo.png
-share/help/sv/eog/figures/eog-toolbar-editor.png
share/help/sv/eog/figures/eog-trail.png
share/help/sv/eog/figures/image-view-prefs.png
share/help/sv/eog/figures/multiple-convert.png
@@ -1266,7 +1212,6 @@ share/help/sv/eog/print.page
share/help/sv/eog/rename-multiple.page
share/help/sv/eog/shortcuts.page
share/help/sv/eog/slideshow.page
-share/help/sv/eog/toolbar.page
share/help/sv/eog/translate.page
share/help/sv/eog/view.page
share/help/sv/eog/zoom.page
@@ -1279,7 +1224,6 @@ share/help/te/eog/develop.page
share/help/te/eog/documentation.page
share/help/te/eog/edit.page
share/help/te/eog/figures/eog-logo.png
-share/help/te/eog/figures/eog-toolbar-editor.png
share/help/te/eog/figures/eog-trail.png
share/help/te/eog/figures/image-view-prefs.png
share/help/te/eog/figures/multiple-convert.png
@@ -1313,7 +1257,6 @@ share/help/te/eog/print.page
share/help/te/eog/rename-multiple.page
share/help/te/eog/shortcuts.page
share/help/te/eog/slideshow.page
-share/help/te/eog/toolbar.page
share/help/te/eog/translate.page
share/help/te/eog/view.page
share/help/te/eog/zoom.page
@@ -1326,7 +1269,6 @@ share/help/th/eog/develop.page
share/help/th/eog/documentation.page
share/help/th/eog/edit.page
share/help/th/eog/figures/eog-logo.png
-share/help/th/eog/figures/eog-toolbar-editor.png
share/help/th/eog/figures/eog-trail.png
share/help/th/eog/figures/image-view-prefs.png
share/help/th/eog/figures/multiple-convert.png
@@ -1360,7 +1302,6 @@ share/help/th/eog/print.page
share/help/th/eog/rename-multiple.page
share/help/th/eog/shortcuts.page
share/help/th/eog/slideshow.page
-share/help/th/eog/toolbar.page
share/help/th/eog/translate.page
share/help/th/eog/view.page
share/help/th/eog/zoom.page
@@ -1373,7 +1314,6 @@ share/help/uk/eog/develop.page
share/help/uk/eog/documentation.page
share/help/uk/eog/edit.page
share/help/uk/eog/figures/eog-logo.png
-share/help/uk/eog/figures/eog-toolbar-editor.png
share/help/uk/eog/figures/eog-trail.png
share/help/uk/eog/figures/image-view-prefs.png
share/help/uk/eog/figures/multiple-convert.png
@@ -1407,7 +1347,6 @@ share/help/uk/eog/print.page
share/help/uk/eog/rename-multiple.page
share/help/uk/eog/shortcuts.page
share/help/uk/eog/slideshow.page
-share/help/uk/eog/toolbar.page
share/help/uk/eog/translate.page
share/help/uk/eog/view.page
share/help/uk/eog/zoom.page
@@ -1420,7 +1359,6 @@ share/help/zh_CN/eog/develop.page
share/help/zh_CN/eog/documentation.page
share/help/zh_CN/eog/edit.page
share/help/zh_CN/eog/figures/eog-logo.png
-share/help/zh_CN/eog/figures/eog-toolbar-editor.png
share/help/zh_CN/eog/figures/eog-trail.png
share/help/zh_CN/eog/figures/image-view-prefs.png
share/help/zh_CN/eog/figures/multiple-convert.png
@@ -1454,7 +1392,6 @@ share/help/zh_CN/eog/print.page
share/help/zh_CN/eog/rename-multiple.page
share/help/zh_CN/eog/shortcuts.page
share/help/zh_CN/eog/slideshow.page
-share/help/zh_CN/eog/toolbar.page
share/help/zh_CN/eog/translate.page
share/help/zh_CN/eog/view.page
share/help/zh_CN/eog/zoom.page
@@ -1467,7 +1404,6 @@ share/help/zh_TW/eog/develop.page
share/help/zh_TW/eog/documentation.page
share/help/zh_TW/eog/edit.page
share/help/zh_TW/eog/figures/eog-logo.png
-share/help/zh_TW/eog/figures/eog-toolbar-editor.png
share/help/zh_TW/eog/figures/eog-trail.png
share/help/zh_TW/eog/figures/image-view-prefs.png
share/help/zh_TW/eog/figures/multiple-convert.png
@@ -1501,7 +1437,6 @@ share/help/zh_TW/eog/print.page
share/help/zh_TW/eog/rename-multiple.page
share/help/zh_TW/eog/shortcuts.page
share/help/zh_TW/eog/slideshow.page
-share/help/zh_TW/eog/toolbar.page
share/help/zh_TW/eog/translate.page
share/help/zh_TW/eog/view.page
share/help/zh_TW/eog/zoom.page
@@ -1615,3 +1550,4 @@ share/locale/zh_CN/LC_MESSAGES/eog.mo
share/locale/zh_HK/LC_MESSAGES/eog.mo
share/locale/zh_TW/LC_MESSAGES/eog.mo
share/locale/zu/LC_MESSAGES/eog.mo
+share/metainfo/eog.appdata.xml
diff --git a/graphics/evince-lite/Makefile b/graphics/evince-lite/Makefile
index 9c0188dacb4f..b33477a94ab2 100644
--- a/graphics/evince-lite/Makefile
+++ b/graphics/evince-lite/Makefile
@@ -3,9 +3,9 @@
PKGNAMESUFFIX= -lite
-COMMENT= GNOME 3 multi-format document viewer without the GNOME dependancies
+COMMENT= GNOME 3 multi-format document viewer without the GNOME dependencies
-OPTIONS_EXCLUDE= NAUTILUS
+OPTIONS_EXCLUDE= NAUTILUS DBUS
MASTERDIR= ${.CURDIR}/../../graphics/evince
SLAVEPORT= lite
diff --git a/graphics/evince-lite/pkg-plist b/graphics/evince-lite/pkg-plist
index 0147f5b96744..211a06ce90a1 100644
--- a/graphics/evince-lite/pkg-plist
+++ b/graphics/evince-lite/pkg-plist
@@ -1,59 +1,3 @@
-%%COMICS%%lib/evince/4/backends/comicsdocument.evince-backend
-%%COMICS%%lib/evince/4/backends/libcomicsdocument.a
-%%COMICS%%lib/evince/4/backends/libcomicsdocument.so
-%%COMICS%%share/appdata/evince-comicsdocument.metainfo.xml
-%%DATADIR%%/hand-open.png
-%%DATADIR%%/icons/hicolor/16x16/actions/object-rotate-left.png
-%%DATADIR%%/icons/hicolor/16x16/actions/object-rotate-right.png
-%%DATADIR%%/icons/hicolor/16x16/actions/view-page-continuous.png
-%%DATADIR%%/icons/hicolor/16x16/actions/view-page-facing.png
-%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-height.png
-%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-width.png
-%%DATADIR%%/icons/hicolor/16x16/actions/zoom.png
-%%DATADIR%%/icons/hicolor/16x16/mimetypes/x-office-presentation.png
-%%DATADIR%%/icons/hicolor/22x22/actions/eye.png
-%%DATADIR%%/icons/hicolor/22x22/actions/object-rotate-left.png
-%%DATADIR%%/icons/hicolor/22x22/actions/object-rotate-right.png
-%%DATADIR%%/icons/hicolor/22x22/actions/view-page-continuous.png
-%%DATADIR%%/icons/hicolor/22x22/actions/view-page-facing.png
-%%DATADIR%%/icons/hicolor/22x22/actions/zoom-fit-page.png
-%%DATADIR%%/icons/hicolor/22x22/actions/zoom-fit-width.png
-%%DATADIR%%/icons/hicolor/22x22/actions/zoom.png
-%%DATADIR%%/icons/hicolor/22x22/mimetypes/x-office-presentation.png
-%%DATADIR%%/icons/hicolor/24x24/actions/object-rotate-left.png
-%%DATADIR%%/icons/hicolor/24x24/actions/object-rotate-right.png
-%%DATADIR%%/icons/hicolor/24x24/actions/stock_filters-invert.png
-%%DATADIR%%/icons/hicolor/24x24/actions/view-page-continuous.png
-%%DATADIR%%/icons/hicolor/24x24/actions/view-page-facing.png
-%%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-height.png
-%%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-width.png
-%%DATADIR%%/icons/hicolor/24x24/actions/zoom.png
-%%DATADIR%%/icons/hicolor/24x24/mimetypes/x-office-presentation.png
-%%DATADIR%%/icons/hicolor/32x32/actions/object-rotate-left.png
-%%DATADIR%%/icons/hicolor/32x32/actions/object-rotate-right.png
-%%DATADIR%%/icons/hicolor/32x32/actions/view-page-continuous.png
-%%DATADIR%%/icons/hicolor/32x32/actions/view-page-facing.png
-%%DATADIR%%/icons/hicolor/32x32/mimetypes/x-office-presentation.png
-%%DATADIR%%/icons/hicolor/48x48/actions/close.png
-%%DATADIR%%/icons/hicolor/48x48/actions/resize-se.png
-%%DATADIR%%/icons/hicolor/48x48/actions/resize-sw.png
-%%DATADIR%%/icons/hicolor/48x48/actions/view-page-continuous.png
-%%DATADIR%%/icons/hicolor/48x48/actions/view-page-facing.png
-%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-left.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-right.svg
-%%DATADIR%%/icons/hicolor/scalable/mimetypes/x-office-presentation.svg
-%%DJVU%%lib/evince/4/backends/djvudocument.evince-backend
-%%DJVU%%lib/evince/4/backends/libdjvudocument.a
-%%DJVU%%lib/evince/4/backends/libdjvudocument.so
-%%DJVU%%share/appdata/evince-djvudocument.metainfo.xml
-%%DVI%%lib/evince/4/backends/dvidocument.evince-backend
-%%DVI%%lib/evince/4/backends/libdvidocument.a
-%%DVI%%lib/evince/4/backends/libdvidocument.so
-%%DVI%%share/appdata/evince-dvidocument.metainfo.xml
-%%XPS%%lib/evince/4/backends/libxpsdocument.a
-%%XPS%%lib/evince/4/backends/libxpsdocument.so
-%%XPS%%lib/evince/4/backends/xpsdocument.evince-backend
-%%XPS%%share/appdata/evince-xpsdocument.metainfo.xml
bin/evince
include/evince/%%VERSION%%/evince-document.h
include/evince/%%VERSION%%/evince-view.h
@@ -104,37 +48,83 @@ include/evince/%%VERSION%%/libview/ev-stock-icons.h
include/evince/%%VERSION%%/libview/ev-view-presentation.h
include/evince/%%VERSION%%/libview/ev-view-type-builtins.h
include/evince/%%VERSION%%/libview/ev-view.h
+%%COMICS%%lib/evince/4/backends/comicsdocument.evince-backend
+%%DJVU%%lib/evince/4/backends/djvudocument.evince-backend
+%%DVI%%lib/evince/4/backends/dvidocument.evince-backend
+%%COMICS%%lib/evince/4/backends/libcomicsdocument.a
+%%COMICS%%lib/evince/4/backends/libcomicsdocument.so
+%%DJVU%%lib/evince/4/backends/libdjvudocument.a
+%%DJVU%%lib/evince/4/backends/libdjvudocument.so
+%%DVI%%lib/evince/4/backends/libdvidocument.a
+%%DVI%%lib/evince/4/backends/libdvidocument.so
lib/evince/4/backends/libpdfdocument.a
lib/evince/4/backends/libpdfdocument.so
lib/evince/4/backends/libpsdocument.a
lib/evince/4/backends/libpsdocument.so
lib/evince/4/backends/libtiffdocument.a
lib/evince/4/backends/libtiffdocument.so
+%%XPS%%lib/evince/4/backends/libxpsdocument.a
+%%XPS%%lib/evince/4/backends/libxpsdocument.so
lib/evince/4/backends/pdfdocument.evince-backend
lib/evince/4/backends/psdocument.evince-backend
lib/evince/4/backends/tiffdocument.evince-backend
+%%XPS%%lib/evince/4/backends/xpsdocument.evince-backend
lib/libevdocument3.a
lib/libevdocument3.so
lib/libevdocument3.so.4
lib/libevdocument3.so.4.0.0
lib/libevview3.a
lib/libevview3.so
-lib/libevview3.so.%%GTK3_VERSION%%
lib/libevview3.so.3
+lib/libevview3.so.3.0.0
lib/mozilla/plugins/libevbrowserplugin.a
lib/mozilla/plugins/libevbrowserplugin.so
libdata/pkgconfig/evince-document-%%VERSION%%.pc
libdata/pkgconfig/evince-view-%%VERSION%%.pc
-%%DBUS%%libexec/evinced
man/man1/evince.1.gz
share/GConf/gsettings/evince.convert
-share/appdata/evince-pdfdocument.metainfo.xml
-share/appdata/evince-psdocument.metainfo.xml
-share/appdata/evince-tiffdocument.metainfo.xml
-share/appdata/evince.appdata.xml
share/applications/evince-previewer.desktop
share/applications/evince.desktop
-%%DBUS%%share/dbus-1/services/org.gnome.evince.Daemon.service
+%%DATADIR%%/hand-open.png
+%%DATADIR%%/icons/hicolor/16x16/actions/object-rotate-left.png
+%%DATADIR%%/icons/hicolor/16x16/actions/object-rotate-right.png
+%%DATADIR%%/icons/hicolor/16x16/actions/view-page-continuous.png
+%%DATADIR%%/icons/hicolor/16x16/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-height.png
+%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-width.png
+%%DATADIR%%/icons/hicolor/16x16/actions/zoom.png
+%%DATADIR%%/icons/hicolor/16x16/mimetypes/x-office-presentation.png
+%%DATADIR%%/icons/hicolor/22x22/actions/eye.png
+%%DATADIR%%/icons/hicolor/22x22/actions/object-rotate-left.png
+%%DATADIR%%/icons/hicolor/22x22/actions/object-rotate-right.png
+%%DATADIR%%/icons/hicolor/22x22/actions/view-page-continuous.png
+%%DATADIR%%/icons/hicolor/22x22/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/22x22/actions/zoom-fit-page.png
+%%DATADIR%%/icons/hicolor/22x22/actions/zoom-fit-width.png
+%%DATADIR%%/icons/hicolor/22x22/actions/zoom.png
+%%DATADIR%%/icons/hicolor/22x22/mimetypes/x-office-presentation.png
+%%DATADIR%%/icons/hicolor/24x24/actions/object-rotate-left.png
+%%DATADIR%%/icons/hicolor/24x24/actions/object-rotate-right.png
+%%DATADIR%%/icons/hicolor/24x24/actions/stock_filters-invert.png
+%%DATADIR%%/icons/hicolor/24x24/actions/view-page-continuous.png
+%%DATADIR%%/icons/hicolor/24x24/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-height.png
+%%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-width.png
+%%DATADIR%%/icons/hicolor/24x24/actions/zoom.png
+%%DATADIR%%/icons/hicolor/24x24/mimetypes/x-office-presentation.png
+%%DATADIR%%/icons/hicolor/32x32/actions/object-rotate-left.png
+%%DATADIR%%/icons/hicolor/32x32/actions/object-rotate-right.png
+%%DATADIR%%/icons/hicolor/32x32/actions/view-page-continuous.png
+%%DATADIR%%/icons/hicolor/32x32/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/32x32/mimetypes/x-office-presentation.png
+%%DATADIR%%/icons/hicolor/48x48/actions/close.png
+%%DATADIR%%/icons/hicolor/48x48/actions/resize-se.png
+%%DATADIR%%/icons/hicolor/48x48/actions/resize-sw.png
+%%DATADIR%%/icons/hicolor/48x48/actions/view-page-continuous.png
+%%DATADIR%%/icons/hicolor/48x48/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-left.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/object-rotate-right.svg
+%%DATADIR%%/icons/hicolor/scalable/mimetypes/x-office-presentation.svg
share/gtk-doc/html/evince/EvFileMonitor.html
share/gtk-doc/html/evince/EvHistory.html
share/gtk-doc/html/evince/EvMessageArea.html
@@ -336,7 +326,7 @@ share/help/C/evince/synctex-search.page
share/help/C/evince/synctex-support.page
share/help/C/evince/synctex.page
share/help/C/evince/textselection.page
-share/help/C/evince/toolbar.page
+share/help/C/evince/titlebar.page
share/help/C/evince/translate.page
share/help/bg/evince/annotation-properties.page
share/help/bg/evince/annotations-delete.page
@@ -415,7 +405,7 @@ share/help/bg/evince/synctex-search.page
share/help/bg/evince/synctex-support.page
share/help/bg/evince/synctex.page
share/help/bg/evince/textselection.page
-share/help/bg/evince/toolbar.page
+share/help/bg/evince/titlebar.page
share/help/bg/evince/translate.page
share/help/ca/evince/annotation-properties.page
share/help/ca/evince/annotations-delete.page
@@ -494,7 +484,7 @@ share/help/ca/evince/synctex-search.page
share/help/ca/evince/synctex-support.page
share/help/ca/evince/synctex.page
share/help/ca/evince/textselection.page
-share/help/ca/evince/toolbar.page
+share/help/ca/evince/titlebar.page
share/help/ca/evince/translate.page
share/help/cs/evince/annotation-properties.page
share/help/cs/evince/annotations-delete.page
@@ -573,7 +563,7 @@ share/help/cs/evince/synctex-search.page
share/help/cs/evince/synctex-support.page
share/help/cs/evince/synctex.page
share/help/cs/evince/textselection.page
-share/help/cs/evince/toolbar.page
+share/help/cs/evince/titlebar.page
share/help/cs/evince/translate.page
share/help/da/evince/annotation-properties.page
share/help/da/evince/annotations-delete.page
@@ -652,7 +642,7 @@ share/help/da/evince/synctex-search.page
share/help/da/evince/synctex-support.page
share/help/da/evince/synctex.page
share/help/da/evince/textselection.page
-share/help/da/evince/toolbar.page
+share/help/da/evince/titlebar.page
share/help/da/evince/translate.page
share/help/de/evince/annotation-properties.page
share/help/de/evince/annotations-delete.page
@@ -731,7 +721,7 @@ share/help/de/evince/synctex-search.page
share/help/de/evince/synctex-support.page
share/help/de/evince/synctex.page
share/help/de/evince/textselection.page
-share/help/de/evince/toolbar.page
+share/help/de/evince/titlebar.page
share/help/de/evince/translate.page
share/help/el/evince/annotation-properties.page
share/help/el/evince/annotations-delete.page
@@ -810,7 +800,7 @@ share/help/el/evince/synctex-search.page
share/help/el/evince/synctex-support.page
share/help/el/evince/synctex.page
share/help/el/evince/textselection.page
-share/help/el/evince/toolbar.page
+share/help/el/evince/titlebar.page
share/help/el/evince/translate.page
share/help/en_GB/evince/annotation-properties.page
share/help/en_GB/evince/annotations-delete.page
@@ -889,7 +879,7 @@ share/help/en_GB/evince/synctex-search.page
share/help/en_GB/evince/synctex-support.page
share/help/en_GB/evince/synctex.page
share/help/en_GB/evince/textselection.page
-share/help/en_GB/evince/toolbar.page
+share/help/en_GB/evince/titlebar.page
share/help/en_GB/evince/translate.page
share/help/es/evince/annotation-properties.page
share/help/es/evince/annotations-delete.page
@@ -968,7 +958,7 @@ share/help/es/evince/synctex-search.page
share/help/es/evince/synctex-support.page
share/help/es/evince/synctex.page
share/help/es/evince/textselection.page
-share/help/es/evince/toolbar.page
+share/help/es/evince/titlebar.page
share/help/es/evince/translate.page
share/help/eu/evince/annotation-properties.page
share/help/eu/evince/annotations-delete.page
@@ -1047,7 +1037,7 @@ share/help/eu/evince/synctex-search.page
share/help/eu/evince/synctex-support.page
share/help/eu/evince/synctex.page
share/help/eu/evince/textselection.page
-share/help/eu/evince/toolbar.page
+share/help/eu/evince/titlebar.page
share/help/eu/evince/translate.page
share/help/fi/evince/annotation-properties.page
share/help/fi/evince/annotations-delete.page
@@ -1126,7 +1116,7 @@ share/help/fi/evince/synctex-search.page
share/help/fi/evince/synctex-support.page
share/help/fi/evince/synctex.page
share/help/fi/evince/textselection.page
-share/help/fi/evince/toolbar.page
+share/help/fi/evince/titlebar.page
share/help/fi/evince/translate.page
share/help/fr/evince/annotation-properties.page
share/help/fr/evince/annotations-delete.page
@@ -1205,7 +1195,7 @@ share/help/fr/evince/synctex-search.page
share/help/fr/evince/synctex-support.page
share/help/fr/evince/synctex.page
share/help/fr/evince/textselection.page
-share/help/fr/evince/toolbar.page
+share/help/fr/evince/titlebar.page
share/help/fr/evince/translate.page
share/help/gl/evince/annotation-properties.page
share/help/gl/evince/annotations-delete.page
@@ -1284,7 +1274,7 @@ share/help/gl/evince/synctex-search.page
share/help/gl/evince/synctex-support.page
share/help/gl/evince/synctex.page
share/help/gl/evince/textselection.page
-share/help/gl/evince/toolbar.page
+share/help/gl/evince/titlebar.page
share/help/gl/evince/translate.page
share/help/hu/evince/annotation-properties.page
share/help/hu/evince/annotations-delete.page
@@ -1363,7 +1353,7 @@ share/help/hu/evince/synctex-search.page
share/help/hu/evince/synctex-support.page
share/help/hu/evince/synctex.page
share/help/hu/evince/textselection.page
-share/help/hu/evince/toolbar.page
+share/help/hu/evince/titlebar.page
share/help/hu/evince/translate.page
share/help/id/evince/annotation-properties.page
share/help/id/evince/annotations-delete.page
@@ -1442,7 +1432,7 @@ share/help/id/evince/synctex-search.page
share/help/id/evince/synctex-support.page
share/help/id/evince/synctex.page
share/help/id/evince/textselection.page
-share/help/id/evince/toolbar.page
+share/help/id/evince/titlebar.page
share/help/id/evince/translate.page
share/help/it/evince/annotation-properties.page
share/help/it/evince/annotations-delete.page
@@ -1521,7 +1511,7 @@ share/help/it/evince/synctex-search.page
share/help/it/evince/synctex-support.page
share/help/it/evince/synctex.page
share/help/it/evince/textselection.page
-share/help/it/evince/toolbar.page
+share/help/it/evince/titlebar.page
share/help/it/evince/translate.page
share/help/ja/evince/annotation-properties.page
share/help/ja/evince/annotations-delete.page
@@ -1600,7 +1590,7 @@ share/help/ja/evince/synctex-search.page
share/help/ja/evince/synctex-support.page
share/help/ja/evince/synctex.page
share/help/ja/evince/textselection.page
-share/help/ja/evince/toolbar.page
+share/help/ja/evince/titlebar.page
share/help/ja/evince/translate.page
share/help/ko/evince/annotation-properties.page
share/help/ko/evince/annotations-delete.page
@@ -1679,7 +1669,7 @@ share/help/ko/evince/synctex-search.page
share/help/ko/evince/synctex-support.page
share/help/ko/evince/synctex.page
share/help/ko/evince/textselection.page
-share/help/ko/evince/toolbar.page
+share/help/ko/evince/titlebar.page
share/help/ko/evince/translate.page
share/help/lv/evince/annotation-properties.page
share/help/lv/evince/annotations-delete.page
@@ -1758,7 +1748,7 @@ share/help/lv/evince/synctex-search.page
share/help/lv/evince/synctex-support.page
share/help/lv/evince/synctex.page
share/help/lv/evince/textselection.page
-share/help/lv/evince/toolbar.page
+share/help/lv/evince/titlebar.page
share/help/lv/evince/translate.page
share/help/nl/evince/annotation-properties.page
share/help/nl/evince/annotations-delete.page
@@ -1837,7 +1827,7 @@ share/help/nl/evince/synctex-search.page
share/help/nl/evince/synctex-support.page
share/help/nl/evince/synctex.page
share/help/nl/evince/textselection.page
-share/help/nl/evince/toolbar.page
+share/help/nl/evince/titlebar.page
share/help/nl/evince/translate.page
share/help/oc/evince/annotation-properties.page
share/help/oc/evince/annotations-delete.page
@@ -1916,8 +1906,87 @@ share/help/oc/evince/synctex-search.page
share/help/oc/evince/synctex-support.page
share/help/oc/evince/synctex.page
share/help/oc/evince/textselection.page
-share/help/oc/evince/toolbar.page
+share/help/oc/evince/titlebar.page
share/help/oc/evince/translate.page
+share/help/pl/evince/annotation-properties.page
+share/help/pl/evince/annotations-delete.page
+share/help/pl/evince/annotations-disabled.page
+share/help/pl/evince/annotations-navigate.page
+share/help/pl/evince/annotations-save.page
+share/help/pl/evince/annotations.page
+share/help/pl/evince/bookmarks.page
+share/help/pl/evince/bug-filing.page
+share/help/pl/evince/commandline.page
+share/help/pl/evince/convertPostScript.page
+share/help/pl/evince/convertSVG.page
+share/help/pl/evince/convertpdf.page
+share/help/pl/evince/default-settings.page
+share/help/pl/evince/develop.page
+share/help/pl/evince/documentation.page
+share/help/pl/evince/duplex-10pages.page
+share/help/pl/evince/duplex-11pages.page
+share/help/pl/evince/duplex-12pages.page
+share/help/pl/evince/duplex-13pages.page
+share/help/pl/evince/duplex-14pages.page
+share/help/pl/evince/duplex-15pages.page
+share/help/pl/evince/duplex-16pages.page
+share/help/pl/evince/duplex-3pages.page
+share/help/pl/evince/duplex-4pages.page
+share/help/pl/evince/duplex-5pages.page
+share/help/pl/evince/duplex-6pages.page
+share/help/pl/evince/duplex-7pages.page
+share/help/pl/evince/duplex-8pages.page
+share/help/pl/evince/duplex-9pages.page
+share/help/pl/evince/duplex-npages.page
+share/help/pl/evince/editing.page
+share/help/pl/evince/figures/add-text-annotation.png
+share/help/pl/evince/figures/annotations-nav-to-page.png
+share/help/pl/evince/figures/evince-trail.png
+share/help/pl/evince/figures/evincelogo.png
+share/help/pl/evince/figures/list-add-tabs.png
+share/help/pl/evince/figures/print-select.png
+share/help/pl/evince/figures/reverse-collate.png
+share/help/pl/evince/figures/zoom.png
+share/help/pl/evince/finding.page
+share/help/pl/evince/formats.page
+share/help/pl/evince/forms-saving.page
+share/help/pl/evince/forms.page
+share/help/pl/evince/index.page
+share/help/pl/evince/introduction.page
+share/help/pl/evince/invert-colors.page
+share/help/pl/evince/legal-unported.xml
+share/help/pl/evince/legal.xml
+share/help/pl/evince/license.page
+share/help/pl/evince/movingaround.page
+share/help/pl/evince/noprint.page
+share/help/pl/evince/openerror.page
+share/help/pl/evince/opening.page
+share/help/pl/evince/password.page
+share/help/pl/evince/presentations.page
+share/help/pl/evince/print-2sided.page
+share/help/pl/evince/print-booklet.page
+share/help/pl/evince/print-differentsize.page
+share/help/pl/evince/print-order.page
+share/help/pl/evince/print-pagescaling.page
+share/help/pl/evince/print-select.page
+share/help/pl/evince/printing.page
+share/help/pl/evince/reload.page
+share/help/pl/evince/shortcuts.page
+share/help/pl/evince/singlesided-13-16pages.page
+share/help/pl/evince/singlesided-17-20pages.page
+share/help/pl/evince/singlesided-3-4pages.page
+share/help/pl/evince/singlesided-5-8pages.page
+share/help/pl/evince/singlesided-9-12pages.page
+share/help/pl/evince/singlesided-npages.page
+share/help/pl/evince/synctex-beamer.page
+share/help/pl/evince/synctex-compile.page
+share/help/pl/evince/synctex-editors.page
+share/help/pl/evince/synctex-search.page
+share/help/pl/evince/synctex-support.page
+share/help/pl/evince/synctex.page
+share/help/pl/evince/textselection.page
+share/help/pl/evince/titlebar.page
+share/help/pl/evince/translate.page
share/help/pt_BR/evince/annotation-properties.page
share/help/pt_BR/evince/annotations-delete.page
share/help/pt_BR/evince/annotations-disabled.page
@@ -1995,7 +2064,7 @@ share/help/pt_BR/evince/synctex-search.page
share/help/pt_BR/evince/synctex-support.page
share/help/pt_BR/evince/synctex.page
share/help/pt_BR/evince/textselection.page
-share/help/pt_BR/evince/toolbar.page
+share/help/pt_BR/evince/titlebar.page
share/help/pt_BR/evince/translate.page
share/help/ro/evince/annotation-properties.page
share/help/ro/evince/annotations-delete.page
@@ -2074,7 +2143,7 @@ share/help/ro/evince/synctex-search.page
share/help/ro/evince/synctex-support.page
share/help/ro/evince/synctex.page
share/help/ro/evince/textselection.page
-share/help/ro/evince/toolbar.page
+share/help/ro/evince/titlebar.page
share/help/ro/evince/translate.page
share/help/ru/evince/annotation-properties.page
share/help/ru/evince/annotations-delete.page
@@ -2153,7 +2222,7 @@ share/help/ru/evince/synctex-search.page
share/help/ru/evince/synctex-support.page
share/help/ru/evince/synctex.page
share/help/ru/evince/textselection.page
-share/help/ru/evince/toolbar.page
+share/help/ru/evince/titlebar.page
share/help/ru/evince/translate.page
share/help/sl/evince/annotation-properties.page
share/help/sl/evince/annotations-delete.page
@@ -2232,7 +2301,7 @@ share/help/sl/evince/synctex-search.page
share/help/sl/evince/synctex-support.page
share/help/sl/evince/synctex.page
share/help/sl/evince/textselection.page
-share/help/sl/evince/toolbar.page
+share/help/sl/evince/titlebar.page
share/help/sl/evince/translate.page
share/help/sr/evince/annotation-properties.page
share/help/sr/evince/annotations-delete.page
@@ -2311,7 +2380,7 @@ share/help/sr/evince/synctex-search.page
share/help/sr/evince/synctex-support.page
share/help/sr/evince/synctex.page
share/help/sr/evince/textselection.page
-share/help/sr/evince/toolbar.page
+share/help/sr/evince/titlebar.page
share/help/sr/evince/translate.page
share/help/sv/evince/annotation-properties.page
share/help/sv/evince/annotations-delete.page
@@ -2390,7 +2459,7 @@ share/help/sv/evince/synctex-search.page
share/help/sv/evince/synctex-support.page
share/help/sv/evince/synctex.page
share/help/sv/evince/textselection.page
-share/help/sv/evince/toolbar.page
+share/help/sv/evince/titlebar.page
share/help/sv/evince/translate.page
share/help/te/evince/annotation-properties.page
share/help/te/evince/annotations-delete.page
@@ -2469,7 +2538,7 @@ share/help/te/evince/synctex-search.page
share/help/te/evince/synctex-support.page
share/help/te/evince/synctex.page
share/help/te/evince/textselection.page
-share/help/te/evince/toolbar.page
+share/help/te/evince/titlebar.page
share/help/te/evince/translate.page
share/help/uk/evince/annotation-properties.page
share/help/uk/evince/annotations-delete.page
@@ -2548,7 +2617,7 @@ share/help/uk/evince/synctex-search.page
share/help/uk/evince/synctex-support.page
share/help/uk/evince/synctex.page
share/help/uk/evince/textselection.page
-share/help/uk/evince/toolbar.page
+share/help/uk/evince/titlebar.page
share/help/uk/evince/translate.page
share/help/vi/evince/annotation-properties.page
share/help/vi/evince/annotations-delete.page
@@ -2627,7 +2696,7 @@ share/help/vi/evince/synctex-search.page
share/help/vi/evince/synctex-support.page
share/help/vi/evince/synctex.page
share/help/vi/evince/textselection.page
-share/help/vi/evince/toolbar.page
+share/help/vi/evince/titlebar.page
share/help/vi/evince/translate.page
share/help/zh_CN/evince/annotation-properties.page
share/help/zh_CN/evince/annotations-delete.page
@@ -2706,7 +2775,7 @@ share/help/zh_CN/evince/synctex-search.page
share/help/zh_CN/evince/synctex-support.page
share/help/zh_CN/evince/synctex.page
share/help/zh_CN/evince/textselection.page
-share/help/zh_CN/evince/toolbar.page
+share/help/zh_CN/evince/titlebar.page
share/help/zh_CN/evince/translate.page
share/help/zh_HK/evince/annotation-properties.page
share/help/zh_HK/evince/annotations-delete.page
@@ -2785,7 +2854,7 @@ share/help/zh_HK/evince/synctex-search.page
share/help/zh_HK/evince/synctex-support.page
share/help/zh_HK/evince/synctex.page
share/help/zh_HK/evince/textselection.page
-share/help/zh_HK/evince/toolbar.page
+share/help/zh_HK/evince/titlebar.page
share/help/zh_HK/evince/translate.page
share/help/zh_TW/evince/annotation-properties.page
share/help/zh_TW/evince/annotations-delete.page
@@ -2864,7 +2933,7 @@ share/help/zh_TW/evince/synctex-search.page
share/help/zh_TW/evince/synctex-support.page
share/help/zh_TW/evince/synctex.page
share/help/zh_TW/evince/textselection.page
-share/help/zh_TW/evince/toolbar.page
+share/help/zh_TW/evince/titlebar.page
share/help/zh_TW/evince/translate.page
share/icons/hicolor/16x16/apps/evince.png
share/icons/hicolor/22x22/apps/evince.png
@@ -2967,3 +3036,11 @@ share/locale/zh_CN/LC_MESSAGES/evince.mo
share/locale/zh_HK/LC_MESSAGES/evince.mo
share/locale/zh_TW/LC_MESSAGES/evince.mo
share/locale/zu/LC_MESSAGES/evince.mo
+%%COMICS%%share/metainfo/evince-comicsdocument.metainfo.xml
+%%DJVU%%share/metainfo/evince-djvudocument.metainfo.xml
+%%DVI%%share/metainfo/evince-dvidocument.metainfo.xml
+share/metainfo/evince-pdfdocument.metainfo.xml
+share/metainfo/evince-psdocument.metainfo.xml
+share/metainfo/evince-tiffdocument.metainfo.xml
+%%XPS%%share/metainfo/evince-xpsdocument.metainfo.xml
+share/metainfo/evince.appdata.xml
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 68c58f7bf5fc..e27821a925a4 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= evince
-PORTVERSION= 3.26.0
+PORTVERSION= 3.28.2
PORTREVISION= 1
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
@@ -14,29 +14,28 @@ COMMENT?= GNOME 3 multi-format document viewer
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \
- itstool:textproc/itstool \
+BUILD_DEPENDS= itstool:textproc/itstool \
adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib \
libspectre.so:print/libspectre \
libtiff.so:graphics/tiff
-RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \
- adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
+RUN_DEPENDS= adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
PORTSCOUT= limitw:1,even
SLAVEPORT?= no
USES= compiler:c++11-lib desktop-file-utils gettext gmake \
- gnome libtool localbase pathfix pkgconfig tar:xz
+ gnome libarchive libtool localbase pathfix pkgconfig tar:xz
USE_GNOME= cairo gtk30 intlhack
USE_GSTREAMER1= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_XORG= ice
INSTALLS_ICONS= yes
-CFLAGS+= -Wno-error=format-nonliteral
+CONFIGURE_ARGS= --enable-compile-warnings=minimum \
+ --with-systemduserunitdir=no
INSTALL_TARGET= install-strip
.if ${SLAVEPORT} == lite
@@ -47,8 +46,7 @@ CONFIGURE_ARGS+=--disable-introspection \
USE_GNOME+= libxml2
.else
USE_GNOME+= introspection:build
-CONFIGURE_ARGS+= --enable-introspection \
- --with-systemduserunitdir=no
+CONFIGURE_ARGS+= --enable-introspection
.endif
GLIB_SCHEMAS= org.gnome.Evince.gschema.xml
@@ -59,36 +57,34 @@ OPTIONS_SUB= yes
OPTIONS_DEFINE= COMICS DBUS DJVU DVI KEYRING NAUTILUS T1LIB XPS
OPTIONS_DEFAULT=COMICS DBUS DJVU KEYRING NAUTILUS XPS
-DVI_DESC= DVI viewer support
-T1LIB_DESC= T1LIB for TYPE1 fonts to DVI (Enables DVI)
-NAUTILUS_DESC= Nautilus plugin
-KEYRING_DESC= Keyring support
-COMICS_DESC= Comic book archives support
-DJVU_DESC= DJVU support
-XPS_DESC= XPS support
-
-COMICS_USES= libarchive
+COMICS_DESC= Comic book archives support
COMICS_CONFIGURE_ENABLE= comics
+DJVU_DESC= DJVU support
DJVU_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre
DJVU_CONFIGURE_ENABLE= djvu
-DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
DBUS_CONFIGURE_ENABLE= dbus
+DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
-DVI_USE= tex=latex
+DVI_DESC= DVI viewer support
+DVI_USE= tex=latex,kpathsea
DVI_CONFIGURE_ENABLE= dvi
+KEYRING_DESC= Keyring support
KEYRING_LIB_DEPENDS= libsecret-1.so:security/libsecret
-KEYRING_CONFIGURE_OFF= --without-keyring
+KEYRING_CONFIGURE_ENABLE= keyring
+NAUTILUS_DESC= Nautilus plugin
NAUTILUS_USE= gnome=nautilus3
NAUTILUS_CONFIGURE_ENABLE= nautilus
+T1LIB_DESC= Support TYPE1 fonts to DVI (Enables DVI)
T1LIB_LIB_DEPENDS= libt1.so:devel/t1lib
-T1LIB_IMPLIES= DVI
T1LIB_CONFIGURE_ENABLE= t1lib
+T1LIB_IMPLIES= DVI
+XPS_DESC= XPS support
XPS_LIB_DEPENDS= libgxps.so:graphics/libgxps
XPS_CONFIGURE_ENABLE= xps
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index 8f8d71da4337..a14594e81d47 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1510954800
-SHA256 (gnome3/evince-3.26.0.tar.xz) = 79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8
-SIZE (gnome3/evince-3.26.0.tar.xz) = 3243724
+TIMESTAMP = 1524851976
+SHA256 (gnome3/evince-3.28.2.tar.xz) = 0955d22d85c9f6d322b6cbb464f1cc4c352db619017ec95dad4cc5c3440f73e1
+SIZE (gnome3/evince-3.28.2.tar.xz) = 3379552
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 5f14c44e7b07..b9e8b7edfcdc 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -80,7 +80,7 @@ lib/libevdocument3.so.4.0.0
lib/libevview3.a
lib/libevview3.so
lib/libevview3.so.3
-lib/libevview3.so.%%GTK3_VERSION%%
+lib/libevview3.so.3.0.0
lib/mozilla/plugins/libevbrowserplugin.a
lib/mozilla/plugins/libevbrowserplugin.so
%%NAUTILUS%%lib/nautilus/extensions-%%VERSION%%/libevince-properties-page.a
@@ -90,14 +90,6 @@ libdata/pkgconfig/evince-view-%%VERSION%%.pc
%%DBUS%%libexec/evinced
man/man1/evince.1.gz
share/GConf/gsettings/evince.convert
-%%COMICS%%share/appdata/evince-comicsdocument.metainfo.xml
-%%DJVU%%share/appdata/evince-djvudocument.metainfo.xml
-%%DVI%%share/appdata/evince-dvidocument.metainfo.xml
-share/appdata/evince-pdfdocument.metainfo.xml
-share/appdata/evince-psdocument.metainfo.xml
-share/appdata/evince-tiffdocument.metainfo.xml
-%%XPS%%share/appdata/evince-xpsdocument.metainfo.xml
-share/appdata/evince.appdata.xml
share/applications/evince-previewer.desktop
share/applications/evince.desktop
%%DBUS%%share/dbus-1/services/org.gnome.evince.Daemon.service
@@ -344,7 +336,7 @@ share/help/C/evince/synctex-search.page
share/help/C/evince/synctex-support.page
share/help/C/evince/synctex.page
share/help/C/evince/textselection.page
-share/help/C/evince/toolbar.page
+share/help/C/evince/titlebar.page
share/help/C/evince/translate.page
share/help/bg/evince/annotation-properties.page
share/help/bg/evince/annotations-delete.page
@@ -423,7 +415,7 @@ share/help/bg/evince/synctex-search.page
share/help/bg/evince/synctex-support.page
share/help/bg/evince/synctex.page
share/help/bg/evince/textselection.page
-share/help/bg/evince/toolbar.page
+share/help/bg/evince/titlebar.page
share/help/bg/evince/translate.page
share/help/ca/evince/annotation-properties.page
share/help/ca/evince/annotations-delete.page
@@ -502,7 +494,7 @@ share/help/ca/evince/synctex-search.page
share/help/ca/evince/synctex-support.page
share/help/ca/evince/synctex.page
share/help/ca/evince/textselection.page
-share/help/ca/evince/toolbar.page
+share/help/ca/evince/titlebar.page
share/help/ca/evince/translate.page
share/help/cs/evince/annotation-properties.page
share/help/cs/evince/annotations-delete.page
@@ -581,7 +573,7 @@ share/help/cs/evince/synctex-search.page
share/help/cs/evince/synctex-support.page
share/help/cs/evince/synctex.page
share/help/cs/evince/textselection.page
-share/help/cs/evince/toolbar.page
+share/help/cs/evince/titlebar.page
share/help/cs/evince/translate.page
share/help/da/evince/annotation-properties.page
share/help/da/evince/annotations-delete.page
@@ -660,7 +652,7 @@ share/help/da/evince/synctex-search.page
share/help/da/evince/synctex-support.page
share/help/da/evince/synctex.page
share/help/da/evince/textselection.page
-share/help/da/evince/toolbar.page
+share/help/da/evince/titlebar.page
share/help/da/evince/translate.page
share/help/de/evince/annotation-properties.page
share/help/de/evince/annotations-delete.page
@@ -739,7 +731,7 @@ share/help/de/evince/synctex-search.page
share/help/de/evince/synctex-support.page
share/help/de/evince/synctex.page
share/help/de/evince/textselection.page
-share/help/de/evince/toolbar.page
+share/help/de/evince/titlebar.page
share/help/de/evince/translate.page
share/help/el/evince/annotation-properties.page
share/help/el/evince/annotations-delete.page
@@ -818,7 +810,7 @@ share/help/el/evince/synctex-search.page
share/help/el/evince/synctex-support.page
share/help/el/evince/synctex.page
share/help/el/evince/textselection.page
-share/help/el/evince/toolbar.page
+share/help/el/evince/titlebar.page
share/help/el/evince/translate.page
share/help/en_GB/evince/annotation-properties.page
share/help/en_GB/evince/annotations-delete.page
@@ -897,7 +889,7 @@ share/help/en_GB/evince/synctex-search.page
share/help/en_GB/evince/synctex-support.page
share/help/en_GB/evince/synctex.page
share/help/en_GB/evince/textselection.page
-share/help/en_GB/evince/toolbar.page
+share/help/en_GB/evince/titlebar.page
share/help/en_GB/evince/translate.page
share/help/es/evince/annotation-properties.page
share/help/es/evince/annotations-delete.page
@@ -976,7 +968,7 @@ share/help/es/evince/synctex-search.page
share/help/es/evince/synctex-support.page
share/help/es/evince/synctex.page
share/help/es/evince/textselection.page
-share/help/es/evince/toolbar.page
+share/help/es/evince/titlebar.page
share/help/es/evince/translate.page
share/help/eu/evince/annotation-properties.page
share/help/eu/evince/annotations-delete.page
@@ -1055,7 +1047,7 @@ share/help/eu/evince/synctex-search.page
share/help/eu/evince/synctex-support.page
share/help/eu/evince/synctex.page
share/help/eu/evince/textselection.page
-share/help/eu/evince/toolbar.page
+share/help/eu/evince/titlebar.page
share/help/eu/evince/translate.page
share/help/fi/evince/annotation-properties.page
share/help/fi/evince/annotations-delete.page
@@ -1134,7 +1126,7 @@ share/help/fi/evince/synctex-search.page
share/help/fi/evince/synctex-support.page
share/help/fi/evince/synctex.page
share/help/fi/evince/textselection.page
-share/help/fi/evince/toolbar.page
+share/help/fi/evince/titlebar.page
share/help/fi/evince/translate.page
share/help/fr/evince/annotation-properties.page
share/help/fr/evince/annotations-delete.page
@@ -1213,7 +1205,7 @@ share/help/fr/evince/synctex-search.page
share/help/fr/evince/synctex-support.page
share/help/fr/evince/synctex.page
share/help/fr/evince/textselection.page
-share/help/fr/evince/toolbar.page
+share/help/fr/evince/titlebar.page
share/help/fr/evince/translate.page
share/help/gl/evince/annotation-properties.page
share/help/gl/evince/annotations-delete.page
@@ -1292,7 +1284,7 @@ share/help/gl/evince/synctex-search.page
share/help/gl/evince/synctex-support.page
share/help/gl/evince/synctex.page
share/help/gl/evince/textselection.page
-share/help/gl/evince/toolbar.page
+share/help/gl/evince/titlebar.page
share/help/gl/evince/translate.page
share/help/hu/evince/annotation-properties.page
share/help/hu/evince/annotations-delete.page
@@ -1371,7 +1363,7 @@ share/help/hu/evince/synctex-search.page
share/help/hu/evince/synctex-support.page
share/help/hu/evince/synctex.page
share/help/hu/evince/textselection.page
-share/help/hu/evince/toolbar.page
+share/help/hu/evince/titlebar.page
share/help/hu/evince/translate.page
share/help/id/evince/annotation-properties.page
share/help/id/evince/annotations-delete.page
@@ -1450,7 +1442,7 @@ share/help/id/evince/synctex-search.page
share/help/id/evince/synctex-support.page
share/help/id/evince/synctex.page
share/help/id/evince/textselection.page
-share/help/id/evince/toolbar.page
+share/help/id/evince/titlebar.page
share/help/id/evince/translate.page
share/help/it/evince/annotation-properties.page
share/help/it/evince/annotations-delete.page
@@ -1529,7 +1521,7 @@ share/help/it/evince/synctex-search.page
share/help/it/evince/synctex-support.page
share/help/it/evince/synctex.page
share/help/it/evince/textselection.page
-share/help/it/evince/toolbar.page
+share/help/it/evince/titlebar.page
share/help/it/evince/translate.page
share/help/ja/evince/annotation-properties.page
share/help/ja/evince/annotations-delete.page
@@ -1608,7 +1600,7 @@ share/help/ja/evince/synctex-search.page
share/help/ja/evince/synctex-support.page
share/help/ja/evince/synctex.page
share/help/ja/evince/textselection.page
-share/help/ja/evince/toolbar.page
+share/help/ja/evince/titlebar.page
share/help/ja/evince/translate.page
share/help/ko/evince/annotation-properties.page
share/help/ko/evince/annotations-delete.page
@@ -1687,7 +1679,7 @@ share/help/ko/evince/synctex-search.page
share/help/ko/evince/synctex-support.page
share/help/ko/evince/synctex.page
share/help/ko/evince/textselection.page
-share/help/ko/evince/toolbar.page
+share/help/ko/evince/titlebar.page
share/help/ko/evince/translate.page
share/help/lv/evince/annotation-properties.page
share/help/lv/evince/annotations-delete.page
@@ -1766,7 +1758,7 @@ share/help/lv/evince/synctex-search.page
share/help/lv/evince/synctex-support.page
share/help/lv/evince/synctex.page
share/help/lv/evince/textselection.page
-share/help/lv/evince/toolbar.page
+share/help/lv/evince/titlebar.page
share/help/lv/evince/translate.page
share/help/nl/evince/annotation-properties.page
share/help/nl/evince/annotations-delete.page
@@ -1845,7 +1837,7 @@ share/help/nl/evince/synctex-search.page
share/help/nl/evince/synctex-support.page
share/help/nl/evince/synctex.page
share/help/nl/evince/textselection.page
-share/help/nl/evince/toolbar.page
+share/help/nl/evince/titlebar.page
share/help/nl/evince/translate.page
share/help/oc/evince/annotation-properties.page
share/help/oc/evince/annotations-delete.page
@@ -1924,8 +1916,87 @@ share/help/oc/evince/synctex-search.page
share/help/oc/evince/synctex-support.page
share/help/oc/evince/synctex.page
share/help/oc/evince/textselection.page
-share/help/oc/evince/toolbar.page
+share/help/oc/evince/titlebar.page
share/help/oc/evince/translate.page
+share/help/pl/evince/annotation-properties.page
+share/help/pl/evince/annotations-delete.page
+share/help/pl/evince/annotations-disabled.page
+share/help/pl/evince/annotations-navigate.page
+share/help/pl/evince/annotations-save.page
+share/help/pl/evince/annotations.page
+share/help/pl/evince/bookmarks.page
+share/help/pl/evince/bug-filing.page
+share/help/pl/evince/commandline.page
+share/help/pl/evince/convertPostScript.page
+share/help/pl/evince/convertSVG.page
+share/help/pl/evince/convertpdf.page
+share/help/pl/evince/default-settings.page
+share/help/pl/evince/develop.page
+share/help/pl/evince/documentation.page
+share/help/pl/evince/duplex-10pages.page
+share/help/pl/evince/duplex-11pages.page
+share/help/pl/evince/duplex-12pages.page
+share/help/pl/evince/duplex-13pages.page
+share/help/pl/evince/duplex-14pages.page
+share/help/pl/evince/duplex-15pages.page
+share/help/pl/evince/duplex-16pages.page
+share/help/pl/evince/duplex-3pages.page
+share/help/pl/evince/duplex-4pages.page
+share/help/pl/evince/duplex-5pages.page
+share/help/pl/evince/duplex-6pages.page
+share/help/pl/evince/duplex-7pages.page
+share/help/pl/evince/duplex-8pages.page
+share/help/pl/evince/duplex-9pages.page
+share/help/pl/evince/duplex-npages.page
+share/help/pl/evince/editing.page
+share/help/pl/evince/figures/add-text-annotation.png
+share/help/pl/evince/figures/annotations-nav-to-page.png
+share/help/pl/evince/figures/evince-trail.png
+share/help/pl/evince/figures/evincelogo.png
+share/help/pl/evince/figures/list-add-tabs.png
+share/help/pl/evince/figures/print-select.png
+share/help/pl/evince/figures/reverse-collate.png
+share/help/pl/evince/figures/zoom.png
+share/help/pl/evince/finding.page
+share/help/pl/evince/formats.page
+share/help/pl/evince/forms-saving.page
+share/help/pl/evince/forms.page
+share/help/pl/evince/index.page
+share/help/pl/evince/introduction.page
+share/help/pl/evince/invert-colors.page
+share/help/pl/evince/legal-unported.xml
+share/help/pl/evince/legal.xml
+share/help/pl/evince/license.page
+share/help/pl/evince/movingaround.page
+share/help/pl/evince/noprint.page
+share/help/pl/evince/openerror.page
+share/help/pl/evince/opening.page
+share/help/pl/evince/password.page
+share/help/pl/evince/presentations.page
+share/help/pl/evince/print-2sided.page
+share/help/pl/evince/print-booklet.page
+share/help/pl/evince/print-differentsize.page
+share/help/pl/evince/print-order.page
+share/help/pl/evince/print-pagescaling.page
+share/help/pl/evince/print-select.page
+share/help/pl/evince/printing.page
+share/help/pl/evince/reload.page
+share/help/pl/evince/shortcuts.page
+share/help/pl/evince/singlesided-13-16pages.page
+share/help/pl/evince/singlesided-17-20pages.page
+share/help/pl/evince/singlesided-3-4pages.page
+share/help/pl/evince/singlesided-5-8pages.page
+share/help/pl/evince/singlesided-9-12pages.page
+share/help/pl/evince/singlesided-npages.page
+share/help/pl/evince/synctex-beamer.page
+share/help/pl/evince/synctex-compile.page
+share/help/pl/evince/synctex-editors.page
+share/help/pl/evince/synctex-search.page
+share/help/pl/evince/synctex-support.page
+share/help/pl/evince/synctex.page
+share/help/pl/evince/textselection.page
+share/help/pl/evince/titlebar.page
+share/help/pl/evince/translate.page
share/help/pt_BR/evince/annotation-properties.page
share/help/pt_BR/evince/annotations-delete.page
share/help/pt_BR/evince/annotations-disabled.page
@@ -2003,7 +2074,7 @@ share/help/pt_BR/evince/synctex-search.page
share/help/pt_BR/evince/synctex-support.page
share/help/pt_BR/evince/synctex.page
share/help/pt_BR/evince/textselection.page
-share/help/pt_BR/evince/toolbar.page
+share/help/pt_BR/evince/titlebar.page
share/help/pt_BR/evince/translate.page
share/help/ro/evince/annotation-properties.page
share/help/ro/evince/annotations-delete.page
@@ -2082,7 +2153,7 @@ share/help/ro/evince/synctex-search.page
share/help/ro/evince/synctex-support.page
share/help/ro/evince/synctex.page
share/help/ro/evince/textselection.page
-share/help/ro/evince/toolbar.page
+share/help/ro/evince/titlebar.page
share/help/ro/evince/translate.page
share/help/ru/evince/annotation-properties.page
share/help/ru/evince/annotations-delete.page
@@ -2161,7 +2232,7 @@ share/help/ru/evince/synctex-search.page
share/help/ru/evince/synctex-support.page
share/help/ru/evince/synctex.page
share/help/ru/evince/textselection.page
-share/help/ru/evince/toolbar.page
+share/help/ru/evince/titlebar.page
share/help/ru/evince/translate.page
share/help/sl/evince/annotation-properties.page
share/help/sl/evince/annotations-delete.page
@@ -2240,7 +2311,7 @@ share/help/sl/evince/synctex-search.page
share/help/sl/evince/synctex-support.page
share/help/sl/evince/synctex.page
share/help/sl/evince/textselection.page
-share/help/sl/evince/toolbar.page
+share/help/sl/evince/titlebar.page
share/help/sl/evince/translate.page
share/help/sr/evince/annotation-properties.page
share/help/sr/evince/annotations-delete.page
@@ -2319,7 +2390,7 @@ share/help/sr/evince/synctex-search.page
share/help/sr/evince/synctex-support.page
share/help/sr/evince/synctex.page
share/help/sr/evince/textselection.page
-share/help/sr/evince/toolbar.page
+share/help/sr/evince/titlebar.page
share/help/sr/evince/translate.page
share/help/sv/evince/annotation-properties.page
share/help/sv/evince/annotations-delete.page
@@ -2398,7 +2469,7 @@ share/help/sv/evince/synctex-search.page
share/help/sv/evince/synctex-support.page
share/help/sv/evince/synctex.page
share/help/sv/evince/textselection.page
-share/help/sv/evince/toolbar.page
+share/help/sv/evince/titlebar.page
share/help/sv/evince/translate.page
share/help/te/evince/annotation-properties.page
share/help/te/evince/annotations-delete.page
@@ -2477,7 +2548,7 @@ share/help/te/evince/synctex-search.page
share/help/te/evince/synctex-support.page
share/help/te/evince/synctex.page
share/help/te/evince/textselection.page
-share/help/te/evince/toolbar.page
+share/help/te/evince/titlebar.page
share/help/te/evince/translate.page
share/help/uk/evince/annotation-properties.page
share/help/uk/evince/annotations-delete.page
@@ -2556,7 +2627,7 @@ share/help/uk/evince/synctex-search.page
share/help/uk/evince/synctex-support.page
share/help/uk/evince/synctex.page
share/help/uk/evince/textselection.page
-share/help/uk/evince/toolbar.page
+share/help/uk/evince/titlebar.page
share/help/uk/evince/translate.page
share/help/vi/evince/annotation-properties.page
share/help/vi/evince/annotations-delete.page
@@ -2635,7 +2706,7 @@ share/help/vi/evince/synctex-search.page
share/help/vi/evince/synctex-support.page
share/help/vi/evince/synctex.page
share/help/vi/evince/textselection.page
-share/help/vi/evince/toolbar.page
+share/help/vi/evince/titlebar.page
share/help/vi/evince/translate.page
share/help/zh_CN/evince/annotation-properties.page
share/help/zh_CN/evince/annotations-delete.page
@@ -2714,7 +2785,7 @@ share/help/zh_CN/evince/synctex-search.page
share/help/zh_CN/evince/synctex-support.page
share/help/zh_CN/evince/synctex.page
share/help/zh_CN/evince/textselection.page
-share/help/zh_CN/evince/toolbar.page
+share/help/zh_CN/evince/titlebar.page
share/help/zh_CN/evince/translate.page
share/help/zh_HK/evince/annotation-properties.page
share/help/zh_HK/evince/annotations-delete.page
@@ -2793,7 +2864,7 @@ share/help/zh_HK/evince/synctex-search.page
share/help/zh_HK/evince/synctex-support.page
share/help/zh_HK/evince/synctex.page
share/help/zh_HK/evince/textselection.page
-share/help/zh_HK/evince/toolbar.page
+share/help/zh_HK/evince/titlebar.page
share/help/zh_HK/evince/translate.page
share/help/zh_TW/evince/annotation-properties.page
share/help/zh_TW/evince/annotations-delete.page
@@ -2872,7 +2943,7 @@ share/help/zh_TW/evince/synctex-search.page
share/help/zh_TW/evince/synctex-support.page
share/help/zh_TW/evince/synctex.page
share/help/zh_TW/evince/textselection.page
-share/help/zh_TW/evince/toolbar.page
+share/help/zh_TW/evince/titlebar.page
share/help/zh_TW/evince/translate.page
share/icons/hicolor/16x16/apps/evince.png
share/icons/hicolor/22x22/apps/evince.png
@@ -2975,4 +3046,12 @@ share/locale/zh_CN/LC_MESSAGES/evince.mo
share/locale/zh_HK/LC_MESSAGES/evince.mo
share/locale/zh_TW/LC_MESSAGES/evince.mo
share/locale/zu/LC_MESSAGES/evince.mo
+%%COMICS%%share/metainfo/evince-comicsdocument.metainfo.xml
+%%DJVU%%share/metainfo/evince-djvudocument.metainfo.xml
+%%DVI%%share/metainfo/evince-dvidocument.metainfo.xml
+share/metainfo/evince-pdfdocument.metainfo.xml
+share/metainfo/evince-psdocument.metainfo.xml
+share/metainfo/evince-tiffdocument.metainfo.xml
+%%XPS%%share/metainfo/evince-xpsdocument.metainfo.xml
+share/metainfo/evince.appdata.xml
share/thumbnailers/evince.thumbnailer
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index bedda5f0cb2e..692e2c9f2bb3 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= gdk-pixbuf
-PORTVERSION= 2.36.11
+PORTVERSION= 2.36.12
CATEGORIES= graphics
MASTER_SITES= GNOME
PKGNAMESUFFIX= 2
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Graphic library for GTK+
@@ -14,42 +14,38 @@ COMMENT= Graphic library for GTK+
LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cpe gmake gnome libtool localbase pathfix pkgconfig \
- shared-mime-info tar:xz
-USE_XORG= xt xi x11
+BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl
+
+USES= cpe gettext gnome localbase:ldflags meson pkgconfig \
+ python:3.4+,build shared-mime-info tar:xz
CPE_VENDOR= gnome
-USE_GNOME+= glib20 introspection:build
+USE_GNOME= glib20 introspection:build libxslt:build
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-introspection=yes --with-x11
-INSTALL_TARGET= install-strip
+MESON_ARGS= -Dman=true
+
+BINARY_ALIAS= python3=${PYTHON_VERSION}
OPTIONS_SUB= yes
-OPTIONS_DEFINE= JASPER JPEG PNG TIFF NLS
-OPTIONS_DEFAULT=JASPER JPEG PNG TIFF
+OPTIONS_DEFINE= JASPER JPEG PNG TIFF X11
+OPTIONS_DEFAULT=JPEG PNG TIFF X11
-JASPER_CONFIGURE_WITH= libjasper
+JASPER_MESON_TRUE= jasper
JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper
-JPEG_CONFIGURE_WITH= libjpeg
+JPEG_MESON_TRUE= jpeg
JPEG_USES= jpeg
-PNG_CONFIGURE_WITH= libpng
+PNG_MESON_TRUE= png
PNG_LIB_DEPENDS= libpng.so:graphics/png
-TIFF_CONFIGURE_WITH= libtiff
+TIFF_MESON_TRUE= tiff
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
-NLS_CONFIGURE_ENABLE= nls
-NLS_USES= gettext
-
-# workaround tiff enable bug in configure
-post-patch:
- @${REINPLACE_CMD} -e 's|$$LIBTIFF|$$TIFF_LIBS|' \
- ${WRKSRC}/configure
+X11_MESON_TRUE= x11
+X11_USE= xorg=x11
post-install:
- @cd ${WRKSRC}/docs/reference/gdk-pixbuf && \
- ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-man1
+ ${RM} -rf ${STAGEDIR}${PREFIX}/libexec/installed-tests
+ ${RM} -rf ${STAGEDIR}${PREFIX}/share/installed-tests
.include <bsd.port.mk>
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index 7edd224325ed..b3d8113f8d71 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522146133
-SHA256 (gnome2/gdk-pixbuf-2.36.11.tar.xz) = ae62ab87250413156ed72ef756347b10208c00e76b222d82d9ed361ed9dde2f3
-SIZE (gnome2/gdk-pixbuf-2.36.11.tar.xz) = 5675908
+TIMESTAMP = 1525380960
+SHA256 (gnome/gdk-pixbuf-2.36.12.tar.xz) = fff85cf48223ab60e3c3c8318e2087131b590fd6f1737e42cb3759a3b427a334
+SIZE (gnome/gdk-pixbuf-2.36.12.tar.xz) = 5675768
diff --git a/graphics/gdk-pixbuf2/files/patch-Makefile.in b/graphics/gdk-pixbuf2/files/patch-Makefile.in
deleted file mode 100644
index 1db315a60540..000000000000
--- a/graphics/gdk-pixbuf2/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2017-09-02 09:47:13 UTC
-+++ Makefile.in
-@@ -451,7 +451,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = gdk-pixbuf po docs thumbnailer tests contrib win32
-+SUBDIRS = gdk-pixbuf po thumbnailer tests contrib win32
- meson_files = \
- meson.build \
- meson_options.txt \
diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist
index f352dc53f4a6..9ece07ce49f6 100644
--- a/graphics/gdk-pixbuf2/pkg-plist
+++ b/graphics/gdk-pixbuf2/pkg-plist
@@ -12,7 +12,6 @@ include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-macros.h
-include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h
@@ -34,121 +33,121 @@ lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.so
lib/girepository-1.0/GdkPixbuf-2.0.typelib
lib/libgdk_pixbuf-2.0.so
lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf-2.0.so.0.3611.0
+lib/libgdk_pixbuf-2.0.so.0.3600.12
lib/libgdk_pixbuf_xlib-2.0.so
lib/libgdk_pixbuf_xlib-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.so.0.3611.0
+lib/libgdk_pixbuf_xlib-2.0.so.0.3600.12
libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
man/man1/gdk-pixbuf-csource.1.gz
man/man1/gdk-pixbuf-query-loaders.1.gz
share/gir-1.0/GdkPixbuf-2.0.gir
-%%NLS%%share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/as/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/az/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/be/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/be@latin/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/br/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ca@valencia/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/csb/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/da/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/el/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/en@shaw/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/et/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/fur/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/he/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/hi/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/hy/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ia/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/id/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/io/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/is/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/km/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/li/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/mai/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/mi/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ml/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/mn/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/mr/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/my/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ne/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/nso/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/oc/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/or/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ps/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/si/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/sr@ije/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/sr@latin/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/te/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/tg/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/th/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/as/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/az/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/be/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/be@latin/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/br/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ca@valencia/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/csb/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/da/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/de/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/el/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/en@shaw/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/es/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/et/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/fur/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/he/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/hi/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/hr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/hy/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ia/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/id/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/io/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/is/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/it/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/kk/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/km/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/li/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/lt/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/lv/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/mai/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/mi/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/mk/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ml/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/mn/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/mr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ms/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/my/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nds/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ne/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nl/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nn/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nso/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/oc/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/or/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/pa/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ps/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/pt/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ro/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ru/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/si/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sr@ije/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sr@latin/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/te/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/tg/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/th/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo
share/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer
@postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true
@postunexec rm %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>&1 >/dev/null || true
diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile
index a255fe1e07b2..ea123c8ac593 100644
--- a/graphics/gnome-color-manager/Makefile
+++ b/graphics/gnome-color-manager/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= gnome-color-manager
-PORTVERSION= 3.18.0
-PORTREVISION= 4
+PORTVERSION= 3.28.0
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Session framework for the GNOME desktop to manage color profiles
-LICENSE= GPLv2+
+LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= docbook2man:textproc/docbook-utils \
@@ -20,18 +19,19 @@ BUILD_DEPENDS= docbook2man:textproc/docbook-utils \
LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
libcolord.so:graphics/colord \
libcolord-gtk.so:graphics/colord-gtk \
+ libcanberra.so:audio/libcanberra \
libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+ libtiff.so:graphics/tiff \
libexif.so:graphics/libexif
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake localbase:ldflags gnome pathfix pkgconfig tar:xz
-USE_XORG= xrandr
-USE_GNOME= gnomedesktop3 gtk30 intlhack vte3
+USES= gettext gnome meson pkgconfig tar:xz
+USE_GNOME= cairo gtk30 vte3
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-clutter=no
+MESON_ARGS= -Dtests=false \
+ -Dpackagekit=false
OPTIONS_DEFINE= RAW
OPTIONS_DEFAULT=RAW
@@ -39,13 +39,10 @@ OPTIONS_SUB= yes
RAW_DESC= Enable RAW EXIF support
RAW_LIB_DEPENDS= libexiv2.so:graphics/exiv2
-RAW_CONFIGURE_ON= --enable-exiv=yes
-RAW_CONFIGURE_OFF= --enable-exiv=no
+RAW_MESON_TRUE= exiv
post-patch:
- @${REINPLACE_CMD} -e 's|-Wclobbered||g ; s|-Wempty-body||g ; \
- s|-Wignored-qualifiers||g ; s|-Wtype-limits||g ; \
- s|-Wmissing-parameter-type||g' \
- ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e "s|'share/man/man1'|'man/man1'|g" \
+ ${WRKSRC}/man/meson.build
.include <bsd.port.mk>
diff --git a/graphics/gnome-color-manager/distinfo b/graphics/gnome-color-manager/distinfo
index 7075e83a4f25..0bcaf80e747d 100644
--- a/graphics/gnome-color-manager/distinfo
+++ b/graphics/gnome-color-manager/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-color-manager-3.18.0.tar.xz) = 83d06f3b76b89b6c56bd6e4f792e15c67b561682fa9d59b60cbf716f6130a435
-SIZE (gnome3/gnome-color-manager-3.18.0.tar.xz) = 2647648
+TIMESTAMP = 1526110568
+SHA256 (gnome/gnome-color-manager-3.28.0.tar.xz) = ec333a9fa4688b29b0f4b6cabe941f7f40bfe9a1369ba75b7ffc185c8d7a3dd6
+SIZE (gnome/gnome-color-manager-3.28.0.tar.xz) = 2605620
diff --git a/graphics/gnome-color-manager/pkg-plist b/graphics/gnome-color-manager/pkg-plist
index cdd267ac7f56..6b60850f633a 100644
--- a/graphics/gnome-color-manager/pkg-plist
+++ b/graphics/gnome-color-manager/pkg-plist
@@ -9,11 +9,10 @@ man/man1/gcm-import.1.gz
man/man1/gcm-inspect.1.gz
man/man1/gcm-picker.1.gz
man/man1/gcm-viewer.1.gz
-share/appdata/gcm-viewer.appdata.xml
share/applications/gcm-calibrate.desktop
share/applications/gcm-import.desktop
share/applications/gcm-picker.desktop
-share/applications/gcm-viewer.desktop
+share/applications/org.gnome.ColorProfileViewer.desktop
%%DATADIR%%/figures/viewer-example-00.png
%%DATADIR%%/figures/viewer-example-01.png
%%DATADIR%%/figures/viewer-example-02.png
@@ -22,9 +21,9 @@ share/applications/gcm-viewer.desktop
%%DATADIR%%/icons/calibration-normal.svg
%%DATADIR%%/icons/calibration-short.svg
%%DATADIR%%/icons/clock.svg
-%%DATADIR%%/icons/crt.svg
-%%DATADIR%%/icons/lcd.svg
-%%DATADIR%%/icons/projector.svg
+%%DATADIR%%/icons/icons/crt.svg
+%%DATADIR%%/icons/icons/lcd.svg
+%%DATADIR%%/icons/icons/projector.svg
%%DATADIR%%/icons/scan-target-bad.svg
%%DATADIR%%/icons/scan-target-good.svg
%%DATADIR%%/icons/scan-target.svg
@@ -57,6 +56,10 @@ share/help/cs/gnome-color-manager/color-import-linux.page
share/help/cs/gnome-color-manager/color-import-osx.page
share/help/cs/gnome-color-manager/color-import-windows.page
share/help/cs/gnome-color-manager/legal.xml
+share/help/da/gnome-color-manager/color-import-linux.page
+share/help/da/gnome-color-manager/color-import-osx.page
+share/help/da/gnome-color-manager/color-import-windows.page
+share/help/da/gnome-color-manager/legal.xml
share/help/de/gnome-color-manager/color-import-linux.page
share/help/de/gnome-color-manager/color-import-osx.page
share/help/de/gnome-color-manager/color-import-windows.page
@@ -85,14 +88,26 @@ share/help/hu/gnome-color-manager/color-import-linux.page
share/help/hu/gnome-color-manager/color-import-osx.page
share/help/hu/gnome-color-manager/color-import-windows.page
share/help/hu/gnome-color-manager/legal.xml
+share/help/ko/gnome-color-manager/color-import-linux.page
+share/help/ko/gnome-color-manager/color-import-osx.page
+share/help/ko/gnome-color-manager/color-import-windows.page
+share/help/ko/gnome-color-manager/legal.xml
share/help/ml/gnome-color-manager/color-import-linux.page
share/help/ml/gnome-color-manager/color-import-osx.page
share/help/ml/gnome-color-manager/color-import-windows.page
share/help/ml/gnome-color-manager/legal.xml
+share/help/pl/gnome-color-manager/color-import-linux.page
+share/help/pl/gnome-color-manager/color-import-osx.page
+share/help/pl/gnome-color-manager/color-import-windows.page
+share/help/pl/gnome-color-manager/legal.xml
share/help/pt_BR/gnome-color-manager/color-import-linux.page
share/help/pt_BR/gnome-color-manager/color-import-osx.page
share/help/pt_BR/gnome-color-manager/color-import-windows.page
share/help/pt_BR/gnome-color-manager/legal.xml
+share/help/sv/gnome-color-manager/color-import-linux.page
+share/help/sv/gnome-color-manager/color-import-osx.page
+share/help/sv/gnome-color-manager/color-import-windows.page
+share/help/sv/gnome-color-manager/legal.xml
share/help/zh_CN/gnome-color-manager/color-import-linux.page
share/help/zh_CN/gnome-color-manager/color-import-osx.page
share/help/zh_CN/gnome-color-manager/color-import-windows.page
@@ -106,23 +121,15 @@ share/help/zh_TW/gnome-color-manager/color-import-osx.page
share/help/zh_TW/gnome-color-manager/color-import-windows.page
share/help/zh_TW/gnome-color-manager/legal.xml
share/icons/hicolor/16x16/apps/gnome-color-manager.png
-share/icons/hicolor/16x16/mimetypes/application-vnd.iccprofile.png
share/icons/hicolor/22x22/apps/gnome-color-manager.png
-share/icons/hicolor/22x22/mimetypes/application-vnd.iccprofile.png
share/icons/hicolor/24x24/apps/gnome-color-manager.png
-share/icons/hicolor/24x24/mimetypes/application-vnd.iccprofile.png
share/icons/hicolor/256x256/apps/gnome-color-manager.png
-share/icons/hicolor/256x256/mimetypes/application-vnd.iccprofile.png
share/icons/hicolor/32x32/apps/gnome-color-manager.png
-share/icons/hicolor/32x32/mimetypes/application-vnd.iccprofile.png
share/icons/hicolor/48x48/apps/gnome-color-manager.png
-share/icons/hicolor/48x48/mimetypes/application-vnd.iccprofile.png
share/icons/hicolor/64x64/apps/gnome-color-manager.png
-share/icons/hicolor/64x64/mimetypes/application-vnd.iccprofile.png
share/icons/hicolor/scalable/apps/gnome-color-manager.svg
-share/icons/hicolor/scalable/mimetypes/application-vnd.iccprofile.svg
-share/locale/as/LC_MESSAGES/gnome-color-manager.mo
share/locale/ar/LC_MESSAGES/gnome-color-manager.mo
+share/locale/as/LC_MESSAGES/gnome-color-manager.mo
share/locale/bg/LC_MESSAGES/gnome-color-manager.mo
share/locale/bn_IN/LC_MESSAGES/gnome-color-manager.mo
share/locale/bs/LC_MESSAGES/gnome-color-manager.mo
@@ -141,6 +148,7 @@ share/locale/fa/LC_MESSAGES/gnome-color-manager.mo
share/locale/fi/LC_MESSAGES/gnome-color-manager.mo
share/locale/fr/LC_MESSAGES/gnome-color-manager.mo
share/locale/fur/LC_MESSAGES/gnome-color-manager.mo
+share/locale/gd/LC_MESSAGES/gnome-color-manager.mo
share/locale/gl/LC_MESSAGES/gnome-color-manager.mo
share/locale/gu/LC_MESSAGES/gnome-color-manager.mo
share/locale/he/LC_MESSAGES/gnome-color-manager.mo
@@ -151,12 +159,12 @@ share/locale/is/LC_MESSAGES/gnome-color-manager.mo
share/locale/it/LC_MESSAGES/gnome-color-manager.mo
share/locale/ja/LC_MESSAGES/gnome-color-manager.mo
share/locale/kk/LC_MESSAGES/gnome-color-manager.mo
-share/locale/ko/LC_MESSAGES/gnome-color-manager.mo
share/locale/kn/LC_MESSAGES/gnome-color-manager.mo
+share/locale/ko/LC_MESSAGES/gnome-color-manager.mo
share/locale/lt/LC_MESSAGES/gnome-color-manager.mo
share/locale/lv/LC_MESSAGES/gnome-color-manager.mo
-share/locale/mr/LC_MESSAGES/gnome-color-manager.mo
share/locale/ml/LC_MESSAGES/gnome-color-manager.mo
+share/locale/mr/LC_MESSAGES/gnome-color-manager.mo
share/locale/nb/LC_MESSAGES/gnome-color-manager.mo
share/locale/ne/LC_MESSAGES/gnome-color-manager.mo
share/locale/nl/LC_MESSAGES/gnome-color-manager.mo
@@ -184,3 +192,4 @@ share/locale/vi/LC_MESSAGES/gnome-color-manager.mo
share/locale/zh_CN/LC_MESSAGES/gnome-color-manager.mo
share/locale/zh_HK/LC_MESSAGES/gnome-color-manager.mo
share/locale/zh_TW/LC_MESSAGES/gnome-color-manager.mo
+share/metainfo/org.gnome.ColorProfileViewer.appdata.xml
diff --git a/graphics/graphene/Makefile b/graphics/graphene/Makefile
index 410f9e779d29..ece0740af7c0 100644
--- a/graphics/graphene/Makefile
+++ b/graphics/graphene/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= graphene
-PORTVERSION= 1.6.0
-PORTREVISION= 2
+PORTVERSION= 1.8.2
CATEGORIES= graphics devel
MASTER_SITES= GNOME
@@ -26,7 +25,7 @@ USE_GNOME+= introspection:build
#INTROSPECTION_USE= gnome=introspection:build
#INTROSPECTION_MESON_OFF= -Denable-introspection=false
-GTKDOC_MESON_TRUE= enable-gtk-doc
+GTKDOC_MESON_TRUE= gtk_doc
GTKDOC_DESC= Build documentation
GTKDOC_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc
@@ -37,5 +36,6 @@ post-patch:
# We don't want install tests
post-install:
@${RM} -rf ${STAGEDIR}${PREFIX}/libexec/installed-tests
+ @${RM} -rf ${STAGEDIR}${PREFIX}/share/installed-tests
.include <bsd.port.mk>
diff --git a/graphics/graphene/distinfo b/graphics/graphene/distinfo
index 5cf73661de11..d5d9f108fd07 100644
--- a/graphics/graphene/distinfo
+++ b/graphics/graphene/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491756916
-SHA256 (graphene-1.6.0.tar.xz) = c3a9910f8dd298c1459d1f3c699ddf2e7440f9e561bfcbef59ae784400e27b5d
-SIZE (graphene-1.6.0.tar.xz) = 421228
+TIMESTAMP = 1530384036
+SHA256 (graphene-1.8.2.tar.xz) = b3fcf20996e57b1f4df3941caac10f143bb29890a42f7a65407cd19271fc89f7
+SIZE (graphene-1.8.2.tar.xz) = 127436
diff --git a/graphics/graphene/pkg-plist b/graphics/graphene/pkg-plist
index 5a6d7b340848..cce9ad909fa4 100644
--- a/graphics/graphene/pkg-plist
+++ b/graphics/graphene/pkg-plist
@@ -27,7 +27,7 @@ lib/girepository-1.0/Graphene-1.0.typelib
lib/graphene-1.0/include/graphene-config.h
lib/libgraphene-1.0.so
lib/libgraphene-1.0.so.0
-lib/libgraphene-1.0.so.0.600.0
+lib/libgraphene-1.0.so.0.800.2
libdata/pkgconfig/graphene-1.0.pc
libdata/pkgconfig/graphene-gobject-1.0.pc
share/gir-1.0/Graphene-1.0.gir
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 466925d59b34..8eebb0584a3a 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libchamplain
-PORTVERSION= 0.12.15
+PORTVERSION= 0.12.16
CATEGORIES= graphics
MASTER_SITES= GNOME
diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo
index 7c31e86df999..f25e25b032a8 100644
--- a/graphics/libchamplain/distinfo
+++ b/graphics/libchamplain/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496085876
-SHA256 (libchamplain-0.12.15.tar.xz) = 54721a210bdef6d73c5192ed83542023117bf5d7441257e7a7a9f8c05550b874
-SIZE (libchamplain-0.12.15.tar.xz) = 616692
+TIMESTAMP = 1516304081
+SHA256 (libchamplain-0.12.16.tar.xz) = 4a7e31cf7889669aebf04631543af64435edd989685159b804911c6005db908d
+SIZE (libchamplain-0.12.16.tar.xz) = 623912
diff --git a/graphics/libchamplain/pkg-plist b/graphics/libchamplain/pkg-plist
index bca36853b732..b91eaf60d347 100644
--- a/graphics/libchamplain/pkg-plist
+++ b/graphics/libchamplain/pkg-plist
@@ -46,11 +46,11 @@ lib/girepository-1.0/GtkChamplain-%%VERSION%%.typelib
lib/libchamplain-%%VERSION%%.a
lib/libchamplain-%%VERSION%%.so
lib/libchamplain-%%VERSION%%.so.0
-lib/libchamplain-%%VERSION%%.so.0.9.1
+lib/libchamplain-%%VERSION%%.so.0.10.0
lib/libchamplain-gtk-%%VERSION%%.a
lib/libchamplain-gtk-%%VERSION%%.so
lib/libchamplain-gtk-%%VERSION%%.so.0
-lib/libchamplain-gtk-%%VERSION%%.so.0.9.1
+lib/libchamplain-gtk-%%VERSION%%.so.0.10.0
libdata/pkgconfig/champlain-%%VERSION%%.pc
libdata/pkgconfig/champlain-gtk-%%VERSION%%.pc
share/gir-1.0/Champlain-%%VERSION%%.gir
@@ -94,7 +94,6 @@ share/gtk-doc/html/libchamplain-%%VERSION%%/ch05.html
share/gtk-doc/html/libchamplain-%%VERSION%%/ch06.html
share/gtk-doc/html/libchamplain-%%VERSION%%/home.png
share/gtk-doc/html/libchamplain-%%VERSION%%/index.html
-share/gtk-doc/html/libchamplain-%%VERSION%%/index.sgml
share/gtk-doc/html/libchamplain-%%VERSION%%/ix01.html
share/gtk-doc/html/libchamplain-%%VERSION%%/ix02.html
share/gtk-doc/html/libchamplain-%%VERSION%%/ix03.html
@@ -124,7 +123,6 @@ share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/GtkChamplainEmbed.html
share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/annotation-glossary.html
share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/home.png
share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/index.html
-share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/index.sgml
share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/left-insensitive.png
share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/left.png
share/gtk-doc/html/libchamplain-gtk-%%VERSION%%/libchamplain-gtk-%%VERSION%%.devhelp2
diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile
index 221a78a8ca3e..44a2050e57a8 100644
--- a/graphics/libepoxy/Makefile
+++ b/graphics/libepoxy/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libepoxy
-PORTVERSION= 1.4.3
+PORTVERSION= 1.5.2
CATEGORIES= graphics
MASTER_SITES= https://github.com/anholt/${PORTNAME}/releases/download/${PORTVERSION}/
@@ -25,6 +25,6 @@ OPTIONS_EXCLUDE_mips= EGL
EGL_DESC= Build EGL support
EGL_USE= GL=egl
-EGL_MESON_YES= enable-egl
+EGL_MESON_YES= egl
.include <bsd.port.mk>
diff --git a/graphics/libepoxy/distinfo b/graphics/libepoxy/distinfo
index 46e6d788755e..f26dd70e3113 100644
--- a/graphics/libepoxy/distinfo
+++ b/graphics/libepoxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496777736
-SHA256 (libepoxy-1.4.3.tar.xz) = 0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6
-SIZE (libepoxy-1.4.3.tar.xz) = 783624
+TIMESTAMP = 1530384379
+SHA256 (libepoxy-1.5.2.tar.xz) = a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8
+SIZE (libepoxy-1.5.2.tar.xz) = 810044
diff --git a/graphics/libepoxy/files/patch-test_dlwrap.c b/graphics/libepoxy/files/patch-test_dlwrap.c
deleted file mode 100644
index 168db144fad2..000000000000
--- a/graphics/libepoxy/files/patch-test_dlwrap.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/dlwrap.c.orig 2017-03-28 08:56:46 UTC
-+++ test/dlwrap.c
-@@ -34,6 +34,8 @@
-
- /* dladdr is a glibc extension */
- #define _GNU_SOURCE
-+/* FreeBSD needs this to make asprintf() and dlvsym() visible */
-+#define __BSD_VISIBLE 1
- #include <dlfcn.h>
-
- #include <stdbool.h>
diff --git a/graphics/libgxps/Makefile b/graphics/libgxps/Makefile
index bf5d94e3f772..68a31b78a44e 100644
--- a/graphics/libgxps/Makefile
+++ b/graphics/libgxps/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libgxps
-PORTVERSION= 0.2.5
+PORTVERSION= 0.3.0
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -15,11 +15,11 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \
libpng.so:graphics/png \
liblcms2.so:graphics/lcms2
-USES= gettext gmake jpeg libtool libarchive localbase pathfix pkgconfig tar:xz
+USES= gettext jpeg libarchive localbase meson pkgconfig tar:xz
USE_LDCONFIG= yes
-USE_GNOME= cairo glib20 gnomeprefix introspection:build
-GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
+USE_GNOME= cairo glib20 introspection:build
+
+MESON_ARGS= -Denable-test=false
OPTIONS_DEFINE= DOCS
diff --git a/graphics/libgxps/distinfo b/graphics/libgxps/distinfo
index 4a44e30a7f2a..e27dadf7c29a 100644
--- a/graphics/libgxps/distinfo
+++ b/graphics/libgxps/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497509545
-SHA256 (gnome3/libgxps-0.2.5.tar.xz) = 3e7594c5c9b077171ec9ccd3ff2b4f4c4b29884d26d4f35e740c8887b40199a0
-SIZE (gnome3/libgxps-0.2.5.tar.xz) = 346532
+TIMESTAMP = 1516305244
+SHA256 (gnome3/libgxps-0.3.0.tar.xz) = 412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae
+SIZE (gnome3/libgxps-0.3.0.tar.xz) = 93000
diff --git a/graphics/libgxps/pkg-plist b/graphics/libgxps/pkg-plist
index e42b27149c59..18d92361ac63 100644
--- a/graphics/libgxps/pkg-plist
+++ b/graphics/libgxps/pkg-plist
@@ -13,32 +13,8 @@ include/libgxps/gxps-page.h
include/libgxps/gxps-version.h
include/libgxps/gxps.h
lib/girepository-1.0/GXPS-0.1.typelib
-lib/libgxps.a
lib/libgxps.so
lib/libgxps.so.2
-lib/libgxps.so.2.2.1
+lib/libgxps.so.2.2.2
libdata/pkgconfig/libgxps.pc
-%%PORTDOCS%%%%DOCSDIR%%/GXPSCoreProperties.html
-%%PORTDOCS%%%%DOCSDIR%%/GXPSDocument.html
-%%PORTDOCS%%%%DOCSDIR%%/GXPSDocumentStructure.html
-%%PORTDOCS%%%%DOCSDIR%%/GXPSFile.html
-%%PORTDOCS%%%%DOCSDIR%%/GXPSPage.html
-%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-0-2-1.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-0-2-3.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
-%%PORTDOCS%%%%DOCSDIR%%/ch01.html
-%%PORTDOCS%%%%DOCSDIR%%/home.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/left.png
-%%PORTDOCS%%%%DOCSDIR%%/libgxps-GXPS-Links.html
-%%PORTDOCS%%%%DOCSDIR%%/libgxps-GXPSError.html
-%%PORTDOCS%%%%DOCSDIR%%/libgxps-Version-Information.html
-%%PORTDOCS%%%%DOCSDIR%%/libgxps.devhelp2
-%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/right.png
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/up.png
share/gir-1.0/GXPS-0.1.gir
diff --git a/irc/polari/Makefile b/irc/polari/Makefile
index 3598c800db6f..3d65a5b5d018 100644
--- a/irc/polari/Makefile
+++ b/irc/polari/Makefile
@@ -2,27 +2,32 @@
# $FreeBSD$
PORTNAME= polari
-PORTVERSION= 3.18.1
+PORTVERSION= 3.28.0
CATEGORIES= irc gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Internet Relay Chat (IRC) client designed for GNOME 3
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= appstream-util:devel/appstream-glib \
+ gjs-console:lang/gjs \
+ itstool:textproc/itstool
LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-glib \
- libgjs.so:lang/gjs
+ libsecret-1.so:security/libsecret \
+ libtelepathy-logger.so:net-im/telepathy-logger
+RUN_DEPENDS= gjs-console:lang/gjs
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME= gnomedesktop3 gtk30 intlhack introspection:build
+USES= desktop-file-utils gettext gnome localbase \
+ meson pkgconfig tar:xz
+USE_GNOME= cairo gtk30 introspection
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.Polari.gschema.xml
diff --git a/irc/polari/distinfo b/irc/polari/distinfo
index ded925cdb2ae..7225cbcbac77 100644
--- a/irc/polari/distinfo
+++ b/irc/polari/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/polari-3.18.1.tar.xz) = 554a089b1edf88d49408ecf6ce79ad6f7114ecf557753c8f39a9af153a76843a
-SIZE (gnome3/polari-3.18.1.tar.xz) = 478244
+TIMESTAMP = 1526108898
+SHA256 (gnome/polari-3.28.0.tar.xz) = a5b53101b9670c7c70a60e30620b3c9234b9f99981a907b615e5d06e336eef23
+SIZE (gnome/polari-3.28.0.tar.xz) = 1158792
diff --git a/irc/polari/pkg-plist b/irc/polari/pkg-plist
index 58a92c404b6c..06cf6a286ec7 100644
--- a/irc/polari/pkg-plist
+++ b/irc/polari/pkg-plist
@@ -1,18 +1,133 @@
bin/polari
lib/polari/girepository-1.0/Polari-1.0.typelib
lib/polari/libpolari-1.0.so
-share/appdata/org.gnome.Polari.appdata.xml
share/applications/org.gnome.Polari.desktop
share/dbus-1/services/org.freedesktop.Telepathy.Client.Polari.service
share/dbus-1/services/org.gnome.Polari.service
-share/icons/hicolor/16x16/apps/polari.png
-share/icons/hicolor/22x22/apps/polari.png
-share/icons/hicolor/24x24/apps/polari.png
-share/icons/hicolor/256x256/apps/polari.png
-share/icons/hicolor/32x32/apps/polari.png
-share/icons/hicolor/48x48/apps/polari.png
-share/icons/hicolor/512x512/apps/polari.png
-share/icons/hicolor/scalable/apps/polari-symbolic.svg
+share/help/C/org.gnome.Polari/images/Polari.png
+share/help/C/org.gnome.Polari/images/polari-paste.png
+share/help/C/org.gnome.Polari/images/polari-screenshot.png
+share/help/C/org.gnome.Polari/index.page
+share/help/C/org.gnome.Polari/introduction.page
+share/help/C/org.gnome.Polari/irc-commands.page
+share/help/C/org.gnome.Polari/irc-join-room.page
+share/help/C/org.gnome.Polari/irc-nick-password.page
+share/help/C/org.gnome.Polari/irc-start-conversation.page
+share/help/C/org.gnome.Polari/legal.xml
+share/help/C/org.gnome.Polari/network-connect.page
+share/help/C/org.gnome.Polari/overview.page
+share/help/C/org.gnome.Polari/sharing.page
+share/help/cs/org.gnome.Polari/images/Polari.png
+share/help/cs/org.gnome.Polari/images/polari-paste.png
+share/help/cs/org.gnome.Polari/images/polari-screenshot.png
+share/help/cs/org.gnome.Polari/index.page
+share/help/cs/org.gnome.Polari/introduction.page
+share/help/cs/org.gnome.Polari/irc-commands.page
+share/help/cs/org.gnome.Polari/irc-join-room.page
+share/help/cs/org.gnome.Polari/irc-nick-password.page
+share/help/cs/org.gnome.Polari/irc-start-conversation.page
+share/help/cs/org.gnome.Polari/legal.xml
+share/help/cs/org.gnome.Polari/network-connect.page
+share/help/cs/org.gnome.Polari/overview.page
+share/help/cs/org.gnome.Polari/sharing.page
+share/help/de/org.gnome.Polari/images/Polari.png
+share/help/de/org.gnome.Polari/images/polari-paste.png
+share/help/de/org.gnome.Polari/images/polari-screenshot.png
+share/help/de/org.gnome.Polari/index.page
+share/help/de/org.gnome.Polari/introduction.page
+share/help/de/org.gnome.Polari/irc-commands.page
+share/help/de/org.gnome.Polari/irc-join-room.page
+share/help/de/org.gnome.Polari/irc-nick-password.page
+share/help/de/org.gnome.Polari/irc-start-conversation.page
+share/help/de/org.gnome.Polari/legal.xml
+share/help/de/org.gnome.Polari/network-connect.page
+share/help/de/org.gnome.Polari/overview.page
+share/help/de/org.gnome.Polari/sharing.page
+share/help/es/org.gnome.Polari/images/Polari.png
+share/help/es/org.gnome.Polari/images/polari-paste.png
+share/help/es/org.gnome.Polari/images/polari-screenshot.png
+share/help/es/org.gnome.Polari/index.page
+share/help/es/org.gnome.Polari/introduction.page
+share/help/es/org.gnome.Polari/irc-commands.page
+share/help/es/org.gnome.Polari/irc-join-room.page
+share/help/es/org.gnome.Polari/irc-nick-password.page
+share/help/es/org.gnome.Polari/irc-start-conversation.page
+share/help/es/org.gnome.Polari/legal.xml
+share/help/es/org.gnome.Polari/network-connect.page
+share/help/es/org.gnome.Polari/overview.page
+share/help/es/org.gnome.Polari/sharing.page
+share/help/fr/org.gnome.Polari/images/Polari.png
+share/help/fr/org.gnome.Polari/images/polari-paste.png
+share/help/fr/org.gnome.Polari/images/polari-screenshot.png
+share/help/fr/org.gnome.Polari/index.page
+share/help/fr/org.gnome.Polari/introduction.page
+share/help/fr/org.gnome.Polari/irc-commands.page
+share/help/fr/org.gnome.Polari/irc-join-room.page
+share/help/fr/org.gnome.Polari/irc-nick-password.page
+share/help/fr/org.gnome.Polari/irc-start-conversation.page
+share/help/fr/org.gnome.Polari/legal.xml
+share/help/fr/org.gnome.Polari/network-connect.page
+share/help/fr/org.gnome.Polari/overview.page
+share/help/fr/org.gnome.Polari/sharing.page
+share/help/hu/org.gnome.Polari/images/Polari.png
+share/help/hu/org.gnome.Polari/images/polari-paste.png
+share/help/hu/org.gnome.Polari/images/polari-screenshot.png
+share/help/hu/org.gnome.Polari/index.page
+share/help/hu/org.gnome.Polari/introduction.page
+share/help/hu/org.gnome.Polari/irc-commands.page
+share/help/hu/org.gnome.Polari/irc-join-room.page
+share/help/hu/org.gnome.Polari/irc-nick-password.page
+share/help/hu/org.gnome.Polari/irc-start-conversation.page
+share/help/hu/org.gnome.Polari/legal.xml
+share/help/hu/org.gnome.Polari/network-connect.page
+share/help/hu/org.gnome.Polari/overview.page
+share/help/hu/org.gnome.Polari/sharing.page
+share/help/pl/org.gnome.Polari/images/Polari.png
+share/help/pl/org.gnome.Polari/images/polari-paste.png
+share/help/pl/org.gnome.Polari/images/polari-screenshot.png
+share/help/pl/org.gnome.Polari/index.page
+share/help/pl/org.gnome.Polari/introduction.page
+share/help/pl/org.gnome.Polari/irc-commands.page
+share/help/pl/org.gnome.Polari/irc-join-room.page
+share/help/pl/org.gnome.Polari/irc-nick-password.page
+share/help/pl/org.gnome.Polari/irc-start-conversation.page
+share/help/pl/org.gnome.Polari/legal.xml
+share/help/pl/org.gnome.Polari/network-connect.page
+share/help/pl/org.gnome.Polari/overview.page
+share/help/pl/org.gnome.Polari/sharing.page
+share/help/pt_BR/org.gnome.Polari/images/Polari.png
+share/help/pt_BR/org.gnome.Polari/images/polari-paste.png
+share/help/pt_BR/org.gnome.Polari/images/polari-screenshot.png
+share/help/pt_BR/org.gnome.Polari/index.page
+share/help/pt_BR/org.gnome.Polari/introduction.page
+share/help/pt_BR/org.gnome.Polari/irc-commands.page
+share/help/pt_BR/org.gnome.Polari/irc-join-room.page
+share/help/pt_BR/org.gnome.Polari/irc-nick-password.page
+share/help/pt_BR/org.gnome.Polari/irc-start-conversation.page
+share/help/pt_BR/org.gnome.Polari/legal.xml
+share/help/pt_BR/org.gnome.Polari/network-connect.page
+share/help/pt_BR/org.gnome.Polari/overview.page
+share/help/pt_BR/org.gnome.Polari/sharing.page
+share/help/sv/org.gnome.Polari/images/Polari.png
+share/help/sv/org.gnome.Polari/images/polari-paste.png
+share/help/sv/org.gnome.Polari/images/polari-screenshot.png
+share/help/sv/org.gnome.Polari/index.page
+share/help/sv/org.gnome.Polari/introduction.page
+share/help/sv/org.gnome.Polari/irc-commands.page
+share/help/sv/org.gnome.Polari/irc-join-room.page
+share/help/sv/org.gnome.Polari/irc-nick-password.page
+share/help/sv/org.gnome.Polari/irc-start-conversation.page
+share/help/sv/org.gnome.Polari/legal.xml
+share/help/sv/org.gnome.Polari/network-connect.page
+share/help/sv/org.gnome.Polari/overview.page
+share/help/sv/org.gnome.Polari/sharing.page
+share/icons/hicolor/16x16/apps/org.gnome.Polari.png
+share/icons/hicolor/22x22/apps/org.gnome.Polari.png
+share/icons/hicolor/24x24/apps/org.gnome.Polari.png
+share/icons/hicolor/32x32/apps/org.gnome.Polari.png
+share/icons/hicolor/48x48/apps/org.gnome.Polari.png
+share/icons/hicolor/512x512/apps/org.gnome.Polari.png
+share/icons/hicolor/symbolic/apps/org.gnome.Polari-symbolic.svg
share/locale/ar/LC_MESSAGES/polari.mo
share/locale/as/LC_MESSAGES/polari.mo
share/locale/bs/LC_MESSAGES/polari.mo
@@ -40,8 +155,10 @@ share/locale/kk/LC_MESSAGES/polari.mo
share/locale/ko/LC_MESSAGES/polari.mo
share/locale/lt/LC_MESSAGES/polari.mo
share/locale/lv/LC_MESSAGES/polari.mo
+share/locale/ml/LC_MESSAGES/polari.mo
share/locale/nb/LC_MESSAGES/polari.mo
share/locale/ne/LC_MESSAGES/polari.mo
+share/locale/nl/LC_MESSAGES/polari.mo
share/locale/oc/LC_MESSAGES/polari.mo
share/locale/pa/LC_MESSAGES/polari.mo
share/locale/pl/LC_MESSAGES/polari.mo
@@ -58,11 +175,11 @@ share/locale/te/LC_MESSAGES/polari.mo
share/locale/tg/LC_MESSAGES/polari.mo
share/locale/tr/LC_MESSAGES/polari.mo
share/locale/uk/LC_MESSAGES/polari.mo
+share/locale/vi/LC_MESSAGES/polari.mo
share/locale/zh_CN/LC_MESSAGES/polari.mo
share/locale/zh_HK/LC_MESSAGES/polari.mo
share/locale/zh_TW/LC_MESSAGES/polari.mo
+share/metainfo/org.gnome.Polari.appdata.xml
%%DATADIR%%/gir-1.0/Polari-1.0.gir
-%%DATADIR%%/org.gnome.Polari
-%%DATADIR%%/org.gnome.Polari.data.gresource
-%%DATADIR%%/org.gnome.Polari.src.gresource
+%%DATADIR%%/org.gnome.Polari.Autostart.desktop
share/telepathy/clients/Polari.client
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 46ecfcac056d..f299565319a7 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gjs
-PORTVERSION= 1.44.0
-PORTREVISION= 3
+PORTVERSION= 1.52.3
CATEGORIES= lang gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,20 +10,22 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME Javascript binding
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libmozjs-24.so:lang/spidermonkey24
+LICENSE= MPL11 LGPL20+ GPLv2+
+LICENSE_COMB= multi
+LICENSE_FILE_MPL11= ${WRKSRC}/COPYING
+LICENSE_FILE_LGPL20+= ${WRKSRC}/COPYING.LGPL
+
+LIB_DEPENDS= libmozjs-52.so:lang/spidermonkey52 \
+ libffi.so:devel/libffi
USES= compiler:c++11-lib gettext gmake gnome libtool \
- pathfix pkgconfig python:build tar:xz
-USE_GNOME= cairo glib20 gnomeprefix introspection:build \
- intlhack
+ localbase pathfix pkgconfig python:build readline tar:xz
+USE_GNOME= cairo gdkpixbuf2 gtk30 introspection
+USE_XORG= x11 xext
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+CONFIGURE_ARGS+=--disable-profiler
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-post-install:
- @${RM} -r ${STAGEDIR}${PREFIX}/libexec/gjs
-
.include <bsd.port.mk>
diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo
index fa8abb9c00b9..e2fdb3219de9 100644
--- a/lang/gjs/distinfo
+++ b/lang/gjs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gjs-1.44.0.tar.xz) = 88c960f6ad47a6931d123f5d6317d13704f58572f68a4391913a254ff27dce80
-SIZE (gnome3/gjs-1.44.0.tar.xz) = 486144
+TIMESTAMP = 1525963807
+SHA256 (gnome3/gjs-1.52.3.tar.xz) = ce21d8a83f6077b011b8834c4936281be65b2b62387f0745c3eb9adf780996fc
+SIZE (gnome3/gjs-1.52.3.tar.xz) = 626512
diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist
index a583616dcc2f..ef652bf14beb 100644
--- a/lang/gjs/pkg-plist
+++ b/lang/gjs/pkg-plist
@@ -1,37 +1,15 @@
bin/gjs
bin/gjs-console
-include/gjs-1.0/gi/arg.h
-include/gjs-1.0/gi/boxed.h
-include/gjs-1.0/gi/closure.h
-include/gjs-1.0/gi/enumeration.h
-include/gjs-1.0/gi/foreign.h
-include/gjs-1.0/gi/function.h
-include/gjs-1.0/gi/fundamental.h
-include/gjs-1.0/gi/gerror.h
-include/gjs-1.0/gi/gtype.h
-include/gjs-1.0/gi/interface.h
-include/gjs-1.0/gi/keep-alive.h
-include/gjs-1.0/gi/ns.h
-include/gjs-1.0/gi/object.h
-include/gjs-1.0/gi/param.h
-include/gjs-1.0/gi/repo.h
-include/gjs-1.0/gi/union.h
-include/gjs-1.0/gi/value.h
-include/gjs-1.0/gjs/byteArray.h
-include/gjs-1.0/gjs/compat.h
include/gjs-1.0/gjs/context.h
include/gjs-1.0/gjs/coverage.h
-include/gjs-1.0/gjs/gjs-module.h
include/gjs-1.0/gjs/gjs.h
-include/gjs-1.0/gjs/importer.h
-include/gjs-1.0/gjs/jsapi-util.h
-include/gjs-1.0/gjs/mem.h
-include/gjs-1.0/gjs/native.h
-include/gjs-1.0/gjs/runtime.h
-include/gjs-1.0/gjs/type-module.h
+include/gjs-1.0/gjs/macros.h
+include/gjs-1.0/gjs/profiler.h
+include/gjs-1.0/util/error.h
lib/gjs/girepository-1.0/GjsPrivate-1.0.typelib
lib/libgjs.so
lib/libgjs.so.0
lib/libgjs.so.0.0.0
libdata/pkgconfig/gjs-1.0.pc
-libdata/pkgconfig/gjs-internals-1.0.pc
+%%DATADIR%%-1.0/lsan/lsan.supp
+%%DATADIR%%-1.0/valgrind/gjs.supp
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index b53b8e0244e4..3011e91e185a 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= vala
-PORTVERSION= 0.36.15
-PORTREVISION= 1
+PORTVERSION= 0.40.7
PORTEPOCH= 1
CATEGORIES= lang gnome
MASTER_SITES= GNOME
@@ -13,6 +12,9 @@ COMMENT= Programming language and compiler that converts Vala code into C code
LICENSE= LGPL21
+BUILD_DEPENDS= graphviz>=0:graphics/graphviz
+RUN_DEPENDS= graphviz>=0:graphics/graphviz
+
PORTSCOUT= limitw:1,even
USES= bison gettext-runtime gmake gnome libtool \
@@ -24,6 +26,6 @@ INSTALL_TARGET= install-strip
VALA_VER= ${PORTVERSION:R}
-PLIST_SUB= VERSION=0.36
+PLIST_SUB= VERSION=0.40
.include <bsd.port.mk>
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index 591da6e218e8..c07fb7e22b40 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534454275
-SHA256 (vala-0.36.15.tar.xz) = 3d9613e6fd95b3bf225583466aa3d6affa80345812b8e0cd3b54fc0897e49686
-SIZE (vala-0.36.15.tar.xz) = 2880300
+TIMESTAMP = 1529611521
+SHA256 (vala-0.40.7.tar.xz) = bee662f60ab3a0d5266c1dd66f508cd9ed3254d74622d23c2d6bd94c91990aec
+SIZE (vala-0.40.7.tar.xz) = 3359644
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index e1831ab5744b..938292aa3683 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -4,25 +4,34 @@ bin/vala-gen-introspect
bin/vala-gen-introspect-%%VERSION%%
bin/valac
bin/valac-%%VERSION%%
-bin/vapicheck
-bin/vapicheck-%%VERSION%%
+bin/valadoc
+bin/valadoc-%%VERSION%%
bin/vapigen
bin/vapigen-%%VERSION%%
include/vala-%%VERSION%%/vala.h
-include/vala-%%VERSION%%/valaccode.h
-include/vala-%%VERSION%%/valacodegen.h
include/vala-%%VERSION%%/valagee.h
+include/valadoc-%%VERSION%%/valadoc.h
lib/libvala-%%VERSION%%.so
lib/libvala-%%VERSION%%.so.0
lib/libvala-%%VERSION%%.so.0.0.0
+lib/libvaladoc-%%VERSION%%.so
+lib/libvaladoc-%%VERSION%%.so.0
+lib/libvaladoc-%%VERSION%%.so.0.0.0
lib/vala-%%VERSION%%/gen-introspect-%%VERSION%%
+lib/vala-%%VERSION%%/libvalaccodegen.so
+lib/valadoc/doclets/devhelp/libdoclet.so
+lib/valadoc/doclets/gtkdoc/libdoclet.so
+lib/valadoc/doclets/html/libdoclet.so
libdata/pkgconfig/libvala-%%VERSION%%.pc
+libdata/pkgconfig/valadoc-%%VERSION%%.pc
libdata/pkgconfig/vapigen-%%VERSION%%.pc
libdata/pkgconfig/vapigen.pc
man/man1/vala-gen-introspect-%%VERSION%%.1.gz
man/man1/vala-gen-introspect.1.gz
man/man1/valac-%%VERSION%%.1.gz
man/man1/valac.1.gz
+man/man1/valadoc-%%VERSION%%.1.gz
+man/man1/valadoc.1.gz
man/man1/vapigen-%%VERSION%%.1.gz
man/man1/vapigen.1.gz
share/aclocal/vala.m4
@@ -107,8 +116,6 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/gdu.vapi
%%DATADIR%%-%%VERSION%%/vapi/gedit-2.20.deps
%%DATADIR%%-%%VERSION%%/vapi/gedit-2.20.vapi
-%%DATADIR%%-%%VERSION%%/vapi/gedit.deps
-%%DATADIR%%-%%VERSION%%/vapi/gedit.vapi
%%DATADIR%%-%%VERSION%%/vapi/geocode-glib-1.0.deps
%%DATADIR%%-%%VERSION%%/vapi/geocode-glib-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gio-2.0.vapi
@@ -122,7 +129,6 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/gnet-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gnome-desktop-2.0.deps
%%DATADIR%%-%%VERSION%%/vapi/gnome-desktop-2.0.vapi
-%%DATADIR%%-%%VERSION%%/vapi/gnome-keyring-1.vapi
%%DATADIR%%-%%VERSION%%/vapi/gnome-vfs-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gnutls.vapi
%%DATADIR%%-%%VERSION%%/vapi/gobject-2.0.vapi
@@ -132,6 +138,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/graphene-1.0.deps
%%DATADIR%%-%%VERSION%%/vapi/graphene-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gsl.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gst-editing-services-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gst-editing-services-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gstreamer-0.10.deps
%%DATADIR%%-%%VERSION%%/vapi/gstreamer-0.10.vapi
%%DATADIR%%-%%VERSION%%/vapi/gstreamer-1.0.vapi
@@ -207,6 +215,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/gstreamer-video-0.10.vapi
%%DATADIR%%-%%VERSION%%/vapi/gstreamer-video-1.0.deps
%%DATADIR%%-%%VERSION%%/vapi/gstreamer-video-1.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gstreamer-webrtc-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gstreamer-webrtc-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gtk+-2.0.deps
%%DATADIR%%-%%VERSION%%/vapi/gtk+-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gtk+-3.0.deps
@@ -223,8 +233,6 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/gtkmozembed.vapi
%%DATADIR%%-%%VERSION%%/vapi/gtksourceview-2.0.deps
%%DATADIR%%-%%VERSION%%/vapi/gtksourceview-2.0.vapi
-%%DATADIR%%-%%VERSION%%/vapi/gtksourceview-3.0.deps
-%%DATADIR%%-%%VERSION%%/vapi/gtksourceview-3.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gudev-1.0.deps
%%DATADIR%%-%%VERSION%%/vapi/gudev-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/hal.deps
@@ -233,6 +241,7 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/hildon-1.vapi
%%DATADIR%%-%%VERSION%%/vapi/hildon-fm-2.deps
%%DATADIR%%-%%VERSION%%/vapi/hildon-fm-2.vapi
+%%DATADIR%%-%%VERSION%%/vapi/javascriptcoregtk-4.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/json-glib-1.0.deps
%%DATADIR%%-%%VERSION%%/vapi/json-glib-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/libarchive.deps
@@ -247,8 +256,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/libgda-4.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/libgda-report-4.0.deps
%%DATADIR%%-%%VERSION%%/vapi/libgda-report-4.0.vapi
-%%DATADIR%%-%%VERSION%%/vapi/libgdata.deps
-%%DATADIR%%-%%VERSION%%/vapi/libgdata.vapi
+%%DATADIR%%-%%VERSION%%/vapi/libgeoclue-2.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/libgeoclue-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/libglade-2.0.deps
%%DATADIR%%-%%VERSION%%/vapi/libglade-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/libgnome-2.0.vapi
@@ -279,8 +288,6 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/libpeas-gtk-1.0.deps
%%DATADIR%%-%%VERSION%%/vapi/libpeas-gtk-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/libpq.vapi
-%%DATADIR%%-%%VERSION%%/vapi/librsvg-2.0.deps
-%%DATADIR%%-%%VERSION%%/vapi/librsvg-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/libsexy.deps
%%DATADIR%%-%%VERSION%%/vapi/libsexy.vapi
%%DATADIR%%-%%VERSION%%/vapi/libsoup-2.2.vapi
@@ -289,7 +296,6 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/libusb-1.0.deps
%%DATADIR%%-%%VERSION%%/vapi/libusb-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/libusb.vapi
-%%DATADIR%%-%%VERSION%%/vapi/libvala-%%VERSION%%.vapi
%%DATADIR%%-%%VERSION%%/vapi/libwnck-1.0.deps
%%DATADIR%%-%%VERSION%%/vapi/libwnck-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/libwnck-3.0.deps
@@ -371,3 +377,37 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
%%DATADIR%%-%%VERSION%%/vapi/xtst.vapi
%%DATADIR%%-%%VERSION%%/vapi/zlib.vapi
%%DATADIR%%/Makefile.vapigen
+%%DATADIR%%/vapi/libvala-%%VERSION%%.vapi
+%%DATADIR%%/vapi/valadoc-%%VERSION%%.deps
+%%DATADIR%%/vapi/valadoc-%%VERSION%%.vapi
+%%DATADIR%%doc/icons/abstractclass.png
+%%DATADIR%%doc/icons/abstractmethod.png
+%%DATADIR%%doc/icons/abstractproperty.png
+%%DATADIR%%doc/icons/class.png
+%%DATADIR%%doc/icons/coll_close.png
+%%DATADIR%%doc/icons/coll_open.png
+%%DATADIR%%doc/icons/constant.png
+%%DATADIR%%doc/icons/constructor.png
+%%DATADIR%%doc/icons/delegate.png
+%%DATADIR%%doc/icons/devhelpstyle.css
+%%DATADIR%%doc/icons/enum.png
+%%DATADIR%%doc/icons/enumvalue.png
+%%DATADIR%%doc/icons/errorcode.png
+%%DATADIR%%doc/icons/errordomain.png
+%%DATADIR%%doc/icons/field.png
+%%DATADIR%%doc/icons/interface.png
+%%DATADIR%%doc/icons/method.png
+%%DATADIR%%doc/icons/namespace.png
+%%DATADIR%%doc/icons/package.png
+%%DATADIR%%doc/icons/packages.png
+%%DATADIR%%doc/icons/property.png
+%%DATADIR%%doc/icons/scripts.js
+%%DATADIR%%doc/icons/signal.png
+%%DATADIR%%doc/icons/staticmethod.png
+%%DATADIR%%doc/icons/struct.png
+%%DATADIR%%doc/icons/style.css
+%%DATADIR%%doc/icons/tip.png
+%%DATADIR%%doc/icons/virtualmethod.png
+%%DATADIR%%doc/icons/virtualproperty.png
+%%DATADIR%%doc/icons/warning.png
+%%DATADIR%%doc/icons/wikistyle.css
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index da099df05e65..798efd7ab410 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.5.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \
http://cyrusimap.org/releases/
diff --git a/mail/cyrus-imapd25/files/patch-config.h.in b/mail/cyrus-imapd25/files/patch-config.h.in
new file mode 100644
index 000000000000..3a14c3a60307
--- /dev/null
+++ b/mail/cyrus-imapd25/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in.orig 2017-05-09 05:22:02.000000000 +0200
++++ config.h.in 2018-04-08 23:58:00.107115000 +0200
+@@ -397,6 +397,9 @@
+ /* Do we have zlib? */
+ #undef HAVE_ZLIB
+
++/* Does icaltimetype have is_utc field? */
++#undef ICALTIME_HAS_IS_UTC
++
+ /* Define to the sub-directory where libtool stores uninstalled libraries. */
+ #undef LT_OBJDIR
+
diff --git a/mail/cyrus-imapd25/files/patch-configure b/mail/cyrus-imapd25/files/patch-configure
index 4d3deee12dcf..392d60d5bac8 100644
--- a/mail/cyrus-imapd25/files/patch-configure
+++ b/mail/cyrus-imapd25/files/patch-configure
@@ -1,22 +1,18 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig 2010-10-18 21:36:00.000000000 +0900
-+++ configure 2010-10-18 23:50:45.966557478 +0900
-@@ -9501,7 +9501,7 @@
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-+LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+--- configure.orig 2017-05-09 05:22:02.000000000 +0200
++++ configure 2018-04-10 21:57:26.402409000 +0200
+@@ -18751,6 +18751,15 @@
+ rm -f conftest*
-@@ -9803,7 +9803,7 @@
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
- elif test "$gss_impl" = "heimdal"; then
- CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
-- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
- elif test "$gss_impl" = "cybersafe03"; then
- # Version of CyberSafe with two libraries
+
++ ac_fn_c_check_member "$LINENO" "icaltimetype" "is_utc" "ac_cv_member_icaltimetype_is_utc" "#include <libical/ical.h>
++"
++if test "x$ac_cv_member_icaltimetype_is_utc" = xyes; then :
++
++$as_echo "#define ICALTIME_HAS_IS_UTC /**/" >>confdefs.h
++
++fi
++
++
+ ENABLE_RSCALE=yes
+
+ pkg_failed=no
diff --git a/mail/cyrus-imapd25/files/patch-imap_http__caldav.c b/mail/cyrus-imapd25/files/patch-imap_http__caldav.c
new file mode 100644
index 000000000000..363e5046f432
--- /dev/null
+++ b/mail/cyrus-imapd25/files/patch-imap_http__caldav.c
@@ -0,0 +1,11 @@
+--- imap/http_caldav.c.orig 2018-04-08 22:00:44 UTC
++++ imap/http_caldav.c
+@@ -2023,7 +2023,7 @@ static struct icaltimetype icaltime_from_rfc3339_strin
+ goto fail;
+ }
+
+- tt.is_utc = 1;
++ icaltime_set_utc(&tt, 1);
+ return tt;
+
+ fail:
diff --git a/mail/cyrus-imapd25/files/patch-imap_http__dav.h b/mail/cyrus-imapd25/files/patch-imap_http__dav.h
new file mode 100644
index 000000000000..bfc5355d4197
--- /dev/null
+++ b/mail/cyrus-imapd25/files/patch-imap_http__dav.h
@@ -0,0 +1,10 @@
+--- imap/http_dav.h.orig 2018-04-10 19:29:50 UTC
++++ imap/http_dav.h
+@@ -628,4 +628,7 @@ int proppatch_todb(xmlNodePtr prop, unsigned set, stru
+ int proppatch_restype(xmlNodePtr prop, unsigned set, struct proppatch_ctx *pctx,
+ struct propstat propstat[], void *rock);
+
++/* from upstream imap/ical_support.h need to put it somewhere ... */
++extern void icaltime_set_utc(struct icaltimetype *t, int set);
++
+ #endif /* HTTP_DAV_H */
diff --git a/mail/cyrus-imapd25/files/patch-imap_http__timezone.c b/mail/cyrus-imapd25/files/patch-imap_http__timezone.c
new file mode 100644
index 000000000000..6f4e953054d2
--- /dev/null
+++ b/mail/cyrus-imapd25/files/patch-imap_http__timezone.c
@@ -0,0 +1,113 @@
+--- imap/http_timezone.c.orig 2018-04-10 19:19:55 UTC
++++ imap/http_timezone.c
+@@ -388,7 +388,7 @@ static int action_list(struct transaction_t *txn)
+ param = hash_lookup("changedsince", &txn->req_qparams);
+ if (param) {
+ changedsince = icaltime_from_string(param->s);
+- if (param->next || !changedsince.is_utc) { /* once only, UTC */
++ if (param->next || !icaltime_is_utc(changedsince)) { /* once only, UTC */
+ return json_error_response(txn, TZ_INVALID_CHANGEDSINCE,
+ param, &changedsince);
+ }
+@@ -396,7 +396,7 @@ static int action_list(struct transaction_t *txn)
+
+ name = hash_lookup("tzid", &txn->req_qparams);
+ if (name) {
+- if (changedsince.is_utc) {
++ if (icaltime_is_utc(changedsince)) {
+ return json_error_response(txn, TZ_INVALID_TZID,
+ param, &changedsince);
+ }
+@@ -589,7 +589,7 @@ static const struct observance *truncate_vtimezone(ica
+
+ /* Adjust DTSTART observance to UTC */
+ icaltime_adjust(&obs.onset, 0, 0, 0, -obs.offset_from);
+- obs.onset.is_utc = 1;
++ icaltime_set_utc(&obs.onset, 1);
+
+ /* Check DTSTART vs window close */
+ if (!icaltime_is_null_time(end) &&
+@@ -651,7 +651,7 @@ static const struct observance *truncate_vtimezone(ica
+ if (!infinite) {
+ /* Adjust UNTIL to local time (for iterator) */
+ icaltime_adjust(&rrule.until, 0, 0, 0, obs.offset_from);
+- rrule.until.is_utc = 0;
++ icaltime_set_utc(&rrule.until, 0);
+ }
+
+ if (trunc_dtstart) {
+@@ -675,7 +675,7 @@ static const struct observance *truncate_vtimezone(ica
+
+ /* Adjust observance to UTC */
+ icaltime_adjust(&obs.onset, 0, 0, 0, -obs.offset_from);
+- obs.onset.is_utc = 1;
++ icaltime_set_utc(&obs.onset, 1);
+
+ if (trunc_until && icaltime_compare(obs.onset, end) > 0) {
+ /* Observance is on/after window close */
+@@ -776,7 +776,7 @@ static const struct observance *truncate_vtimezone(ica
+
+ /* Adjust observance to UTC */
+ icaltime_adjust(&obs.onset, 0, 0, 0, -obs.offset_from);
+- obs.onset.is_utc = 1;
++ icaltime_set_utc(&obs.onset, 1);
+
+ if (!icaltime_is_null_time(end) &&
+ icaltime_compare(obs.onset, end) >= 0) {
+@@ -880,7 +880,7 @@ static const struct observance *truncate_vtimezone(ica
+ case ICAL_DTSTART_PROPERTY:
+ /* Adjust window open to local time */
+ icaltime_adjust(&start, 0, 0, 0, tombstone.offset_from);
+- start.is_utc = 0;
++ icaltime_set_utc(&start, 1);
+
+ icalproperty_set_dtstart(prop, start);
+ break;
+@@ -1160,7 +1160,7 @@ static int action_expand(struct transaction_t *txn)
+ param = hash_lookup("changedsince", &txn->req_qparams);
+ if (param) {
+ changedsince = icaltime_from_string(param->s);
+- if (param->next || !changedsince.is_utc) { /* once only, UTC */
++ if (param->next || !icaltime_is_utc(changedsince)) { /* once only, UTC */
+ return json_error_response(txn, TZ_INVALID_CHANGEDSINCE,
+ param, &changedsince);
+ }
+@@ -1171,13 +1171,13 @@ static int action_expand(struct transaction_t *txn)
+ return json_error_response(txn, TZ_INVALID_START, param, NULL);
+
+ start = icaltime_from_string(param->s);
+- if (!start.is_utc) /* MUST be UTC */
++ if (!icaltime_is_utc(start)) /* MUST be UTC */
+ return json_error_response(txn, TZ_INVALID_START, param, &start);
+
+ param = hash_lookup("end", &txn->req_qparams);
+ if (param) {
+ end = icaltime_from_string(param->s);
+- if (param->next || !end.is_utc /* once only, UTC */
++ if (param->next || !icaltime_is_utc(end) /* once only, UTC */
+ || icaltime_compare(end, start) <= 0) { /* end MUST be > start */
+ return json_error_response(txn, TZ_INVALID_END, param, &end);
+ }
+@@ -1435,7 +1435,7 @@ static int json_error_response(struct transaction_t *t
+ else if (param->next) fmt = "multiple %s parameters";
+ else if (!param->s || !param->s[0]) fmt = "missing %s value";
+ else if (!time) fmt = "unknown %s value";
+- else if (!time->is_utc) fmt = "invalid %s UTC value";
++ else if (!icaltime_is_utc(*time)) fmt = "invalid %s UTC value";
+
+ switch (tz_code) {
+ case TZ_INVALID_TZID:
+@@ -1463,4 +1463,13 @@ static int json_error_response(struct transaction_t *t
+ }
+
+ return json_response(http_code, txn, root, NULL);
++}
++
++EXPORTED void icaltime_set_utc(struct icaltimetype *t, int set)
++{
++#ifdef ICALTIME_HAS_IS_UTC
++ t->is_utc = set;
++#else
++ icaltime_set_timezone(t, set ? icaltimezone_get_utc_timezone() : NULL);
++#endif
+ }
diff --git a/mail/cyrus-imapd25/files/patch-imap_xcal.c b/mail/cyrus-imapd25/files/patch-imap_xcal.c
new file mode 100644
index 000000000000..fb84058dd3e9
--- /dev/null
+++ b/mail/cyrus-imapd25/files/patch-imap_xcal.c
@@ -0,0 +1,11 @@
+--- imap/xcal.c.orig 2018-04-10 19:36:14 UTC
++++ imap/xcal.c
+@@ -114,7 +114,7 @@ const char *icaltime_as_iso_string(const struct icalti
+ const char *fmt;
+
+ if (tt.is_date) fmt = "%04d-%02d-%02d";
+- else if (tt.is_utc) fmt = "%04d-%02d-%02dT%02d:%02d:%02dZ";
++ else if (icaltime_is_utc(tt)) fmt = "%04d-%02d-%02dT%02d:%02d:%02dZ";
+ else fmt = "%04d-%02d-%02dT%02d:%02d:%02d";
+
+ snprintf(str, sizeof(str), fmt, tt.year, tt.month, tt.day,
diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index 6caaffbd3e08..67d8635a7edc 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= evolution-ews
-PORTVERSION= 3.24.2
-PORTREVISION= 6
+PORTVERSION= 3.28.3
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,8 +10,12 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Evolution Microsoft Exchange plugin through Exchange Web Services
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= evolution>=3.0.0:mail/evolution
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
+ libfribidi.so:converters/fribidi \
libicuuc.so:devel/icu \
libmspack.so:archivers/libmspack \
libsecret-1.so:security/libsecret \
diff --git a/mail/evolution-ews/distinfo b/mail/evolution-ews/distinfo
index 9856154614d1..ef38ade6262e 100644
--- a/mail/evolution-ews/distinfo
+++ b/mail/evolution-ews/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496958885
-SHA256 (gnome3/evolution-ews-3.24.2.tar.xz) = 31eb84a204a50b31932696c03394a7d2563ec2c3eefa52a802e63d0346a28851
-SIZE (gnome3/evolution-ews-3.24.2.tar.xz) = 486848
+TIMESTAMP = 1529614124
+SHA256 (gnome3/evolution-ews-3.28.3.tar.xz) = 6c440ea4bd37bc33d31b29b8ff8c6c84fdf473bdb8b587aafa635ebad458df90
+SIZE (gnome3/evolution-ews-3.28.3.tar.xz) = 504756
diff --git a/mail/evolution-ews/pkg-plist b/mail/evolution-ews/pkg-plist
index 706412eb157c..6de5051b4737 100644
--- a/mail/evolution-ews/pkg-plist
+++ b/mail/evolution-ews/pkg-plist
@@ -6,7 +6,6 @@ lib/evolution-data-server/registry-modules/module-ews-backend.so
lib/evolution-ews/libcamelews-priv.so
lib/evolution-ews/libevolution-ews.so
lib/evolution/modules/module-ews-configuration.so
-share/appdata/evolution-ews.metainfo.xml
share/evolution-data-server/ews/windowsZones.xml
share/evolution/errors/module-ews-configuration.error
share/locale/as/LC_MESSAGES/evolution-ews.mo
@@ -46,3 +45,4 @@ 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/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 2876fdbac727..09d57325f3ef 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= evolution
-PORTVERSION= 3.24.2
-PORTREVISION= 6
+PORTVERSION= 3.28.3
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -31,6 +30,8 @@ LIB_DEPENDS= libnss3.so:security/nss \
libical.so:devel/libical \
libsecret-1.so:security/libsecret \
libenchant.so:textproc/enchant \
+ libenchant-2.so:textproc/enchant2 \
+ libfribidi.so:converters/fribidi \
libp11-kit.so:security/p11-kit \
libcryptui.so:security/libcryptui \
libdbus-1.so:devel/dbus \
@@ -50,16 +51,15 @@ USE_XORG= x11
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
CMAKE_ARGS= -DENABLE_TEXT_HIGHLIGHT=YES \
+ -DWITH_ENCHANT_VERSION=2 \
-DVERSION_COMMENT="FreeBSD GNOME Team"
-GLIB_SCHEMAS= org.gnome.evolution.gschema.xml \
- org.gnome.evolution.addressbook.gschema.xml \
+GLIB_SCHEMAS= org.gnome.evolution.addressbook.gschema.xml \
+ org.gnome.evolution.bogofilter.gschema.xml \
org.gnome.evolution.calendar.gschema.xml \
+ org.gnome.evolution.gschema.xml \
org.gnome.evolution.importer.gschema.xml \
org.gnome.evolution.mail.gschema.xml \
- org.gnome.evolution.shell.gschema.xml \
- org.gnome.evolution.bogofilter.gschema.xml \
- org.gnome.evolution.spamassassin.gschema.xml \
org.gnome.evolution.plugin.attachment-reminder.gschema.xml \
org.gnome.evolution.plugin.autocontacts.gschema.xml \
org.gnome.evolution.plugin.email-custom-header.gschema.xml \
@@ -69,7 +69,10 @@ GLIB_SCHEMAS= org.gnome.evolution.gschema.xml \
org.gnome.evolution.plugin.mail-notification.gschema.xml \
org.gnome.evolution.plugin.prefer-plain.gschema.xml \
org.gnome.evolution.plugin.publish-calendar.gschema.xml \
- org.gnome.evolution.plugin.templates.gschema.xml
+ org.gnome.evolution.plugin.templates.gschema.xml \
+ org.gnome.evolution.shell.gschema.xml \
+ org.gnome.evolution.spamassassin.gschema.xml \
+ org.gnome.evolution.text-highlight.gschema.xml
EVO_VERSION= 3.24
PLIST_SUB= VERSION=${EVO_VERSION} \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 316734e82d0c..5150c430f571 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496947688
-SHA256 (gnome3/evolution-3.24.2.tar.xz) = e7b35a60f4ad53bb5416d8e96390aa79c8601b09a71e635c1de730b94f3aebdf
-SIZE (gnome3/evolution-3.24.2.tar.xz) = 12132032
+TIMESTAMP = 1529613519
+SHA256 (gnome3/evolution-3.28.3.tar.xz) = d374511b7866df399c30458b92ac59a24cd5517c0f3a541d72010bc1eca73be8
+SIZE (gnome3/evolution-3.28.3.tar.xz) = 12113760
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index d6aeb38737f5..bb50a2581471 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,5 +1,5 @@
bin/evolution
-etc/xdg/autostart/evolution-alarm-notify.desktop
+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
@@ -52,6 +52,7 @@ include/evolution/calendar/gui/e-select-names-renderer.h
include/evolution/calendar/gui/e-send-options-utils.h
include/evolution/calendar/gui/e-task-table.h
include/evolution/calendar/gui/e-timezone-entry.h
+include/evolution/calendar/gui/e-to-do-pane.h
include/evolution/calendar/gui/e-week-view-event-item.h
include/evolution/calendar/gui/e-week-view-layout.h
include/evolution/calendar/gui/e-week-view-main-item.h
@@ -84,6 +85,7 @@ include/evolution/composer/e-composer-private.h
include/evolution/composer/e-composer-spell-header.h
include/evolution/composer/e-composer-text-header.h
include/evolution/composer/e-msg-composer.h
+include/evolution/e-util/e-accounts-window.h
include/evolution/e-util/e-action-combo-box.h
include/evolution/e-util/e-activity-bar.h
include/evolution/e-util/e-activity-proxy.h
@@ -142,8 +144,13 @@ include/evolution/e-util/e-charset.h
include/evolution/e-util/e-client-cache.h
include/evolution/e-util/e-client-combo-box.h
include/evolution/e-util/e-client-selector.h
+include/evolution/e-util/e-collection-account-wizard.h
include/evolution/e-util/e-color-chooser-widget.h
include/evolution/e-util/e-color-combo.h
+include/evolution/e-util/e-config-lookup-result-simple.h
+include/evolution/e-util/e-config-lookup-result.h
+include/evolution/e-util/e-config-lookup-worker.h
+include/evolution/e-util/e-config-lookup.h
include/evolution/e-util/e-config.h
include/evolution/e-util/e-conflict-search-selector.h
include/evolution/e-util/e-contact-store.h
@@ -315,6 +322,7 @@ include/evolution/e-util/e-util-enumtypes.h
include/evolution/e-util/e-util.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
include/evolution/e-util/e-widget-undo.h
include/evolution/e-util/e-xml-utils.h
include/evolution/e-util/ea-calendar-cell.h
@@ -368,8 +376,6 @@ include/evolution/em-format/e-mail-part-utils.h
include/evolution/em-format/e-mail-part.h
include/evolution/em-format/e-mail-stripsig-filter.h
include/evolution/libemail-engine/camel-null-store.h
-include/evolution/libemail-engine/camel-sasl-oauth2-google.h
-include/evolution/libemail-engine/camel-sasl-xoauth2.h
include/evolution/libemail-engine/e-mail-engine-enums.h
include/evolution/libemail-engine/e-mail-engine-enumtypes.h
include/evolution/libemail-engine/e-mail-folder-utils.h
@@ -416,6 +422,7 @@ include/evolution/mail/e-mail-browser.h
include/evolution/mail/e-mail-config-activity-page.h
include/evolution/mail/e-mail-config-assistant.h
include/evolution/mail/e-mail-config-auth-check.h
+include/evolution/mail/e-mail-config-composing-page.h
include/evolution/mail/e-mail-config-confirm-page.h
include/evolution/mail/e-mail-config-defaults-page.h
include/evolution/mail/e-mail-config-identity-page.h
@@ -519,6 +526,7 @@ lib/evolution/libevolution-shell.so
lib/evolution/libevolution-smime.so
lib/evolution/libevolution-util.so
lib/evolution/libgnomecanvas.so
+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
@@ -535,6 +543,7 @@ lib/evolution/modules/module-cal-config-webcal.so
lib/evolution/modules/module-calendar.so
lib/evolution/modules/module-composer-autosave.so
lib/evolution/modules/module-composer-to-meeting.so
+lib/evolution/modules/module-config-lookup.so
lib/evolution/modules/module-contact-photos.so
lib/evolution/modules/module-gravatar.so
lib/evolution/modules/module-itip-formatter.so
@@ -593,11 +602,7 @@ libexec/evolution/evolution-alarm-notify
libexec/evolution/evolution-backup
libexec/evolution/killev
share/GConf/gsettings/evolution.convert
-%%BOGOFILTER%%share/appdata/evolution-bogofilter.metainfo.xml
-%%PST%%share/appdata/evolution-pst.metainfo.xml
-%%SPAMASSASSIN%%share/appdata/evolution-spamassassin.metainfo.xml
-share/appdata/evolution.appdata.xml
-share/applications/evolution.desktop
+share/applications/org.gnome.Evolution.desktop
%%DATADIR%%/address_formats.dat
%%DATADIR%%/addresstypes.xml
%%DATADIR%%/caltypes.xml
@@ -914,7 +919,6 @@ share/help/C/evolution/calendar-usage.page
share/help/C/evolution/calendar-using-several-calendars.page
share/help/C/evolution/calendar-weather.page
share/help/C/evolution/calendar-webdav.page
-share/help/C/evolution/change-switcher-appearance.page
share/help/C/evolution/contacts-add-automatically.page
share/help/C/evolution/contacts-autocompletion.page
share/help/C/evolution/contacts-google.page
@@ -930,13 +934,12 @@ share/help/C/evolution/contacts-usage.page
share/help/C/evolution/contacts-using-contact-lists.page
share/help/C/evolution/contacts-using-several-addressbooks.page
share/help/C/evolution/credits.page
+share/help/C/evolution/customize-ui-items.page
share/help/C/evolution/data-storage.page
share/help/C/evolution/default-browser.page
share/help/C/evolution/deleting-appointments.page
share/help/C/evolution/deleting-emails.page
share/help/C/evolution/deleting-to-free-disk-space.page
-share/help/C/evolution/exchange-connectors-overview.page
-share/help/C/evolution/exchange-placeholder.page
share/help/C/evolution/exporting-data-calendar.page
share/help/C/evolution/exporting-data-contacts.page
share/help/C/evolution/exporting-data-mail.page
@@ -970,6 +973,7 @@ share/help/C/evolution/import-supported-file-formats.page
share/help/C/evolution/index.page
share/help/C/evolution/intro-application.page
share/help/C/evolution/intro-first-run.page
+share/help/C/evolution/intro-keyboard-shortcuts.page
share/help/C/evolution/intro-main-window.page
share/help/C/evolution/legal.xml
share/help/C/evolution/mail-access-gmail-imap-account.page
@@ -1053,7 +1057,6 @@ share/help/C/evolution/mail-moving-emails.page
share/help/C/evolution/mail-not-sent.page
share/help/C/evolution/mail-organizing.page
share/help/C/evolution/mail-read-receipts.page
-share/help/C/evolution/mail-reading-keyboard-shortcuts.page
share/help/C/evolution/mail-received-notification.page
share/help/C/evolution/mail-receiving-options-exchange-ews.page
share/help/C/evolution/mail-receiving-options-exchange-mapi.page
@@ -1066,13 +1069,10 @@ share/help/C/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/C/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/C/evolution/mail-receiving-options-usenet-news.page
share/help/C/evolution/mail-receiving-options.page
-share/help/C/evolution/mail-recognized-thread-related-headers.page
share/help/C/evolution/mail-refresh-folders.page
share/help/C/evolution/mail-save-as-pdf.page
share/help/C/evolution/mail-search-folders-add.page
share/help/C/evolution/mail-search-folders-conditions.page
-share/help/C/evolution/mail-search-folders-enable.page
-share/help/C/evolution/mail-search-folders-refresh.page
share/help/C/evolution/mail-search-folders.page
share/help/C/evolution/mail-searching-attachment-type.page
share/help/C/evolution/mail-searching.page
@@ -1146,7 +1146,6 @@ share/help/ca/evolution/calendar-usage.page
share/help/ca/evolution/calendar-using-several-calendars.page
share/help/ca/evolution/calendar-weather.page
share/help/ca/evolution/calendar-webdav.page
-share/help/ca/evolution/change-switcher-appearance.page
share/help/ca/evolution/contacts-add-automatically.page
share/help/ca/evolution/contacts-autocompletion.page
share/help/ca/evolution/contacts-google.page
@@ -1162,13 +1161,12 @@ share/help/ca/evolution/contacts-usage.page
share/help/ca/evolution/contacts-using-contact-lists.page
share/help/ca/evolution/contacts-using-several-addressbooks.page
share/help/ca/evolution/credits.page
+share/help/ca/evolution/customize-ui-items.page
share/help/ca/evolution/data-storage.page
share/help/ca/evolution/default-browser.page
share/help/ca/evolution/deleting-appointments.page
share/help/ca/evolution/deleting-emails.page
share/help/ca/evolution/deleting-to-free-disk-space.page
-share/help/ca/evolution/exchange-connectors-overview.page
-share/help/ca/evolution/exchange-placeholder.page
share/help/ca/evolution/exporting-data-calendar.page
share/help/ca/evolution/exporting-data-contacts.page
share/help/ca/evolution/exporting-data-mail.page
@@ -1202,6 +1200,7 @@ share/help/ca/evolution/import-supported-file-formats.page
share/help/ca/evolution/index.page
share/help/ca/evolution/intro-application.page
share/help/ca/evolution/intro-first-run.page
+share/help/ca/evolution/intro-keyboard-shortcuts.page
share/help/ca/evolution/intro-main-window.page
share/help/ca/evolution/legal.xml
share/help/ca/evolution/mail-access-gmail-imap-account.page
@@ -1285,7 +1284,6 @@ share/help/ca/evolution/mail-moving-emails.page
share/help/ca/evolution/mail-not-sent.page
share/help/ca/evolution/mail-organizing.page
share/help/ca/evolution/mail-read-receipts.page
-share/help/ca/evolution/mail-reading-keyboard-shortcuts.page
share/help/ca/evolution/mail-received-notification.page
share/help/ca/evolution/mail-receiving-options-exchange-ews.page
share/help/ca/evolution/mail-receiving-options-exchange-mapi.page
@@ -1298,13 +1296,10 @@ share/help/ca/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/ca/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/ca/evolution/mail-receiving-options-usenet-news.page
share/help/ca/evolution/mail-receiving-options.page
-share/help/ca/evolution/mail-recognized-thread-related-headers.page
share/help/ca/evolution/mail-refresh-folders.page
share/help/ca/evolution/mail-save-as-pdf.page
share/help/ca/evolution/mail-search-folders-add.page
share/help/ca/evolution/mail-search-folders-conditions.page
-share/help/ca/evolution/mail-search-folders-enable.page
-share/help/ca/evolution/mail-search-folders-refresh.page
share/help/ca/evolution/mail-search-folders.page
share/help/ca/evolution/mail-searching-attachment-type.page
share/help/ca/evolution/mail-searching.page
@@ -1378,7 +1373,6 @@ share/help/cs/evolution/calendar-usage.page
share/help/cs/evolution/calendar-using-several-calendars.page
share/help/cs/evolution/calendar-weather.page
share/help/cs/evolution/calendar-webdav.page
-share/help/cs/evolution/change-switcher-appearance.page
share/help/cs/evolution/contacts-add-automatically.page
share/help/cs/evolution/contacts-autocompletion.page
share/help/cs/evolution/contacts-google.page
@@ -1394,13 +1388,12 @@ share/help/cs/evolution/contacts-usage.page
share/help/cs/evolution/contacts-using-contact-lists.page
share/help/cs/evolution/contacts-using-several-addressbooks.page
share/help/cs/evolution/credits.page
+share/help/cs/evolution/customize-ui-items.page
share/help/cs/evolution/data-storage.page
share/help/cs/evolution/default-browser.page
share/help/cs/evolution/deleting-appointments.page
share/help/cs/evolution/deleting-emails.page
share/help/cs/evolution/deleting-to-free-disk-space.page
-share/help/cs/evolution/exchange-connectors-overview.page
-share/help/cs/evolution/exchange-placeholder.page
share/help/cs/evolution/exporting-data-calendar.page
share/help/cs/evolution/exporting-data-contacts.page
share/help/cs/evolution/exporting-data-mail.page
@@ -1434,6 +1427,7 @@ share/help/cs/evolution/import-supported-file-formats.page
share/help/cs/evolution/index.page
share/help/cs/evolution/intro-application.page
share/help/cs/evolution/intro-first-run.page
+share/help/cs/evolution/intro-keyboard-shortcuts.page
share/help/cs/evolution/intro-main-window.page
share/help/cs/evolution/legal.xml
share/help/cs/evolution/mail-access-gmail-imap-account.page
@@ -1517,7 +1511,6 @@ share/help/cs/evolution/mail-moving-emails.page
share/help/cs/evolution/mail-not-sent.page
share/help/cs/evolution/mail-organizing.page
share/help/cs/evolution/mail-read-receipts.page
-share/help/cs/evolution/mail-reading-keyboard-shortcuts.page
share/help/cs/evolution/mail-received-notification.page
share/help/cs/evolution/mail-receiving-options-exchange-ews.page
share/help/cs/evolution/mail-receiving-options-exchange-mapi.page
@@ -1530,13 +1523,10 @@ share/help/cs/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/cs/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/cs/evolution/mail-receiving-options-usenet-news.page
share/help/cs/evolution/mail-receiving-options.page
-share/help/cs/evolution/mail-recognized-thread-related-headers.page
share/help/cs/evolution/mail-refresh-folders.page
share/help/cs/evolution/mail-save-as-pdf.page
share/help/cs/evolution/mail-search-folders-add.page
share/help/cs/evolution/mail-search-folders-conditions.page
-share/help/cs/evolution/mail-search-folders-enable.page
-share/help/cs/evolution/mail-search-folders-refresh.page
share/help/cs/evolution/mail-search-folders.page
share/help/cs/evolution/mail-searching-attachment-type.page
share/help/cs/evolution/mail-searching.page
@@ -1610,7 +1600,6 @@ share/help/de/evolution/calendar-usage.page
share/help/de/evolution/calendar-using-several-calendars.page
share/help/de/evolution/calendar-weather.page
share/help/de/evolution/calendar-webdav.page
-share/help/de/evolution/change-switcher-appearance.page
share/help/de/evolution/contacts-add-automatically.page
share/help/de/evolution/contacts-autocompletion.page
share/help/de/evolution/contacts-google.page
@@ -1626,13 +1615,12 @@ share/help/de/evolution/contacts-usage.page
share/help/de/evolution/contacts-using-contact-lists.page
share/help/de/evolution/contacts-using-several-addressbooks.page
share/help/de/evolution/credits.page
+share/help/de/evolution/customize-ui-items.page
share/help/de/evolution/data-storage.page
share/help/de/evolution/default-browser.page
share/help/de/evolution/deleting-appointments.page
share/help/de/evolution/deleting-emails.page
share/help/de/evolution/deleting-to-free-disk-space.page
-share/help/de/evolution/exchange-connectors-overview.page
-share/help/de/evolution/exchange-placeholder.page
share/help/de/evolution/exporting-data-calendar.page
share/help/de/evolution/exporting-data-contacts.page
share/help/de/evolution/exporting-data-mail.page
@@ -1666,6 +1654,7 @@ share/help/de/evolution/import-supported-file-formats.page
share/help/de/evolution/index.page
share/help/de/evolution/intro-application.page
share/help/de/evolution/intro-first-run.page
+share/help/de/evolution/intro-keyboard-shortcuts.page
share/help/de/evolution/intro-main-window.page
share/help/de/evolution/legal.xml
share/help/de/evolution/mail-access-gmail-imap-account.page
@@ -1749,7 +1738,6 @@ share/help/de/evolution/mail-moving-emails.page
share/help/de/evolution/mail-not-sent.page
share/help/de/evolution/mail-organizing.page
share/help/de/evolution/mail-read-receipts.page
-share/help/de/evolution/mail-reading-keyboard-shortcuts.page
share/help/de/evolution/mail-received-notification.page
share/help/de/evolution/mail-receiving-options-exchange-ews.page
share/help/de/evolution/mail-receiving-options-exchange-mapi.page
@@ -1762,13 +1750,10 @@ share/help/de/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/de/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/de/evolution/mail-receiving-options-usenet-news.page
share/help/de/evolution/mail-receiving-options.page
-share/help/de/evolution/mail-recognized-thread-related-headers.page
share/help/de/evolution/mail-refresh-folders.page
share/help/de/evolution/mail-save-as-pdf.page
share/help/de/evolution/mail-search-folders-add.page
share/help/de/evolution/mail-search-folders-conditions.page
-share/help/de/evolution/mail-search-folders-enable.page
-share/help/de/evolution/mail-search-folders-refresh.page
share/help/de/evolution/mail-search-folders.page
share/help/de/evolution/mail-searching-attachment-type.page
share/help/de/evolution/mail-searching.page
@@ -1842,7 +1827,6 @@ share/help/el/evolution/calendar-usage.page
share/help/el/evolution/calendar-using-several-calendars.page
share/help/el/evolution/calendar-weather.page
share/help/el/evolution/calendar-webdav.page
-share/help/el/evolution/change-switcher-appearance.page
share/help/el/evolution/contacts-add-automatically.page
share/help/el/evolution/contacts-autocompletion.page
share/help/el/evolution/contacts-google.page
@@ -1858,13 +1842,12 @@ share/help/el/evolution/contacts-usage.page
share/help/el/evolution/contacts-using-contact-lists.page
share/help/el/evolution/contacts-using-several-addressbooks.page
share/help/el/evolution/credits.page
+share/help/el/evolution/customize-ui-items.page
share/help/el/evolution/data-storage.page
share/help/el/evolution/default-browser.page
share/help/el/evolution/deleting-appointments.page
share/help/el/evolution/deleting-emails.page
share/help/el/evolution/deleting-to-free-disk-space.page
-share/help/el/evolution/exchange-connectors-overview.page
-share/help/el/evolution/exchange-placeholder.page
share/help/el/evolution/exporting-data-calendar.page
share/help/el/evolution/exporting-data-contacts.page
share/help/el/evolution/exporting-data-mail.page
@@ -1898,6 +1881,7 @@ share/help/el/evolution/import-supported-file-formats.page
share/help/el/evolution/index.page
share/help/el/evolution/intro-application.page
share/help/el/evolution/intro-first-run.page
+share/help/el/evolution/intro-keyboard-shortcuts.page
share/help/el/evolution/intro-main-window.page
share/help/el/evolution/legal.xml
share/help/el/evolution/mail-access-gmail-imap-account.page
@@ -1981,7 +1965,6 @@ share/help/el/evolution/mail-moving-emails.page
share/help/el/evolution/mail-not-sent.page
share/help/el/evolution/mail-organizing.page
share/help/el/evolution/mail-read-receipts.page
-share/help/el/evolution/mail-reading-keyboard-shortcuts.page
share/help/el/evolution/mail-received-notification.page
share/help/el/evolution/mail-receiving-options-exchange-ews.page
share/help/el/evolution/mail-receiving-options-exchange-mapi.page
@@ -1994,13 +1977,10 @@ share/help/el/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/el/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/el/evolution/mail-receiving-options-usenet-news.page
share/help/el/evolution/mail-receiving-options.page
-share/help/el/evolution/mail-recognized-thread-related-headers.page
share/help/el/evolution/mail-refresh-folders.page
share/help/el/evolution/mail-save-as-pdf.page
share/help/el/evolution/mail-search-folders-add.page
share/help/el/evolution/mail-search-folders-conditions.page
-share/help/el/evolution/mail-search-folders-enable.page
-share/help/el/evolution/mail-search-folders-refresh.page
share/help/el/evolution/mail-search-folders.page
share/help/el/evolution/mail-searching-attachment-type.page
share/help/el/evolution/mail-searching.page
@@ -2074,7 +2054,6 @@ share/help/en_GB/evolution/calendar-usage.page
share/help/en_GB/evolution/calendar-using-several-calendars.page
share/help/en_GB/evolution/calendar-weather.page
share/help/en_GB/evolution/calendar-webdav.page
-share/help/en_GB/evolution/change-switcher-appearance.page
share/help/en_GB/evolution/contacts-add-automatically.page
share/help/en_GB/evolution/contacts-autocompletion.page
share/help/en_GB/evolution/contacts-google.page
@@ -2090,13 +2069,12 @@ share/help/en_GB/evolution/contacts-usage.page
share/help/en_GB/evolution/contacts-using-contact-lists.page
share/help/en_GB/evolution/contacts-using-several-addressbooks.page
share/help/en_GB/evolution/credits.page
+share/help/en_GB/evolution/customize-ui-items.page
share/help/en_GB/evolution/data-storage.page
share/help/en_GB/evolution/default-browser.page
share/help/en_GB/evolution/deleting-appointments.page
share/help/en_GB/evolution/deleting-emails.page
share/help/en_GB/evolution/deleting-to-free-disk-space.page
-share/help/en_GB/evolution/exchange-connectors-overview.page
-share/help/en_GB/evolution/exchange-placeholder.page
share/help/en_GB/evolution/exporting-data-calendar.page
share/help/en_GB/evolution/exporting-data-contacts.page
share/help/en_GB/evolution/exporting-data-mail.page
@@ -2130,6 +2108,7 @@ share/help/en_GB/evolution/import-supported-file-formats.page
share/help/en_GB/evolution/index.page
share/help/en_GB/evolution/intro-application.page
share/help/en_GB/evolution/intro-first-run.page
+share/help/en_GB/evolution/intro-keyboard-shortcuts.page
share/help/en_GB/evolution/intro-main-window.page
share/help/en_GB/evolution/legal.xml
share/help/en_GB/evolution/mail-access-gmail-imap-account.page
@@ -2213,7 +2192,6 @@ share/help/en_GB/evolution/mail-moving-emails.page
share/help/en_GB/evolution/mail-not-sent.page
share/help/en_GB/evolution/mail-organizing.page
share/help/en_GB/evolution/mail-read-receipts.page
-share/help/en_GB/evolution/mail-reading-keyboard-shortcuts.page
share/help/en_GB/evolution/mail-received-notification.page
share/help/en_GB/evolution/mail-receiving-options-exchange-ews.page
share/help/en_GB/evolution/mail-receiving-options-exchange-mapi.page
@@ -2226,13 +2204,10 @@ share/help/en_GB/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/en_GB/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/en_GB/evolution/mail-receiving-options-usenet-news.page
share/help/en_GB/evolution/mail-receiving-options.page
-share/help/en_GB/evolution/mail-recognized-thread-related-headers.page
share/help/en_GB/evolution/mail-refresh-folders.page
share/help/en_GB/evolution/mail-save-as-pdf.page
share/help/en_GB/evolution/mail-search-folders-add.page
share/help/en_GB/evolution/mail-search-folders-conditions.page
-share/help/en_GB/evolution/mail-search-folders-enable.page
-share/help/en_GB/evolution/mail-search-folders-refresh.page
share/help/en_GB/evolution/mail-search-folders.page
share/help/en_GB/evolution/mail-searching-attachment-type.page
share/help/en_GB/evolution/mail-searching.page
@@ -2306,7 +2281,6 @@ share/help/es/evolution/calendar-usage.page
share/help/es/evolution/calendar-using-several-calendars.page
share/help/es/evolution/calendar-weather.page
share/help/es/evolution/calendar-webdav.page
-share/help/es/evolution/change-switcher-appearance.page
share/help/es/evolution/contacts-add-automatically.page
share/help/es/evolution/contacts-autocompletion.page
share/help/es/evolution/contacts-google.page
@@ -2322,13 +2296,12 @@ share/help/es/evolution/contacts-usage.page
share/help/es/evolution/contacts-using-contact-lists.page
share/help/es/evolution/contacts-using-several-addressbooks.page
share/help/es/evolution/credits.page
+share/help/es/evolution/customize-ui-items.page
share/help/es/evolution/data-storage.page
share/help/es/evolution/default-browser.page
share/help/es/evolution/deleting-appointments.page
share/help/es/evolution/deleting-emails.page
share/help/es/evolution/deleting-to-free-disk-space.page
-share/help/es/evolution/exchange-connectors-overview.page
-share/help/es/evolution/exchange-placeholder.page
share/help/es/evolution/exporting-data-calendar.page
share/help/es/evolution/exporting-data-contacts.page
share/help/es/evolution/exporting-data-mail.page
@@ -2362,6 +2335,7 @@ share/help/es/evolution/import-supported-file-formats.page
share/help/es/evolution/index.page
share/help/es/evolution/intro-application.page
share/help/es/evolution/intro-first-run.page
+share/help/es/evolution/intro-keyboard-shortcuts.page
share/help/es/evolution/intro-main-window.page
share/help/es/evolution/legal.xml
share/help/es/evolution/mail-access-gmail-imap-account.page
@@ -2445,7 +2419,6 @@ share/help/es/evolution/mail-moving-emails.page
share/help/es/evolution/mail-not-sent.page
share/help/es/evolution/mail-organizing.page
share/help/es/evolution/mail-read-receipts.page
-share/help/es/evolution/mail-reading-keyboard-shortcuts.page
share/help/es/evolution/mail-received-notification.page
share/help/es/evolution/mail-receiving-options-exchange-ews.page
share/help/es/evolution/mail-receiving-options-exchange-mapi.page
@@ -2458,13 +2431,10 @@ share/help/es/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/es/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/es/evolution/mail-receiving-options-usenet-news.page
share/help/es/evolution/mail-receiving-options.page
-share/help/es/evolution/mail-recognized-thread-related-headers.page
share/help/es/evolution/mail-refresh-folders.page
share/help/es/evolution/mail-save-as-pdf.page
share/help/es/evolution/mail-search-folders-add.page
share/help/es/evolution/mail-search-folders-conditions.page
-share/help/es/evolution/mail-search-folders-enable.page
-share/help/es/evolution/mail-search-folders-refresh.page
share/help/es/evolution/mail-search-folders.page
share/help/es/evolution/mail-searching-attachment-type.page
share/help/es/evolution/mail-searching.page
@@ -2538,7 +2508,6 @@ share/help/eu/evolution/calendar-usage.page
share/help/eu/evolution/calendar-using-several-calendars.page
share/help/eu/evolution/calendar-weather.page
share/help/eu/evolution/calendar-webdav.page
-share/help/eu/evolution/change-switcher-appearance.page
share/help/eu/evolution/contacts-add-automatically.page
share/help/eu/evolution/contacts-autocompletion.page
share/help/eu/evolution/contacts-google.page
@@ -2554,13 +2523,12 @@ share/help/eu/evolution/contacts-usage.page
share/help/eu/evolution/contacts-using-contact-lists.page
share/help/eu/evolution/contacts-using-several-addressbooks.page
share/help/eu/evolution/credits.page
+share/help/eu/evolution/customize-ui-items.page
share/help/eu/evolution/data-storage.page
share/help/eu/evolution/default-browser.page
share/help/eu/evolution/deleting-appointments.page
share/help/eu/evolution/deleting-emails.page
share/help/eu/evolution/deleting-to-free-disk-space.page
-share/help/eu/evolution/exchange-connectors-overview.page
-share/help/eu/evolution/exchange-placeholder.page
share/help/eu/evolution/exporting-data-calendar.page
share/help/eu/evolution/exporting-data-contacts.page
share/help/eu/evolution/exporting-data-mail.page
@@ -2594,6 +2562,7 @@ share/help/eu/evolution/import-supported-file-formats.page
share/help/eu/evolution/index.page
share/help/eu/evolution/intro-application.page
share/help/eu/evolution/intro-first-run.page
+share/help/eu/evolution/intro-keyboard-shortcuts.page
share/help/eu/evolution/intro-main-window.page
share/help/eu/evolution/legal.xml
share/help/eu/evolution/mail-access-gmail-imap-account.page
@@ -2677,7 +2646,6 @@ share/help/eu/evolution/mail-moving-emails.page
share/help/eu/evolution/mail-not-sent.page
share/help/eu/evolution/mail-organizing.page
share/help/eu/evolution/mail-read-receipts.page
-share/help/eu/evolution/mail-reading-keyboard-shortcuts.page
share/help/eu/evolution/mail-received-notification.page
share/help/eu/evolution/mail-receiving-options-exchange-ews.page
share/help/eu/evolution/mail-receiving-options-exchange-mapi.page
@@ -2690,13 +2658,10 @@ share/help/eu/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/eu/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/eu/evolution/mail-receiving-options-usenet-news.page
share/help/eu/evolution/mail-receiving-options.page
-share/help/eu/evolution/mail-recognized-thread-related-headers.page
share/help/eu/evolution/mail-refresh-folders.page
share/help/eu/evolution/mail-save-as-pdf.page
share/help/eu/evolution/mail-search-folders-add.page
share/help/eu/evolution/mail-search-folders-conditions.page
-share/help/eu/evolution/mail-search-folders-enable.page
-share/help/eu/evolution/mail-search-folders-refresh.page
share/help/eu/evolution/mail-search-folders.page
share/help/eu/evolution/mail-searching-attachment-type.page
share/help/eu/evolution/mail-searching.page
@@ -2770,7 +2735,6 @@ share/help/fr/evolution/calendar-usage.page
share/help/fr/evolution/calendar-using-several-calendars.page
share/help/fr/evolution/calendar-weather.page
share/help/fr/evolution/calendar-webdav.page
-share/help/fr/evolution/change-switcher-appearance.page
share/help/fr/evolution/contacts-add-automatically.page
share/help/fr/evolution/contacts-autocompletion.page
share/help/fr/evolution/contacts-google.page
@@ -2786,13 +2750,12 @@ share/help/fr/evolution/contacts-usage.page
share/help/fr/evolution/contacts-using-contact-lists.page
share/help/fr/evolution/contacts-using-several-addressbooks.page
share/help/fr/evolution/credits.page
+share/help/fr/evolution/customize-ui-items.page
share/help/fr/evolution/data-storage.page
share/help/fr/evolution/default-browser.page
share/help/fr/evolution/deleting-appointments.page
share/help/fr/evolution/deleting-emails.page
share/help/fr/evolution/deleting-to-free-disk-space.page
-share/help/fr/evolution/exchange-connectors-overview.page
-share/help/fr/evolution/exchange-placeholder.page
share/help/fr/evolution/exporting-data-calendar.page
share/help/fr/evolution/exporting-data-contacts.page
share/help/fr/evolution/exporting-data-mail.page
@@ -2826,6 +2789,7 @@ share/help/fr/evolution/import-supported-file-formats.page
share/help/fr/evolution/index.page
share/help/fr/evolution/intro-application.page
share/help/fr/evolution/intro-first-run.page
+share/help/fr/evolution/intro-keyboard-shortcuts.page
share/help/fr/evolution/intro-main-window.page
share/help/fr/evolution/legal.xml
share/help/fr/evolution/mail-access-gmail-imap-account.page
@@ -2909,7 +2873,6 @@ share/help/fr/evolution/mail-moving-emails.page
share/help/fr/evolution/mail-not-sent.page
share/help/fr/evolution/mail-organizing.page
share/help/fr/evolution/mail-read-receipts.page
-share/help/fr/evolution/mail-reading-keyboard-shortcuts.page
share/help/fr/evolution/mail-received-notification.page
share/help/fr/evolution/mail-receiving-options-exchange-ews.page
share/help/fr/evolution/mail-receiving-options-exchange-mapi.page
@@ -2922,13 +2885,10 @@ share/help/fr/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/fr/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/fr/evolution/mail-receiving-options-usenet-news.page
share/help/fr/evolution/mail-receiving-options.page
-share/help/fr/evolution/mail-recognized-thread-related-headers.page
share/help/fr/evolution/mail-refresh-folders.page
share/help/fr/evolution/mail-save-as-pdf.page
share/help/fr/evolution/mail-search-folders-add.page
share/help/fr/evolution/mail-search-folders-conditions.page
-share/help/fr/evolution/mail-search-folders-enable.page
-share/help/fr/evolution/mail-search-folders-refresh.page
share/help/fr/evolution/mail-search-folders.page
share/help/fr/evolution/mail-searching-attachment-type.page
share/help/fr/evolution/mail-searching.page
@@ -3002,7 +2962,6 @@ share/help/gl/evolution/calendar-usage.page
share/help/gl/evolution/calendar-using-several-calendars.page
share/help/gl/evolution/calendar-weather.page
share/help/gl/evolution/calendar-webdav.page
-share/help/gl/evolution/change-switcher-appearance.page
share/help/gl/evolution/contacts-add-automatically.page
share/help/gl/evolution/contacts-autocompletion.page
share/help/gl/evolution/contacts-google.page
@@ -3018,13 +2977,12 @@ share/help/gl/evolution/contacts-usage.page
share/help/gl/evolution/contacts-using-contact-lists.page
share/help/gl/evolution/contacts-using-several-addressbooks.page
share/help/gl/evolution/credits.page
+share/help/gl/evolution/customize-ui-items.page
share/help/gl/evolution/data-storage.page
share/help/gl/evolution/default-browser.page
share/help/gl/evolution/deleting-appointments.page
share/help/gl/evolution/deleting-emails.page
share/help/gl/evolution/deleting-to-free-disk-space.page
-share/help/gl/evolution/exchange-connectors-overview.page
-share/help/gl/evolution/exchange-placeholder.page
share/help/gl/evolution/exporting-data-calendar.page
share/help/gl/evolution/exporting-data-contacts.page
share/help/gl/evolution/exporting-data-mail.page
@@ -3058,6 +3016,7 @@ share/help/gl/evolution/import-supported-file-formats.page
share/help/gl/evolution/index.page
share/help/gl/evolution/intro-application.page
share/help/gl/evolution/intro-first-run.page
+share/help/gl/evolution/intro-keyboard-shortcuts.page
share/help/gl/evolution/intro-main-window.page
share/help/gl/evolution/legal.xml
share/help/gl/evolution/mail-access-gmail-imap-account.page
@@ -3141,7 +3100,6 @@ share/help/gl/evolution/mail-moving-emails.page
share/help/gl/evolution/mail-not-sent.page
share/help/gl/evolution/mail-organizing.page
share/help/gl/evolution/mail-read-receipts.page
-share/help/gl/evolution/mail-reading-keyboard-shortcuts.page
share/help/gl/evolution/mail-received-notification.page
share/help/gl/evolution/mail-receiving-options-exchange-ews.page
share/help/gl/evolution/mail-receiving-options-exchange-mapi.page
@@ -3154,13 +3112,10 @@ share/help/gl/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/gl/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/gl/evolution/mail-receiving-options-usenet-news.page
share/help/gl/evolution/mail-receiving-options.page
-share/help/gl/evolution/mail-recognized-thread-related-headers.page
share/help/gl/evolution/mail-refresh-folders.page
share/help/gl/evolution/mail-save-as-pdf.page
share/help/gl/evolution/mail-search-folders-add.page
share/help/gl/evolution/mail-search-folders-conditions.page
-share/help/gl/evolution/mail-search-folders-enable.page
-share/help/gl/evolution/mail-search-folders-refresh.page
share/help/gl/evolution/mail-search-folders.page
share/help/gl/evolution/mail-searching-attachment-type.page
share/help/gl/evolution/mail-searching.page
@@ -3234,7 +3189,6 @@ share/help/hu/evolution/calendar-usage.page
share/help/hu/evolution/calendar-using-several-calendars.page
share/help/hu/evolution/calendar-weather.page
share/help/hu/evolution/calendar-webdav.page
-share/help/hu/evolution/change-switcher-appearance.page
share/help/hu/evolution/contacts-add-automatically.page
share/help/hu/evolution/contacts-autocompletion.page
share/help/hu/evolution/contacts-google.page
@@ -3250,13 +3204,12 @@ share/help/hu/evolution/contacts-usage.page
share/help/hu/evolution/contacts-using-contact-lists.page
share/help/hu/evolution/contacts-using-several-addressbooks.page
share/help/hu/evolution/credits.page
+share/help/hu/evolution/customize-ui-items.page
share/help/hu/evolution/data-storage.page
share/help/hu/evolution/default-browser.page
share/help/hu/evolution/deleting-appointments.page
share/help/hu/evolution/deleting-emails.page
share/help/hu/evolution/deleting-to-free-disk-space.page
-share/help/hu/evolution/exchange-connectors-overview.page
-share/help/hu/evolution/exchange-placeholder.page
share/help/hu/evolution/exporting-data-calendar.page
share/help/hu/evolution/exporting-data-contacts.page
share/help/hu/evolution/exporting-data-mail.page
@@ -3290,6 +3243,7 @@ share/help/hu/evolution/import-supported-file-formats.page
share/help/hu/evolution/index.page
share/help/hu/evolution/intro-application.page
share/help/hu/evolution/intro-first-run.page
+share/help/hu/evolution/intro-keyboard-shortcuts.page
share/help/hu/evolution/intro-main-window.page
share/help/hu/evolution/legal.xml
share/help/hu/evolution/mail-access-gmail-imap-account.page
@@ -3373,7 +3327,6 @@ share/help/hu/evolution/mail-moving-emails.page
share/help/hu/evolution/mail-not-sent.page
share/help/hu/evolution/mail-organizing.page
share/help/hu/evolution/mail-read-receipts.page
-share/help/hu/evolution/mail-reading-keyboard-shortcuts.page
share/help/hu/evolution/mail-received-notification.page
share/help/hu/evolution/mail-receiving-options-exchange-ews.page
share/help/hu/evolution/mail-receiving-options-exchange-mapi.page
@@ -3386,13 +3339,10 @@ share/help/hu/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/hu/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/hu/evolution/mail-receiving-options-usenet-news.page
share/help/hu/evolution/mail-receiving-options.page
-share/help/hu/evolution/mail-recognized-thread-related-headers.page
share/help/hu/evolution/mail-refresh-folders.page
share/help/hu/evolution/mail-save-as-pdf.page
share/help/hu/evolution/mail-search-folders-add.page
share/help/hu/evolution/mail-search-folders-conditions.page
-share/help/hu/evolution/mail-search-folders-enable.page
-share/help/hu/evolution/mail-search-folders-refresh.page
share/help/hu/evolution/mail-search-folders.page
share/help/hu/evolution/mail-searching-attachment-type.page
share/help/hu/evolution/mail-searching.page
@@ -3466,7 +3416,6 @@ share/help/mk/evolution/calendar-usage.page
share/help/mk/evolution/calendar-using-several-calendars.page
share/help/mk/evolution/calendar-weather.page
share/help/mk/evolution/calendar-webdav.page
-share/help/mk/evolution/change-switcher-appearance.page
share/help/mk/evolution/contacts-add-automatically.page
share/help/mk/evolution/contacts-autocompletion.page
share/help/mk/evolution/contacts-google.page
@@ -3482,13 +3431,12 @@ share/help/mk/evolution/contacts-usage.page
share/help/mk/evolution/contacts-using-contact-lists.page
share/help/mk/evolution/contacts-using-several-addressbooks.page
share/help/mk/evolution/credits.page
+share/help/mk/evolution/customize-ui-items.page
share/help/mk/evolution/data-storage.page
share/help/mk/evolution/default-browser.page
share/help/mk/evolution/deleting-appointments.page
share/help/mk/evolution/deleting-emails.page
share/help/mk/evolution/deleting-to-free-disk-space.page
-share/help/mk/evolution/exchange-connectors-overview.page
-share/help/mk/evolution/exchange-placeholder.page
share/help/mk/evolution/exporting-data-calendar.page
share/help/mk/evolution/exporting-data-contacts.page
share/help/mk/evolution/exporting-data-mail.page
@@ -3522,6 +3470,7 @@ share/help/mk/evolution/import-supported-file-formats.page
share/help/mk/evolution/index.page
share/help/mk/evolution/intro-application.page
share/help/mk/evolution/intro-first-run.page
+share/help/mk/evolution/intro-keyboard-shortcuts.page
share/help/mk/evolution/intro-main-window.page
share/help/mk/evolution/legal.xml
share/help/mk/evolution/mail-access-gmail-imap-account.page
@@ -3605,7 +3554,6 @@ share/help/mk/evolution/mail-moving-emails.page
share/help/mk/evolution/mail-not-sent.page
share/help/mk/evolution/mail-organizing.page
share/help/mk/evolution/mail-read-receipts.page
-share/help/mk/evolution/mail-reading-keyboard-shortcuts.page
share/help/mk/evolution/mail-received-notification.page
share/help/mk/evolution/mail-receiving-options-exchange-ews.page
share/help/mk/evolution/mail-receiving-options-exchange-mapi.page
@@ -3618,13 +3566,10 @@ share/help/mk/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/mk/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/mk/evolution/mail-receiving-options-usenet-news.page
share/help/mk/evolution/mail-receiving-options.page
-share/help/mk/evolution/mail-recognized-thread-related-headers.page
share/help/mk/evolution/mail-refresh-folders.page
share/help/mk/evolution/mail-save-as-pdf.page
share/help/mk/evolution/mail-search-folders-add.page
share/help/mk/evolution/mail-search-folders-conditions.page
-share/help/mk/evolution/mail-search-folders-enable.page
-share/help/mk/evolution/mail-search-folders-refresh.page
share/help/mk/evolution/mail-search-folders.page
share/help/mk/evolution/mail-searching-attachment-type.page
share/help/mk/evolution/mail-searching.page
@@ -3698,7 +3643,6 @@ share/help/oc/evolution/calendar-usage.page
share/help/oc/evolution/calendar-using-several-calendars.page
share/help/oc/evolution/calendar-weather.page
share/help/oc/evolution/calendar-webdav.page
-share/help/oc/evolution/change-switcher-appearance.page
share/help/oc/evolution/contacts-add-automatically.page
share/help/oc/evolution/contacts-autocompletion.page
share/help/oc/evolution/contacts-google.page
@@ -3714,13 +3658,12 @@ share/help/oc/evolution/contacts-usage.page
share/help/oc/evolution/contacts-using-contact-lists.page
share/help/oc/evolution/contacts-using-several-addressbooks.page
share/help/oc/evolution/credits.page
+share/help/oc/evolution/customize-ui-items.page
share/help/oc/evolution/data-storage.page
share/help/oc/evolution/default-browser.page
share/help/oc/evolution/deleting-appointments.page
share/help/oc/evolution/deleting-emails.page
share/help/oc/evolution/deleting-to-free-disk-space.page
-share/help/oc/evolution/exchange-connectors-overview.page
-share/help/oc/evolution/exchange-placeholder.page
share/help/oc/evolution/exporting-data-calendar.page
share/help/oc/evolution/exporting-data-contacts.page
share/help/oc/evolution/exporting-data-mail.page
@@ -3754,6 +3697,7 @@ share/help/oc/evolution/import-supported-file-formats.page
share/help/oc/evolution/index.page
share/help/oc/evolution/intro-application.page
share/help/oc/evolution/intro-first-run.page
+share/help/oc/evolution/intro-keyboard-shortcuts.page
share/help/oc/evolution/intro-main-window.page
share/help/oc/evolution/legal.xml
share/help/oc/evolution/mail-access-gmail-imap-account.page
@@ -3837,7 +3781,6 @@ share/help/oc/evolution/mail-moving-emails.page
share/help/oc/evolution/mail-not-sent.page
share/help/oc/evolution/mail-organizing.page
share/help/oc/evolution/mail-read-receipts.page
-share/help/oc/evolution/mail-reading-keyboard-shortcuts.page
share/help/oc/evolution/mail-received-notification.page
share/help/oc/evolution/mail-receiving-options-exchange-ews.page
share/help/oc/evolution/mail-receiving-options-exchange-mapi.page
@@ -3850,13 +3793,10 @@ share/help/oc/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/oc/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/oc/evolution/mail-receiving-options-usenet-news.page
share/help/oc/evolution/mail-receiving-options.page
-share/help/oc/evolution/mail-recognized-thread-related-headers.page
share/help/oc/evolution/mail-refresh-folders.page
share/help/oc/evolution/mail-save-as-pdf.page
share/help/oc/evolution/mail-search-folders-add.page
share/help/oc/evolution/mail-search-folders-conditions.page
-share/help/oc/evolution/mail-search-folders-enable.page
-share/help/oc/evolution/mail-search-folders-refresh.page
share/help/oc/evolution/mail-search-folders.page
share/help/oc/evolution/mail-searching-attachment-type.page
share/help/oc/evolution/mail-searching.page
@@ -3930,7 +3870,6 @@ share/help/ru/evolution/calendar-usage.page
share/help/ru/evolution/calendar-using-several-calendars.page
share/help/ru/evolution/calendar-weather.page
share/help/ru/evolution/calendar-webdav.page
-share/help/ru/evolution/change-switcher-appearance.page
share/help/ru/evolution/contacts-add-automatically.page
share/help/ru/evolution/contacts-autocompletion.page
share/help/ru/evolution/contacts-google.page
@@ -3946,13 +3885,12 @@ share/help/ru/evolution/contacts-usage.page
share/help/ru/evolution/contacts-using-contact-lists.page
share/help/ru/evolution/contacts-using-several-addressbooks.page
share/help/ru/evolution/credits.page
+share/help/ru/evolution/customize-ui-items.page
share/help/ru/evolution/data-storage.page
share/help/ru/evolution/default-browser.page
share/help/ru/evolution/deleting-appointments.page
share/help/ru/evolution/deleting-emails.page
share/help/ru/evolution/deleting-to-free-disk-space.page
-share/help/ru/evolution/exchange-connectors-overview.page
-share/help/ru/evolution/exchange-placeholder.page
share/help/ru/evolution/exporting-data-calendar.page
share/help/ru/evolution/exporting-data-contacts.page
share/help/ru/evolution/exporting-data-mail.page
@@ -3986,6 +3924,7 @@ share/help/ru/evolution/import-supported-file-formats.page
share/help/ru/evolution/index.page
share/help/ru/evolution/intro-application.page
share/help/ru/evolution/intro-first-run.page
+share/help/ru/evolution/intro-keyboard-shortcuts.page
share/help/ru/evolution/intro-main-window.page
share/help/ru/evolution/legal.xml
share/help/ru/evolution/mail-access-gmail-imap-account.page
@@ -4069,7 +4008,6 @@ share/help/ru/evolution/mail-moving-emails.page
share/help/ru/evolution/mail-not-sent.page
share/help/ru/evolution/mail-organizing.page
share/help/ru/evolution/mail-read-receipts.page
-share/help/ru/evolution/mail-reading-keyboard-shortcuts.page
share/help/ru/evolution/mail-received-notification.page
share/help/ru/evolution/mail-receiving-options-exchange-ews.page
share/help/ru/evolution/mail-receiving-options-exchange-mapi.page
@@ -4082,13 +4020,10 @@ share/help/ru/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/ru/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/ru/evolution/mail-receiving-options-usenet-news.page
share/help/ru/evolution/mail-receiving-options.page
-share/help/ru/evolution/mail-recognized-thread-related-headers.page
share/help/ru/evolution/mail-refresh-folders.page
share/help/ru/evolution/mail-save-as-pdf.page
share/help/ru/evolution/mail-search-folders-add.page
share/help/ru/evolution/mail-search-folders-conditions.page
-share/help/ru/evolution/mail-search-folders-enable.page
-share/help/ru/evolution/mail-search-folders-refresh.page
share/help/ru/evolution/mail-search-folders.page
share/help/ru/evolution/mail-searching-attachment-type.page
share/help/ru/evolution/mail-searching.page
@@ -4162,7 +4097,6 @@ share/help/sl/evolution/calendar-usage.page
share/help/sl/evolution/calendar-using-several-calendars.page
share/help/sl/evolution/calendar-weather.page
share/help/sl/evolution/calendar-webdav.page
-share/help/sl/evolution/change-switcher-appearance.page
share/help/sl/evolution/contacts-add-automatically.page
share/help/sl/evolution/contacts-autocompletion.page
share/help/sl/evolution/contacts-google.page
@@ -4178,13 +4112,12 @@ share/help/sl/evolution/contacts-usage.page
share/help/sl/evolution/contacts-using-contact-lists.page
share/help/sl/evolution/contacts-using-several-addressbooks.page
share/help/sl/evolution/credits.page
+share/help/sl/evolution/customize-ui-items.page
share/help/sl/evolution/data-storage.page
share/help/sl/evolution/default-browser.page
share/help/sl/evolution/deleting-appointments.page
share/help/sl/evolution/deleting-emails.page
share/help/sl/evolution/deleting-to-free-disk-space.page
-share/help/sl/evolution/exchange-connectors-overview.page
-share/help/sl/evolution/exchange-placeholder.page
share/help/sl/evolution/exporting-data-calendar.page
share/help/sl/evolution/exporting-data-contacts.page
share/help/sl/evolution/exporting-data-mail.page
@@ -4218,6 +4151,7 @@ share/help/sl/evolution/import-supported-file-formats.page
share/help/sl/evolution/index.page
share/help/sl/evolution/intro-application.page
share/help/sl/evolution/intro-first-run.page
+share/help/sl/evolution/intro-keyboard-shortcuts.page
share/help/sl/evolution/intro-main-window.page
share/help/sl/evolution/legal.xml
share/help/sl/evolution/mail-access-gmail-imap-account.page
@@ -4301,7 +4235,6 @@ share/help/sl/evolution/mail-moving-emails.page
share/help/sl/evolution/mail-not-sent.page
share/help/sl/evolution/mail-organizing.page
share/help/sl/evolution/mail-read-receipts.page
-share/help/sl/evolution/mail-reading-keyboard-shortcuts.page
share/help/sl/evolution/mail-received-notification.page
share/help/sl/evolution/mail-receiving-options-exchange-ews.page
share/help/sl/evolution/mail-receiving-options-exchange-mapi.page
@@ -4314,13 +4247,10 @@ share/help/sl/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/sl/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/sl/evolution/mail-receiving-options-usenet-news.page
share/help/sl/evolution/mail-receiving-options.page
-share/help/sl/evolution/mail-recognized-thread-related-headers.page
share/help/sl/evolution/mail-refresh-folders.page
share/help/sl/evolution/mail-save-as-pdf.page
share/help/sl/evolution/mail-search-folders-add.page
share/help/sl/evolution/mail-search-folders-conditions.page
-share/help/sl/evolution/mail-search-folders-enable.page
-share/help/sl/evolution/mail-search-folders-refresh.page
share/help/sl/evolution/mail-search-folders.page
share/help/sl/evolution/mail-searching-attachment-type.page
share/help/sl/evolution/mail-searching.page
@@ -4394,7 +4324,6 @@ share/help/sv/evolution/calendar-usage.page
share/help/sv/evolution/calendar-using-several-calendars.page
share/help/sv/evolution/calendar-weather.page
share/help/sv/evolution/calendar-webdav.page
-share/help/sv/evolution/change-switcher-appearance.page
share/help/sv/evolution/contacts-add-automatically.page
share/help/sv/evolution/contacts-autocompletion.page
share/help/sv/evolution/contacts-google.page
@@ -4410,13 +4339,12 @@ share/help/sv/evolution/contacts-usage.page
share/help/sv/evolution/contacts-using-contact-lists.page
share/help/sv/evolution/contacts-using-several-addressbooks.page
share/help/sv/evolution/credits.page
+share/help/sv/evolution/customize-ui-items.page
share/help/sv/evolution/data-storage.page
share/help/sv/evolution/default-browser.page
share/help/sv/evolution/deleting-appointments.page
share/help/sv/evolution/deleting-emails.page
share/help/sv/evolution/deleting-to-free-disk-space.page
-share/help/sv/evolution/exchange-connectors-overview.page
-share/help/sv/evolution/exchange-placeholder.page
share/help/sv/evolution/exporting-data-calendar.page
share/help/sv/evolution/exporting-data-contacts.page
share/help/sv/evolution/exporting-data-mail.page
@@ -4450,6 +4378,7 @@ share/help/sv/evolution/import-supported-file-formats.page
share/help/sv/evolution/index.page
share/help/sv/evolution/intro-application.page
share/help/sv/evolution/intro-first-run.page
+share/help/sv/evolution/intro-keyboard-shortcuts.page
share/help/sv/evolution/intro-main-window.page
share/help/sv/evolution/legal.xml
share/help/sv/evolution/mail-access-gmail-imap-account.page
@@ -4533,7 +4462,6 @@ share/help/sv/evolution/mail-moving-emails.page
share/help/sv/evolution/mail-not-sent.page
share/help/sv/evolution/mail-organizing.page
share/help/sv/evolution/mail-read-receipts.page
-share/help/sv/evolution/mail-reading-keyboard-shortcuts.page
share/help/sv/evolution/mail-received-notification.page
share/help/sv/evolution/mail-receiving-options-exchange-ews.page
share/help/sv/evolution/mail-receiving-options-exchange-mapi.page
@@ -4546,13 +4474,10 @@ share/help/sv/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/sv/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/sv/evolution/mail-receiving-options-usenet-news.page
share/help/sv/evolution/mail-receiving-options.page
-share/help/sv/evolution/mail-recognized-thread-related-headers.page
share/help/sv/evolution/mail-refresh-folders.page
share/help/sv/evolution/mail-save-as-pdf.page
share/help/sv/evolution/mail-search-folders-add.page
share/help/sv/evolution/mail-search-folders-conditions.page
-share/help/sv/evolution/mail-search-folders-enable.page
-share/help/sv/evolution/mail-search-folders-refresh.page
share/help/sv/evolution/mail-search-folders.page
share/help/sv/evolution/mail-searching-attachment-type.page
share/help/sv/evolution/mail-searching.page
@@ -4626,7 +4551,6 @@ share/help/te/evolution/calendar-usage.page
share/help/te/evolution/calendar-using-several-calendars.page
share/help/te/evolution/calendar-weather.page
share/help/te/evolution/calendar-webdav.page
-share/help/te/evolution/change-switcher-appearance.page
share/help/te/evolution/contacts-add-automatically.page
share/help/te/evolution/contacts-autocompletion.page
share/help/te/evolution/contacts-google.page
@@ -4642,13 +4566,12 @@ share/help/te/evolution/contacts-usage.page
share/help/te/evolution/contacts-using-contact-lists.page
share/help/te/evolution/contacts-using-several-addressbooks.page
share/help/te/evolution/credits.page
+share/help/te/evolution/customize-ui-items.page
share/help/te/evolution/data-storage.page
share/help/te/evolution/default-browser.page
share/help/te/evolution/deleting-appointments.page
share/help/te/evolution/deleting-emails.page
share/help/te/evolution/deleting-to-free-disk-space.page
-share/help/te/evolution/exchange-connectors-overview.page
-share/help/te/evolution/exchange-placeholder.page
share/help/te/evolution/exporting-data-calendar.page
share/help/te/evolution/exporting-data-contacts.page
share/help/te/evolution/exporting-data-mail.page
@@ -4682,6 +4605,7 @@ share/help/te/evolution/import-supported-file-formats.page
share/help/te/evolution/index.page
share/help/te/evolution/intro-application.page
share/help/te/evolution/intro-first-run.page
+share/help/te/evolution/intro-keyboard-shortcuts.page
share/help/te/evolution/intro-main-window.page
share/help/te/evolution/legal.xml
share/help/te/evolution/mail-access-gmail-imap-account.page
@@ -4765,7 +4689,6 @@ share/help/te/evolution/mail-moving-emails.page
share/help/te/evolution/mail-not-sent.page
share/help/te/evolution/mail-organizing.page
share/help/te/evolution/mail-read-receipts.page
-share/help/te/evolution/mail-reading-keyboard-shortcuts.page
share/help/te/evolution/mail-received-notification.page
share/help/te/evolution/mail-receiving-options-exchange-ews.page
share/help/te/evolution/mail-receiving-options-exchange-mapi.page
@@ -4778,13 +4701,10 @@ share/help/te/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/te/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/te/evolution/mail-receiving-options-usenet-news.page
share/help/te/evolution/mail-receiving-options.page
-share/help/te/evolution/mail-recognized-thread-related-headers.page
share/help/te/evolution/mail-refresh-folders.page
share/help/te/evolution/mail-save-as-pdf.page
share/help/te/evolution/mail-search-folders-add.page
share/help/te/evolution/mail-search-folders-conditions.page
-share/help/te/evolution/mail-search-folders-enable.page
-share/help/te/evolution/mail-search-folders-refresh.page
share/help/te/evolution/mail-search-folders.page
share/help/te/evolution/mail-searching-attachment-type.page
share/help/te/evolution/mail-searching.page
@@ -4858,7 +4778,6 @@ share/help/zh_CN/evolution/calendar-usage.page
share/help/zh_CN/evolution/calendar-using-several-calendars.page
share/help/zh_CN/evolution/calendar-weather.page
share/help/zh_CN/evolution/calendar-webdav.page
-share/help/zh_CN/evolution/change-switcher-appearance.page
share/help/zh_CN/evolution/contacts-add-automatically.page
share/help/zh_CN/evolution/contacts-autocompletion.page
share/help/zh_CN/evolution/contacts-google.page
@@ -4874,13 +4793,12 @@ share/help/zh_CN/evolution/contacts-usage.page
share/help/zh_CN/evolution/contacts-using-contact-lists.page
share/help/zh_CN/evolution/contacts-using-several-addressbooks.page
share/help/zh_CN/evolution/credits.page
+share/help/zh_CN/evolution/customize-ui-items.page
share/help/zh_CN/evolution/data-storage.page
share/help/zh_CN/evolution/default-browser.page
share/help/zh_CN/evolution/deleting-appointments.page
share/help/zh_CN/evolution/deleting-emails.page
share/help/zh_CN/evolution/deleting-to-free-disk-space.page
-share/help/zh_CN/evolution/exchange-connectors-overview.page
-share/help/zh_CN/evolution/exchange-placeholder.page
share/help/zh_CN/evolution/exporting-data-calendar.page
share/help/zh_CN/evolution/exporting-data-contacts.page
share/help/zh_CN/evolution/exporting-data-mail.page
@@ -4914,6 +4832,7 @@ share/help/zh_CN/evolution/import-supported-file-formats.page
share/help/zh_CN/evolution/index.page
share/help/zh_CN/evolution/intro-application.page
share/help/zh_CN/evolution/intro-first-run.page
+share/help/zh_CN/evolution/intro-keyboard-shortcuts.page
share/help/zh_CN/evolution/intro-main-window.page
share/help/zh_CN/evolution/legal.xml
share/help/zh_CN/evolution/mail-access-gmail-imap-account.page
@@ -4997,7 +4916,6 @@ share/help/zh_CN/evolution/mail-moving-emails.page
share/help/zh_CN/evolution/mail-not-sent.page
share/help/zh_CN/evolution/mail-organizing.page
share/help/zh_CN/evolution/mail-read-receipts.page
-share/help/zh_CN/evolution/mail-reading-keyboard-shortcuts.page
share/help/zh_CN/evolution/mail-received-notification.page
share/help/zh_CN/evolution/mail-receiving-options-exchange-ews.page
share/help/zh_CN/evolution/mail-receiving-options-exchange-mapi.page
@@ -5010,13 +4928,10 @@ share/help/zh_CN/evolution/mail-receiving-options-unix-mbox-spool-directory.page
share/help/zh_CN/evolution/mail-receiving-options-unix-mbox-spool-file.page
share/help/zh_CN/evolution/mail-receiving-options-usenet-news.page
share/help/zh_CN/evolution/mail-receiving-options.page
-share/help/zh_CN/evolution/mail-recognized-thread-related-headers.page
share/help/zh_CN/evolution/mail-refresh-folders.page
share/help/zh_CN/evolution/mail-save-as-pdf.page
share/help/zh_CN/evolution/mail-search-folders-add.page
share/help/zh_CN/evolution/mail-search-folders-conditions.page
-share/help/zh_CN/evolution/mail-search-folders-enable.page
-share/help/zh_CN/evolution/mail-search-folders-refresh.page
share/help/zh_CN/evolution/mail-search-folders.page
share/help/zh_CN/evolution/mail-searching-attachment-type.page
share/help/zh_CN/evolution/mail-searching.page
@@ -5083,96 +4998,100 @@ 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/symbolic/apps/evolution-symbolic.svg
-share/locale/af/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/an/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/as/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ast/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/be@latin/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/br/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ca@valencia/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/cy/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/dz/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/en@shaw/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/en_AU/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/eo/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/et/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fa/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/fur/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ga/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/gu/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/he/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/hi/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/is/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ka/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/kk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/kn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ku/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mai/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ml/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/mr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nds/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ne/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/oc/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/or/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ps/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ro/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/rw/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/si/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sl/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sr@latin/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ta/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/te/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/tg/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/th/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/ug/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/wa/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/af/LC_MESSAGES/evolution.mo
+share/locale/am/LC_MESSAGES/evolution.mo
+share/locale/an/LC_MESSAGES/evolution.mo
+share/locale/ar/LC_MESSAGES/evolution.mo
+share/locale/as/LC_MESSAGES/evolution.mo
+share/locale/ast/LC_MESSAGES/evolution.mo
+share/locale/az/LC_MESSAGES/evolution.mo
+share/locale/be/LC_MESSAGES/evolution.mo
+share/locale/be@latin/LC_MESSAGES/evolution.mo
+share/locale/bg/LC_MESSAGES/evolution.mo
+share/locale/bn/LC_MESSAGES/evolution.mo
+share/locale/bn_IN/LC_MESSAGES/evolution.mo
+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/cs/LC_MESSAGES/evolution.mo
+share/locale/cy/LC_MESSAGES/evolution.mo
+share/locale/da/LC_MESSAGES/evolution.mo
+share/locale/de/LC_MESSAGES/evolution.mo
+share/locale/dz/LC_MESSAGES/evolution.mo
+share/locale/el/LC_MESSAGES/evolution.mo
+share/locale/en@shaw/LC_MESSAGES/evolution.mo
+share/locale/en_AU/LC_MESSAGES/evolution.mo
+share/locale/en_CA/LC_MESSAGES/evolution.mo
+share/locale/en_GB/LC_MESSAGES/evolution.mo
+share/locale/eo/LC_MESSAGES/evolution.mo
+share/locale/es/LC_MESSAGES/evolution.mo
+share/locale/et/LC_MESSAGES/evolution.mo
+share/locale/eu/LC_MESSAGES/evolution.mo
+share/locale/fa/LC_MESSAGES/evolution.mo
+share/locale/fi/LC_MESSAGES/evolution.mo
+share/locale/fr/LC_MESSAGES/evolution.mo
+share/locale/fur/LC_MESSAGES/evolution.mo
+share/locale/ga/LC_MESSAGES/evolution.mo
+share/locale/gl/LC_MESSAGES/evolution.mo
+share/locale/gu/LC_MESSAGES/evolution.mo
+share/locale/he/LC_MESSAGES/evolution.mo
+share/locale/hi/LC_MESSAGES/evolution.mo
+share/locale/hr/LC_MESSAGES/evolution.mo
+share/locale/hu/LC_MESSAGES/evolution.mo
+share/locale/id/LC_MESSAGES/evolution.mo
+share/locale/is/LC_MESSAGES/evolution.mo
+share/locale/it/LC_MESSAGES/evolution.mo
+share/locale/ja/LC_MESSAGES/evolution.mo
+share/locale/ka/LC_MESSAGES/evolution.mo
+share/locale/kk/LC_MESSAGES/evolution.mo
+share/locale/kn/LC_MESSAGES/evolution.mo
+share/locale/ko/LC_MESSAGES/evolution.mo
+share/locale/ku/LC_MESSAGES/evolution.mo
+share/locale/lt/LC_MESSAGES/evolution.mo
+share/locale/lv/LC_MESSAGES/evolution.mo
+share/locale/mai/LC_MESSAGES/evolution.mo
+share/locale/mk/LC_MESSAGES/evolution.mo
+share/locale/ml/LC_MESSAGES/evolution.mo
+share/locale/mn/LC_MESSAGES/evolution.mo
+share/locale/mr/LC_MESSAGES/evolution.mo
+share/locale/ms/LC_MESSAGES/evolution.mo
+share/locale/nb/LC_MESSAGES/evolution.mo
+share/locale/nds/LC_MESSAGES/evolution.mo
+share/locale/ne/LC_MESSAGES/evolution.mo
+share/locale/nl/LC_MESSAGES/evolution.mo
+share/locale/nn/LC_MESSAGES/evolution.mo
+share/locale/oc/LC_MESSAGES/evolution.mo
+share/locale/or/LC_MESSAGES/evolution.mo
+share/locale/pa/LC_MESSAGES/evolution.mo
+share/locale/pl/LC_MESSAGES/evolution.mo
+share/locale/ps/LC_MESSAGES/evolution.mo
+share/locale/pt/LC_MESSAGES/evolution.mo
+share/locale/pt_BR/LC_MESSAGES/evolution.mo
+share/locale/ro/LC_MESSAGES/evolution.mo
+share/locale/ru/LC_MESSAGES/evolution.mo
+share/locale/rw/LC_MESSAGES/evolution.mo
+share/locale/si/LC_MESSAGES/evolution.mo
+share/locale/sk/LC_MESSAGES/evolution.mo
+share/locale/sl/LC_MESSAGES/evolution.mo
+share/locale/sq/LC_MESSAGES/evolution.mo
+share/locale/sr/LC_MESSAGES/evolution.mo
+share/locale/sr@latin/LC_MESSAGES/evolution.mo
+share/locale/sv/LC_MESSAGES/evolution.mo
+share/locale/ta/LC_MESSAGES/evolution.mo
+share/locale/te/LC_MESSAGES/evolution.mo
+share/locale/tg/LC_MESSAGES/evolution.mo
+share/locale/th/LC_MESSAGES/evolution.mo
+share/locale/tr/LC_MESSAGES/evolution.mo
+share/locale/ug/LC_MESSAGES/evolution.mo
+share/locale/uk/LC_MESSAGES/evolution.mo
+share/locale/vi/LC_MESSAGES/evolution.mo
+share/locale/wa/LC_MESSAGES/evolution.mo
+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
+%%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
+share/metainfo/org.gnome.Evolution.appdata.xml
diff --git a/mail/geary/Makefile b/mail/geary/Makefile
index 88820f7eed9e..99f30772534b 100644
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@@ -1,10 +1,8 @@
# Created by: Gustau Perez <gustau.perez@gmail.com>
# $FreeBSD$
-# $MCom: ports/trunk/mail/geary/Makefile 20050 2014-11-10 09:22:41Z gusi $
PORTNAME= geary
-PORTVERSION= 0.12.1
-PORTREVISION= 1
+PORTVERSION= 0.12.2
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/mail/geary/distinfo b/mail/geary/distinfo
index 327c48f5bc67..05cb5d59a4bb 100644
--- a/mail/geary/distinfo
+++ b/mail/geary/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522699547
-SHA256 (gnome3/geary-0.12.1.tar.xz) = 065a9cd9692d6c120cd5d582aa27a05da01ec6d3af629dad1061e5214bbb0b8a
-SIZE (gnome3/geary-0.12.1.tar.xz) = 1066168
+TIMESTAMP = 1525760008
+SHA256 (gnome3/geary-0.12.2.tar.xz) = a9ef2889cf90a44462c374308eef7539193e6703c06fe6c5632e91fa097c4526
+SIZE (gnome3/geary-0.12.2.tar.xz) = 1068428
diff --git a/mail/geary/pkg-plist b/mail/geary/pkg-plist
index bc864da8fe64..9c9ffecde838 100644
--- a/mail/geary/pkg-plist
+++ b/mail/geary/pkg-plist
@@ -151,12 +151,12 @@ share/gnome/help/geary/sv/search.page
share/gnome/help/geary/sv/shortcuts.page
share/gnome/help/geary/sv/star.page
share/gnome/help/geary/sv/write.page
-share/icons/hicolor/16x16/apps/geary.png
-share/icons/hicolor/24x24/apps/geary.png
-share/icons/hicolor/256x256/apps/geary.png
-share/icons/hicolor/32x32/apps/geary.png
-share/icons/hicolor/48x48/apps/geary.png
-share/icons/hicolor/512x512/apps/geary.png
+share/icons/hicolor/16x16/apps/org.gnome.Geary.png
+share/icons/hicolor/24x24/apps/org.gnome.Geary.png
+share/icons/hicolor/256x256/apps/org.gnome.Geary.png
+share/icons/hicolor/32x32/apps/org.gnome.Geary.png
+share/icons/hicolor/48x48/apps/org.gnome.Geary.png
+share/icons/hicolor/512x512/apps/org.gnome.Geary.png
share/icons/hicolor/scalable/actions/close-symbolic.svg
share/icons/hicolor/scalable/actions/detach-symbolic.svg
share/icons/hicolor/scalable/actions/edit-symbolic.svg
@@ -178,7 +178,7 @@ share/icons/hicolor/scalable/actions/marker-symbolic.svg
share/icons/hicolor/scalable/actions/tag-symbolic-rtl.svg
share/icons/hicolor/scalable/actions/tag-symbolic.svg
share/icons/hicolor/scalable/actions/text-x-generic-symbolic.svg
-share/icons/hicolor/symbolic/apps/geary-symbolic.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Geary-symbolic.svg
share/locale/ar/LC_MESSAGES/geary.mo
share/locale/bs/LC_MESSAGES/geary.mo
share/locale/ca/LC_MESSAGES/geary.mo
diff --git a/math/gnome-calculator/Makefile b/math/gnome-calculator/Makefile
index 905d636aa6c0..9547ed316d40 100644
--- a/math/gnome-calculator/Makefile
+++ b/math/gnome-calculator/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-calculator
-PORTVERSION= 3.26.0
-PORTREVISION= 1
+PORTVERSION= 3.28.2
CATEGORIES= math gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 3 calculator tool
@@ -14,20 +13,18 @@ COMMENT= GNOME 3 calculator tool
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= itstool:textproc/itstool \
- vala:lang/vala
+BUILD_DEPENDS= vala:lang/vala \
+ itstool:textproc/itstool
LIB_DEPENDS= libmpfr.so:math/mpfr \
- libgmp.so:math/gmp \
libmpc.so:math/mpc \
libsoup-2.4.so:devel/libsoup
PORTSCOUT= limitw:1,even
-USES= compiler:c11 gettext gmake gnome libtool \
- localbase pkgconfig tar:xz
-USE_GNOME= cairo gdkpixbuf2 gtk30 gtksourceview3 intltool
-GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
+USES= compiler:c11 gettext gnome localbase:ldflags meson \
+ pkgconfig python:3.6+,build tar:xz
+USE_GNOME= gtksourceview3 libxml2
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.calculator.gschema.xml
diff --git a/math/gnome-calculator/distinfo b/math/gnome-calculator/distinfo
index c5da248e57e9..300e273132ff 100644
--- a/math/gnome-calculator/distinfo
+++ b/math/gnome-calculator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526070988
-SHA256 (gnome3/gnome-calculator-3.26.0.tar.xz) = 62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7
-SIZE (gnome3/gnome-calculator-3.26.0.tar.xz) = 1716484
+TIMESTAMP = 1529614263
+SHA256 (gnome/gnome-calculator-3.28.2.tar.xz) = bad41e322fc82f13f0fa0c773ad96802c272498adf8e2c8b8054549718cefa47
+SIZE (gnome/gnome-calculator-3.28.2.tar.xz) = 1834340
diff --git a/math/gnome-calculator/pkg-plist b/math/gnome-calculator/pkg-plist
index 2704487edc79..9566ac60d584 100644
--- a/math/gnome-calculator/pkg-plist
+++ b/math/gnome-calculator/pkg-plist
@@ -1,11 +1,8 @@
bin/gcalccmd
bin/gnome-calculator
-lib/gnome-calculator/libcalculator.a
-lib/gnome-calculator/libcalculator.so
libexec/gnome-calculator-search-provider
man/man1/gcalccmd.1.gz
man/man1/gnome-calculator.1.gz
-share/appdata/org.gnome.Calculator.appdata.xml
share/applications/org.gnome.Calculator.desktop
share/dbus-1/services/org.gnome.Calculator.SearchProvider.service
share/gnome-shell/search-providers/org.gnome.Calculator-search-provider.ini
@@ -849,6 +846,14 @@ share/help/zh_TW/gnome-calculator/scientific.page
share/help/zh_TW/gnome-calculator/superscript.page
share/help/zh_TW/gnome-calculator/trigonometry.page
share/help/zh_TW/gnome-calculator/variables.page
+share/icons/hicolor/16x16/apps/gnome-calculator.png
+share/icons/hicolor/22x22/apps/gnome-calculator.png
+share/icons/hicolor/24x24/apps/gnome-calculator.png
+share/icons/hicolor/256x256/apps/gnome-calculator.png
+share/icons/hicolor/32x32/apps/gnome-calculator.png
+share/icons/hicolor/48x48/apps/gnome-calculator.png
+share/icons/hicolor/512x512/apps/gnome-calculator.png
+share/icons/hicolor/scalable/apps/gnome-calculator-symbolic.svg
share/locale/af/LC_MESSAGES/gnome-calculator.mo
share/locale/am/LC_MESSAGES/gnome-calculator.mo
share/locale/ar/LC_MESSAGES/gnome-calculator.mo
@@ -941,3 +946,4 @@ share/locale/xh/LC_MESSAGES/gnome-calculator.mo
share/locale/zh_CN/LC_MESSAGES/gnome-calculator.mo
share/locale/zh_HK/LC_MESSAGES/gnome-calculator.mo
share/locale/zh_TW/LC_MESSAGES/gnome-calculator.mo
+share/metainfo/org.gnome.Calculator.appdata.xml
diff --git a/misc/Makefile b/misc/Makefile
index 9e2f9e50c864..ffb6f4cc60b5 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -154,6 +154,7 @@
SUBDIR += gkrellweather2
SUBDIR += gkx86info2
SUBDIR += gnome-devel-docs
+ SUBDIR += gnome-getting-started-docs
SUBDIR += gnome-icon-theme
SUBDIR += gnome-icon-theme-extras
SUBDIR += gnome-mime-data
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index 6f6d7aba5195..54e54771aa9a 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= gnome-devel-docs
-PORTVERSION= 3.18.1
+PORTVERSION= 3.28.0
CATEGORIES= misc gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Documents targeted for GNOME developers
diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo
index b404b7eef180..a58f0ff6324f 100644
--- a/misc/gnome-devel-docs/distinfo
+++ b/misc/gnome-devel-docs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-devel-docs-3.18.1.tar.xz) = 33d06a27bd41107fcb0cf6d447e113db081c0d08fb2d041317ad2b8abae7d880
-SIZE (gnome3/gnome-devel-docs-3.18.1.tar.xz) = 8987996
+TIMESTAMP = 1526110305
+SHA256 (gnome/gnome-devel-docs-3.28.0.tar.xz) = e400ba8db98fdb6770d5f0b9ae1020b55a377d2186f0986e209aabfb9dffc0df
+SIZE (gnome/gnome-devel-docs-3.28.0.tar.xz) = 9565256
diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist
index 9c9164b05334..9ca9354ae69c 100644
--- a/misc/gnome-devel-docs/pkg-plist
+++ b/misc/gnome-devel-docs/pkg-plist
@@ -3,11 +3,14 @@ share/help/C/accessibility-devel-guide/figures/at-arch.png
share/help/C/accessibility-devel-guide/figures/badfocus1.png
share/help/C/accessibility-devel-guide/figures/badfocus2.png
share/help/C/accessibility-devel-guide/figures/badfocus3.png
+share/help/C/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/C/accessibility-devel-guide/figures/color_only.png
share/help/C/accessibility-devel-guide/figures/depend1.png
share/help/C/accessibility-devel-guide/figures/depend1a.png
share/help/C/accessibility-devel-guide/figures/depend2.png
share/help/C/accessibility-devel-guide/figures/depend2a.png
share/help/C/accessibility-devel-guide/figures/depend3.png
+share/help/C/accessibility-devel-guide/figures/gaa.jpg
share/help/C/accessibility-devel-guide/figures/goodfocus.png
share/help/C/accessibility-devel-guide/figures/goodfocus2.png
share/help/C/accessibility-devel-guide/figures/goodfocus3.png
@@ -627,6 +630,7 @@ share/help/C/platform-overview/dev-translate-setup.page
share/help/C/platform-overview/dev-translate-tools.page
share/help/C/platform-overview/dev-translate.page
share/help/C/platform-overview/index.page
+share/help/C/platform-overview/legal.xml
share/help/C/platform-overview/license.page
share/help/C/platform-overview/media/glade-new-window.png
share/help/C/platform-overview/media/glade-result.png
@@ -646,7 +650,6 @@ share/help/C/platform-overview/tech-champlain.page
share/help/C/platform-overview/tech-clutter.page
share/help/C/platform-overview/tech-d-bus.page
share/help/C/platform-overview/tech-eds.page
-share/help/C/platform-overview/tech-enchant.page
share/help/C/platform-overview/tech-folks.page
share/help/C/platform-overview/tech-gda.page
share/help/C/platform-overview/tech-gdk.page
@@ -670,6 +673,7 @@ share/help/C/platform-overview/tech-poppler.page
share/help/C/platform-overview/tech-pulseaudio.page
share/help/C/platform-overview/tech-secret.page
share/help/C/platform-overview/tech-soup.page
+share/help/C/platform-overview/tech-spell-checking.page
share/help/C/platform-overview/tech-telepathy.page
share/help/C/platform-overview/tech-tracker.page
share/help/C/platform-overview/tech-webkit.page
@@ -1195,6 +1199,7 @@ share/help/ca/platform-overview/dev-translate-setup.page
share/help/ca/platform-overview/dev-translate-tools.page
share/help/ca/platform-overview/dev-translate.page
share/help/ca/platform-overview/index.page
+share/help/ca/platform-overview/legal.xml
share/help/ca/platform-overview/license.page
share/help/ca/platform-overview/media/glade-new-window.png
share/help/ca/platform-overview/media/glade-result.png
@@ -1214,7 +1219,6 @@ share/help/ca/platform-overview/tech-champlain.page
share/help/ca/platform-overview/tech-clutter.page
share/help/ca/platform-overview/tech-d-bus.page
share/help/ca/platform-overview/tech-eds.page
-share/help/ca/platform-overview/tech-enchant.page
share/help/ca/platform-overview/tech-folks.page
share/help/ca/platform-overview/tech-gda.page
share/help/ca/platform-overview/tech-gdk.page
@@ -1238,6 +1242,7 @@ share/help/ca/platform-overview/tech-poppler.page
share/help/ca/platform-overview/tech-pulseaudio.page
share/help/ca/platform-overview/tech-secret.page
share/help/ca/platform-overview/tech-soup.page
+share/help/ca/platform-overview/tech-spell-checking.page
share/help/ca/platform-overview/tech-telepathy.page
share/help/ca/platform-overview/tech-tracker.page
share/help/ca/platform-overview/tech-webkit.page
@@ -1254,11 +1259,14 @@ share/help/cs/accessibility-devel-guide/figures/at-arch.png
share/help/cs/accessibility-devel-guide/figures/badfocus1.png
share/help/cs/accessibility-devel-guide/figures/badfocus2.png
share/help/cs/accessibility-devel-guide/figures/badfocus3.png
+share/help/cs/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/cs/accessibility-devel-guide/figures/color_only.png
share/help/cs/accessibility-devel-guide/figures/depend1.png
share/help/cs/accessibility-devel-guide/figures/depend1a.png
share/help/cs/accessibility-devel-guide/figures/depend2.png
share/help/cs/accessibility-devel-guide/figures/depend2a.png
share/help/cs/accessibility-devel-guide/figures/depend3.png
+share/help/cs/accessibility-devel-guide/figures/gaa.jpg
share/help/cs/accessibility-devel-guide/figures/goodfocus.png
share/help/cs/accessibility-devel-guide/figures/goodfocus2.png
share/help/cs/accessibility-devel-guide/figures/goodfocus3.png
@@ -1741,6 +1749,118 @@ share/help/cs/gnome-devel-demos/window.c.page
share/help/cs/gnome-devel-demos/window.js.page
share/help/cs/gnome-devel-demos/window.py.page
share/help/cs/gnome-devel-demos/window.vala.page
+share/help/cs/hig/action-bars.page
+share/help/cs/hig/application-basics.page
+share/help/cs/hig/application-menus.page
+share/help/cs/hig/button-menus.page
+share/help/cs/hig/buttons.page
+share/help/cs/hig/check-boxes.page
+share/help/cs/hig/compatibility.page
+share/help/cs/hig/design-principles.page
+share/help/cs/hig/dialogs.page
+share/help/cs/hig/display-compatibility.page
+share/help/cs/hig/drop-down-lists.page
+share/help/cs/hig/empty-placeholders.page
+share/help/cs/hig/figures/hig.png
+share/help/cs/hig/figures/icons/inverting.svg
+share/help/cs/hig/figures/icons/palette/aluminium1.svg
+share/help/cs/hig/figures/icons/palette/aluminium2.svg
+share/help/cs/hig/figures/icons/palette/butter.svg
+share/help/cs/hig/figures/icons/palette/chameleon.svg
+share/help/cs/hig/figures/icons/palette/chocolate.svg
+share/help/cs/hig/figures/icons/palette/orange.svg
+share/help/cs/hig/figures/icons/palette/plum.svg
+share/help/cs/hig/figures/icons/palette/scarlet-red.svg
+share/help/cs/hig/figures/icons/palette/sky-blue.svg
+share/help/cs/hig/figures/icons/sizes-small-24.png
+share/help/cs/hig/figures/icons/sizes.png
+share/help/cs/hig/figures/label-alignment.svg
+share/help/cs/hig/figures/patterns/action-bar.svg
+share/help/cs/hig/figures/patterns/action-dialog.svg
+share/help/cs/hig/figures/patterns/application-menu.svg
+share/help/cs/hig/figures/patterns/editable-lists.svg
+share/help/cs/hig/figures/patterns/empty-placeholder.svg
+share/help/cs/hig/figures/patterns/grid.svg
+share/help/cs/hig/figures/patterns/header-bar-menu.svg
+share/help/cs/hig/figures/patterns/header-bar.svg
+share/help/cs/hig/figures/patterns/in-app-notification.svg
+share/help/cs/hig/figures/patterns/info-bar.svg
+share/help/cs/hig/figures/patterns/list-styles.svg
+share/help/cs/hig/figures/patterns/message-dialog.svg
+share/help/cs/hig/figures/patterns/overlaid-controls.svg
+share/help/cs/hig/figures/patterns/patterns.svg
+share/help/cs/hig/figures/patterns/presentation-dialog.svg
+share/help/cs/hig/figures/patterns/primary-windows.svg
+share/help/cs/hig/figures/patterns/search.svg
+share/help/cs/hig/figures/patterns/selection-mode.svg
+share/help/cs/hig/figures/patterns/sidebar-list.svg
+share/help/cs/hig/figures/patterns/view-switcher.svg
+share/help/cs/hig/figures/touch/3-finger-hold-and-tap.svg
+share/help/cs/hig/figures/touch/3-finger-pinch.svg
+share/help/cs/hig/figures/touch/4-finger-drag.svg
+share/help/cs/hig/figures/touch/double-tap.svg
+share/help/cs/hig/figures/touch/drag.svg
+share/help/cs/hig/figures/touch/edge-drag.svg
+share/help/cs/hig/figures/touch/flick.svg
+share/help/cs/hig/figures/touch/pinch-or-stretch.svg
+share/help/cs/hig/figures/touch/tap-and-hold.svg
+share/help/cs/hig/figures/touch/tap.svg
+share/help/cs/hig/figures/ui-elements/button-menu.svg
+share/help/cs/hig/figures/ui-elements/buttons.svg
+share/help/cs/hig/figures/ui-elements/check-boxes.svg
+share/help/cs/hig/figures/ui-elements/drop-down-list-custom-values.svg
+share/help/cs/hig/figures/ui-elements/drop-down-list.svg
+share/help/cs/hig/figures/ui-elements/hybrid-button-menu.svg
+share/help/cs/hig/figures/ui-elements/menu-bar.svg
+share/help/cs/hig/figures/ui-elements/menu.svg
+share/help/cs/hig/figures/ui-elements/popover.svg
+share/help/cs/hig/figures/ui-elements/progress-bars.svg
+share/help/cs/hig/figures/ui-elements/progress-spinner.svg
+share/help/cs/hig/figures/ui-elements/radio-buttons.svg
+share/help/cs/hig/figures/ui-elements/sliders.svg
+share/help/cs/hig/figures/ui-elements/spin-boxes.svg
+share/help/cs/hig/figures/ui-elements/switches.svg
+share/help/cs/hig/figures/ui-elements/tabs.svg
+share/help/cs/hig/figures/ui-elements/text-fields.svg
+share/help/cs/hig/figures/ui-elements/toolbar.svg
+share/help/cs/hig/figures/visual-alignment-correct.svg
+share/help/cs/hig/figures/visual-alignment-incorrect.svg
+share/help/cs/hig/figures/visual-alignment-spacing.svg
+share/help/cs/hig/grids.page
+share/help/cs/hig/header-bar-menus.page
+share/help/cs/hig/header-bars.page
+share/help/cs/hig/icons-and-artwork.page
+share/help/cs/hig/in-app-notifications.page
+share/help/cs/hig/index.page
+share/help/cs/hig/info-bars.page
+share/help/cs/hig/keyboard-input.page
+share/help/cs/hig/legal.xml
+share/help/cs/hig/lists.page
+share/help/cs/hig/menu-bars.page
+share/help/cs/hig/menus.page
+share/help/cs/hig/notifications.page
+share/help/cs/hig/overlaid-controls.page
+share/help/cs/hig/patterns.page
+share/help/cs/hig/pointer-and-touch-input.page
+share/help/cs/hig/popovers.page
+share/help/cs/hig/primary-windows.page
+share/help/cs/hig/progress-bars.page
+share/help/cs/hig/progress-spinners.page
+share/help/cs/hig/radio-buttons.page
+share/help/cs/hig/search.page
+share/help/cs/hig/selection-mode.page
+share/help/cs/hig/sidebar-lists.page
+share/help/cs/hig/sliders.page
+share/help/cs/hig/spin-boxes.page
+share/help/cs/hig/switches.page
+share/help/cs/hig/tabs.page
+share/help/cs/hig/text-fields.page
+share/help/cs/hig/toolbars.page
+share/help/cs/hig/typography.page
+share/help/cs/hig/ui-elements.page
+share/help/cs/hig/view-switchers.page
+share/help/cs/hig/visual-layout.page
+share/help/cs/hig/writing-style.page
share/help/cs/optimization-guide/figures/massif-after.png
share/help/cs/optimization-guide/figures/massif-before.png
share/help/cs/optimization-guide/harmful.page
@@ -1763,6 +1883,7 @@ share/help/cs/platform-overview/dev-translate-setup.page
share/help/cs/platform-overview/dev-translate-tools.page
share/help/cs/platform-overview/dev-translate.page
share/help/cs/platform-overview/index.page
+share/help/cs/platform-overview/legal.xml
share/help/cs/platform-overview/license.page
share/help/cs/platform-overview/media/glade-new-window.png
share/help/cs/platform-overview/media/glade-result.png
@@ -1782,7 +1903,6 @@ share/help/cs/platform-overview/tech-champlain.page
share/help/cs/platform-overview/tech-clutter.page
share/help/cs/platform-overview/tech-d-bus.page
share/help/cs/platform-overview/tech-eds.page
-share/help/cs/platform-overview/tech-enchant.page
share/help/cs/platform-overview/tech-folks.page
share/help/cs/platform-overview/tech-gda.page
share/help/cs/platform-overview/tech-gdk.page
@@ -1806,6 +1926,7 @@ share/help/cs/platform-overview/tech-poppler.page
share/help/cs/platform-overview/tech-pulseaudio.page
share/help/cs/platform-overview/tech-secret.page
share/help/cs/platform-overview/tech-soup.page
+share/help/cs/platform-overview/tech-spell-checking.page
share/help/cs/platform-overview/tech-telepathy.page
share/help/cs/platform-overview/tech-tracker.page
share/help/cs/platform-overview/tech-webkit.page
@@ -1817,16 +1938,42 @@ share/help/cs/platform-overview/tour-gjs.page
share/help/cs/platform-overview/tour-glade.page
share/help/cs/platform-overview/tour-summary.page
share/help/cs/platform-overview/tour.page
+share/help/cs/programming-guidelines/additional-materials.page
+share/help/cs/programming-guidelines/api-stability.page
+share/help/cs/programming-guidelines/c-coding-style.page
+share/help/cs/programming-guidelines/cc-by-sa-3-0.xml
+share/help/cs/programming-guidelines/databases.page
+share/help/cs/programming-guidelines/documentation.page
+share/help/cs/programming-guidelines/file-system.page
+share/help/cs/programming-guidelines/gerror.page
+share/help/cs/programming-guidelines/glist.page
+share/help/cs/programming-guidelines/index.page
+share/help/cs/programming-guidelines/introspection.page
+share/help/cs/programming-guidelines/logging.page
+share/help/cs/programming-guidelines/main-contexts.page
+share/help/cs/programming-guidelines/memory-management.page
+share/help/cs/programming-guidelines/namespacing.page
+share/help/cs/programming-guidelines/parallel-installability.page
+share/help/cs/programming-guidelines/preconditions.page
+share/help/cs/programming-guidelines/threading.page
+share/help/cs/programming-guidelines/tooling.page
+share/help/cs/programming-guidelines/unit-testing.page
+share/help/cs/programming-guidelines/version-control.page
+share/help/cs/programming-guidelines/versioning.page
+share/help/cs/programming-guidelines/writing-good-code.page
share/help/de/accessibility-devel-guide/figures/GNOME_desktop_Accessibility.png
share/help/de/accessibility-devel-guide/figures/at-arch.png
share/help/de/accessibility-devel-guide/figures/badfocus1.png
share/help/de/accessibility-devel-guide/figures/badfocus2.png
share/help/de/accessibility-devel-guide/figures/badfocus3.png
+share/help/de/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/de/accessibility-devel-guide/figures/color_only.png
share/help/de/accessibility-devel-guide/figures/depend1.png
share/help/de/accessibility-devel-guide/figures/depend1a.png
share/help/de/accessibility-devel-guide/figures/depend2.png
share/help/de/accessibility-devel-guide/figures/depend2a.png
share/help/de/accessibility-devel-guide/figures/depend3.png
+share/help/de/accessibility-devel-guide/figures/gaa.jpg
share/help/de/accessibility-devel-guide/figures/goodfocus.png
share/help/de/accessibility-devel-guide/figures/goodfocus2.png
share/help/de/accessibility-devel-guide/figures/goodfocus3.png
@@ -2443,6 +2590,7 @@ share/help/de/platform-overview/dev-translate-setup.page
share/help/de/platform-overview/dev-translate-tools.page
share/help/de/platform-overview/dev-translate.page
share/help/de/platform-overview/index.page
+share/help/de/platform-overview/legal.xml
share/help/de/platform-overview/license.page
share/help/de/platform-overview/media/glade-new-window.png
share/help/de/platform-overview/media/glade-result.png
@@ -2462,7 +2610,6 @@ share/help/de/platform-overview/tech-champlain.page
share/help/de/platform-overview/tech-clutter.page
share/help/de/platform-overview/tech-d-bus.page
share/help/de/platform-overview/tech-eds.page
-share/help/de/platform-overview/tech-enchant.page
share/help/de/platform-overview/tech-folks.page
share/help/de/platform-overview/tech-gda.page
share/help/de/platform-overview/tech-gdk.page
@@ -2486,6 +2633,7 @@ share/help/de/platform-overview/tech-poppler.page
share/help/de/platform-overview/tech-pulseaudio.page
share/help/de/platform-overview/tech-secret.page
share/help/de/platform-overview/tech-soup.page
+share/help/de/platform-overview/tech-spell-checking.page
share/help/de/platform-overview/tech-telepathy.page
share/help/de/platform-overview/tech-tracker.page
share/help/de/platform-overview/tech-webkit.page
@@ -2497,16 +2645,42 @@ share/help/de/platform-overview/tour-gjs.page
share/help/de/platform-overview/tour-glade.page
share/help/de/platform-overview/tour-summary.page
share/help/de/platform-overview/tour.page
+share/help/de/programming-guidelines/additional-materials.page
+share/help/de/programming-guidelines/api-stability.page
+share/help/de/programming-guidelines/c-coding-style.page
+share/help/de/programming-guidelines/cc-by-sa-3-0.xml
+share/help/de/programming-guidelines/databases.page
+share/help/de/programming-guidelines/documentation.page
+share/help/de/programming-guidelines/file-system.page
+share/help/de/programming-guidelines/gerror.page
+share/help/de/programming-guidelines/glist.page
+share/help/de/programming-guidelines/index.page
+share/help/de/programming-guidelines/introspection.page
+share/help/de/programming-guidelines/logging.page
+share/help/de/programming-guidelines/main-contexts.page
+share/help/de/programming-guidelines/memory-management.page
+share/help/de/programming-guidelines/namespacing.page
+share/help/de/programming-guidelines/parallel-installability.page
+share/help/de/programming-guidelines/preconditions.page
+share/help/de/programming-guidelines/threading.page
+share/help/de/programming-guidelines/tooling.page
+share/help/de/programming-guidelines/unit-testing.page
+share/help/de/programming-guidelines/version-control.page
+share/help/de/programming-guidelines/versioning.page
+share/help/de/programming-guidelines/writing-good-code.page
share/help/el/accessibility-devel-guide/figures/GNOME_desktop_Accessibility.png
share/help/el/accessibility-devel-guide/figures/at-arch.png
share/help/el/accessibility-devel-guide/figures/badfocus1.png
share/help/el/accessibility-devel-guide/figures/badfocus2.png
share/help/el/accessibility-devel-guide/figures/badfocus3.png
+share/help/el/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/el/accessibility-devel-guide/figures/color_only.png
share/help/el/accessibility-devel-guide/figures/depend1.png
share/help/el/accessibility-devel-guide/figures/depend1a.png
share/help/el/accessibility-devel-guide/figures/depend2.png
share/help/el/accessibility-devel-guide/figures/depend2a.png
share/help/el/accessibility-devel-guide/figures/depend3.png
+share/help/el/accessibility-devel-guide/figures/gaa.jpg
share/help/el/accessibility-devel-guide/figures/goodfocus.png
share/help/el/accessibility-devel-guide/figures/goodfocus2.png
share/help/el/accessibility-devel-guide/figures/goodfocus3.png
@@ -3123,6 +3297,7 @@ share/help/el/platform-overview/dev-translate-setup.page
share/help/el/platform-overview/dev-translate-tools.page
share/help/el/platform-overview/dev-translate.page
share/help/el/platform-overview/index.page
+share/help/el/platform-overview/legal.xml
share/help/el/platform-overview/license.page
share/help/el/platform-overview/media/glade-new-window.png
share/help/el/platform-overview/media/glade-result.png
@@ -3142,7 +3317,6 @@ share/help/el/platform-overview/tech-champlain.page
share/help/el/platform-overview/tech-clutter.page
share/help/el/platform-overview/tech-d-bus.page
share/help/el/platform-overview/tech-eds.page
-share/help/el/platform-overview/tech-enchant.page
share/help/el/platform-overview/tech-folks.page
share/help/el/platform-overview/tech-gda.page
share/help/el/platform-overview/tech-gdk.page
@@ -3166,6 +3340,7 @@ share/help/el/platform-overview/tech-poppler.page
share/help/el/platform-overview/tech-pulseaudio.page
share/help/el/platform-overview/tech-secret.page
share/help/el/platform-overview/tech-soup.page
+share/help/el/platform-overview/tech-spell-checking.page
share/help/el/platform-overview/tech-telepathy.page
share/help/el/platform-overview/tech-tracker.page
share/help/el/platform-overview/tech-webkit.page
@@ -3177,16 +3352,42 @@ share/help/el/platform-overview/tour-gjs.page
share/help/el/platform-overview/tour-glade.page
share/help/el/platform-overview/tour-summary.page
share/help/el/platform-overview/tour.page
+share/help/el/programming-guidelines/additional-materials.page
+share/help/el/programming-guidelines/api-stability.page
+share/help/el/programming-guidelines/c-coding-style.page
+share/help/el/programming-guidelines/cc-by-sa-3-0.xml
+share/help/el/programming-guidelines/databases.page
+share/help/el/programming-guidelines/documentation.page
+share/help/el/programming-guidelines/file-system.page
+share/help/el/programming-guidelines/gerror.page
+share/help/el/programming-guidelines/glist.page
+share/help/el/programming-guidelines/index.page
+share/help/el/programming-guidelines/introspection.page
+share/help/el/programming-guidelines/logging.page
+share/help/el/programming-guidelines/main-contexts.page
+share/help/el/programming-guidelines/memory-management.page
+share/help/el/programming-guidelines/namespacing.page
+share/help/el/programming-guidelines/parallel-installability.page
+share/help/el/programming-guidelines/preconditions.page
+share/help/el/programming-guidelines/threading.page
+share/help/el/programming-guidelines/tooling.page
+share/help/el/programming-guidelines/unit-testing.page
+share/help/el/programming-guidelines/version-control.page
+share/help/el/programming-guidelines/versioning.page
+share/help/el/programming-guidelines/writing-good-code.page
share/help/es/accessibility-devel-guide/figures/GNOME_desktop_Accessibility.png
share/help/es/accessibility-devel-guide/figures/at-arch.png
share/help/es/accessibility-devel-guide/figures/badfocus1.png
share/help/es/accessibility-devel-guide/figures/badfocus2.png
share/help/es/accessibility-devel-guide/figures/badfocus3.png
+share/help/es/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/es/accessibility-devel-guide/figures/color_only.png
share/help/es/accessibility-devel-guide/figures/depend1.png
share/help/es/accessibility-devel-guide/figures/depend1a.png
share/help/es/accessibility-devel-guide/figures/depend2.png
share/help/es/accessibility-devel-guide/figures/depend2a.png
share/help/es/accessibility-devel-guide/figures/depend3.png
+share/help/es/accessibility-devel-guide/figures/gaa.jpg
share/help/es/accessibility-devel-guide/figures/goodfocus.png
share/help/es/accessibility-devel-guide/figures/goodfocus2.png
share/help/es/accessibility-devel-guide/figures/goodfocus3.png
@@ -3803,6 +4004,7 @@ share/help/es/platform-overview/dev-translate-setup.page
share/help/es/platform-overview/dev-translate-tools.page
share/help/es/platform-overview/dev-translate.page
share/help/es/platform-overview/index.page
+share/help/es/platform-overview/legal.xml
share/help/es/platform-overview/license.page
share/help/es/platform-overview/media/glade-new-window.png
share/help/es/platform-overview/media/glade-result.png
@@ -3822,7 +4024,6 @@ share/help/es/platform-overview/tech-champlain.page
share/help/es/platform-overview/tech-clutter.page
share/help/es/platform-overview/tech-d-bus.page
share/help/es/platform-overview/tech-eds.page
-share/help/es/platform-overview/tech-enchant.page
share/help/es/platform-overview/tech-folks.page
share/help/es/platform-overview/tech-gda.page
share/help/es/platform-overview/tech-gdk.page
@@ -3846,6 +4047,7 @@ share/help/es/platform-overview/tech-poppler.page
share/help/es/platform-overview/tech-pulseaudio.page
share/help/es/platform-overview/tech-secret.page
share/help/es/platform-overview/tech-soup.page
+share/help/es/platform-overview/tech-spell-checking.page
share/help/es/platform-overview/tech-telepathy.page
share/help/es/platform-overview/tech-tracker.page
share/help/es/platform-overview/tech-webkit.page
@@ -3857,16 +4059,42 @@ share/help/es/platform-overview/tour-gjs.page
share/help/es/platform-overview/tour-glade.page
share/help/es/platform-overview/tour-summary.page
share/help/es/platform-overview/tour.page
+share/help/es/programming-guidelines/additional-materials.page
+share/help/es/programming-guidelines/api-stability.page
+share/help/es/programming-guidelines/c-coding-style.page
+share/help/es/programming-guidelines/cc-by-sa-3-0.xml
+share/help/es/programming-guidelines/databases.page
+share/help/es/programming-guidelines/documentation.page
+share/help/es/programming-guidelines/file-system.page
+share/help/es/programming-guidelines/gerror.page
+share/help/es/programming-guidelines/glist.page
+share/help/es/programming-guidelines/index.page
+share/help/es/programming-guidelines/introspection.page
+share/help/es/programming-guidelines/logging.page
+share/help/es/programming-guidelines/main-contexts.page
+share/help/es/programming-guidelines/memory-management.page
+share/help/es/programming-guidelines/namespacing.page
+share/help/es/programming-guidelines/parallel-installability.page
+share/help/es/programming-guidelines/preconditions.page
+share/help/es/programming-guidelines/threading.page
+share/help/es/programming-guidelines/tooling.page
+share/help/es/programming-guidelines/unit-testing.page
+share/help/es/programming-guidelines/version-control.page
+share/help/es/programming-guidelines/versioning.page
+share/help/es/programming-guidelines/writing-good-code.page
share/help/fr/accessibility-devel-guide/figures/GNOME_desktop_Accessibility.png
share/help/fr/accessibility-devel-guide/figures/at-arch.png
share/help/fr/accessibility-devel-guide/figures/badfocus1.png
share/help/fr/accessibility-devel-guide/figures/badfocus2.png
share/help/fr/accessibility-devel-guide/figures/badfocus3.png
+share/help/fr/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/fr/accessibility-devel-guide/figures/color_only.png
share/help/fr/accessibility-devel-guide/figures/depend1.png
share/help/fr/accessibility-devel-guide/figures/depend1a.png
share/help/fr/accessibility-devel-guide/figures/depend2.png
share/help/fr/accessibility-devel-guide/figures/depend2a.png
share/help/fr/accessibility-devel-guide/figures/depend3.png
+share/help/fr/accessibility-devel-guide/figures/gaa.jpg
share/help/fr/accessibility-devel-guide/figures/goodfocus.png
share/help/fr/accessibility-devel-guide/figures/goodfocus2.png
share/help/fr/accessibility-devel-guide/figures/goodfocus3.png
@@ -4371,6 +4599,7 @@ share/help/fr/platform-overview/dev-translate-setup.page
share/help/fr/platform-overview/dev-translate-tools.page
share/help/fr/platform-overview/dev-translate.page
share/help/fr/platform-overview/index.page
+share/help/fr/platform-overview/legal.xml
share/help/fr/platform-overview/license.page
share/help/fr/platform-overview/media/glade-new-window.png
share/help/fr/platform-overview/media/glade-result.png
@@ -4390,7 +4619,6 @@ share/help/fr/platform-overview/tech-champlain.page
share/help/fr/platform-overview/tech-clutter.page
share/help/fr/platform-overview/tech-d-bus.page
share/help/fr/platform-overview/tech-eds.page
-share/help/fr/platform-overview/tech-enchant.page
share/help/fr/platform-overview/tech-folks.page
share/help/fr/platform-overview/tech-gda.page
share/help/fr/platform-overview/tech-gdk.page
@@ -4414,6 +4642,7 @@ share/help/fr/platform-overview/tech-poppler.page
share/help/fr/platform-overview/tech-pulseaudio.page
share/help/fr/platform-overview/tech-secret.page
share/help/fr/platform-overview/tech-soup.page
+share/help/fr/platform-overview/tech-spell-checking.page
share/help/fr/platform-overview/tech-telepathy.page
share/help/fr/platform-overview/tech-tracker.page
share/help/fr/platform-overview/tech-webkit.page
@@ -4920,6 +5149,7 @@ share/help/gl/platform-overview/dev-translate-setup.page
share/help/gl/platform-overview/dev-translate-tools.page
share/help/gl/platform-overview/dev-translate.page
share/help/gl/platform-overview/index.page
+share/help/gl/platform-overview/legal.xml
share/help/gl/platform-overview/license.page
share/help/gl/platform-overview/media/glade-new-window.png
share/help/gl/platform-overview/media/glade-result.png
@@ -4939,7 +5169,6 @@ share/help/gl/platform-overview/tech-champlain.page
share/help/gl/platform-overview/tech-clutter.page
share/help/gl/platform-overview/tech-d-bus.page
share/help/gl/platform-overview/tech-eds.page
-share/help/gl/platform-overview/tech-enchant.page
share/help/gl/platform-overview/tech-folks.page
share/help/gl/platform-overview/tech-gda.page
share/help/gl/platform-overview/tech-gdk.page
@@ -4963,6 +5192,7 @@ share/help/gl/platform-overview/tech-poppler.page
share/help/gl/platform-overview/tech-pulseaudio.page
share/help/gl/platform-overview/tech-secret.page
share/help/gl/platform-overview/tech-soup.page
+share/help/gl/platform-overview/tech-spell-checking.page
share/help/gl/platform-overview/tech-telepathy.page
share/help/gl/platform-overview/tech-tracker.page
share/help/gl/platform-overview/tech-webkit.page
@@ -4990,6 +5220,7 @@ share/help/it/platform-overview/dev-translate-setup.page
share/help/it/platform-overview/dev-translate-tools.page
share/help/it/platform-overview/dev-translate.page
share/help/it/platform-overview/index.page
+share/help/it/platform-overview/legal.xml
share/help/it/platform-overview/license.page
share/help/it/platform-overview/media/glade-new-window.png
share/help/it/platform-overview/media/glade-result.png
@@ -5009,7 +5240,6 @@ share/help/it/platform-overview/tech-champlain.page
share/help/it/platform-overview/tech-clutter.page
share/help/it/platform-overview/tech-d-bus.page
share/help/it/platform-overview/tech-eds.page
-share/help/it/platform-overview/tech-enchant.page
share/help/it/platform-overview/tech-folks.page
share/help/it/platform-overview/tech-gda.page
share/help/it/platform-overview/tech-gdk.page
@@ -5033,6 +5263,7 @@ share/help/it/platform-overview/tech-poppler.page
share/help/it/platform-overview/tech-pulseaudio.page
share/help/it/platform-overview/tech-secret.page
share/help/it/platform-overview/tech-soup.page
+share/help/it/platform-overview/tech-spell-checking.page
share/help/it/platform-overview/tech-telepathy.page
share/help/it/platform-overview/tech-tracker.page
share/help/it/platform-overview/tech-webkit.page
@@ -5049,11 +5280,14 @@ share/help/ja/accessibility-devel-guide/figures/at-arch.png
share/help/ja/accessibility-devel-guide/figures/badfocus1.png
share/help/ja/accessibility-devel-guide/figures/badfocus2.png
share/help/ja/accessibility-devel-guide/figures/badfocus3.png
+share/help/ja/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/ja/accessibility-devel-guide/figures/color_only.png
share/help/ja/accessibility-devel-guide/figures/depend1.png
share/help/ja/accessibility-devel-guide/figures/depend1a.png
share/help/ja/accessibility-devel-guide/figures/depend2.png
share/help/ja/accessibility-devel-guide/figures/depend2a.png
share/help/ja/accessibility-devel-guide/figures/depend3.png
+share/help/ja/accessibility-devel-guide/figures/gaa.jpg
share/help/ja/accessibility-devel-guide/figures/goodfocus.png
share/help/ja/accessibility-devel-guide/figures/goodfocus2.png
share/help/ja/accessibility-devel-guide/figures/goodfocus3.png
@@ -5079,6 +5313,7 @@ share/help/ja/platform-overview/dev-translate-setup.page
share/help/ja/platform-overview/dev-translate-tools.page
share/help/ja/platform-overview/dev-translate.page
share/help/ja/platform-overview/index.page
+share/help/ja/platform-overview/legal.xml
share/help/ja/platform-overview/license.page
share/help/ja/platform-overview/media/glade-new-window.png
share/help/ja/platform-overview/media/glade-result.png
@@ -5098,7 +5333,6 @@ share/help/ja/platform-overview/tech-champlain.page
share/help/ja/platform-overview/tech-clutter.page
share/help/ja/platform-overview/tech-d-bus.page
share/help/ja/platform-overview/tech-eds.page
-share/help/ja/platform-overview/tech-enchant.page
share/help/ja/platform-overview/tech-folks.page
share/help/ja/platform-overview/tech-gda.page
share/help/ja/platform-overview/tech-gdk.page
@@ -5122,6 +5356,7 @@ share/help/ja/platform-overview/tech-poppler.page
share/help/ja/platform-overview/tech-pulseaudio.page
share/help/ja/platform-overview/tech-secret.page
share/help/ja/platform-overview/tech-soup.page
+share/help/ja/platform-overview/tech-spell-checking.page
share/help/ja/platform-overview/tech-telepathy.page
share/help/ja/platform-overview/tech-tracker.page
share/help/ja/platform-overview/tech-webkit.page
@@ -5133,6 +5368,601 @@ share/help/ja/platform-overview/tour-gjs.page
share/help/ja/platform-overview/tour-glade.page
share/help/ja/platform-overview/tour-summary.page
share/help/ja/platform-overview/tour.page
+share/help/ko/accessibility-devel-guide/figures/GNOME_desktop_Accessibility.png
+share/help/ko/accessibility-devel-guide/figures/at-arch.png
+share/help/ko/accessibility-devel-guide/figures/badfocus1.png
+share/help/ko/accessibility-devel-guide/figures/badfocus2.png
+share/help/ko/accessibility-devel-guide/figures/badfocus3.png
+share/help/ko/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/ko/accessibility-devel-guide/figures/color_only.png
+share/help/ko/accessibility-devel-guide/figures/depend1.png
+share/help/ko/accessibility-devel-guide/figures/depend1a.png
+share/help/ko/accessibility-devel-guide/figures/depend2.png
+share/help/ko/accessibility-devel-guide/figures/depend2a.png
+share/help/ko/accessibility-devel-guide/figures/depend3.png
+share/help/ko/accessibility-devel-guide/figures/gaa.jpg
+share/help/ko/accessibility-devel-guide/figures/goodfocus.png
+share/help/ko/accessibility-devel-guide/figures/goodfocus2.png
+share/help/ko/accessibility-devel-guide/figures/goodfocus3.png
+share/help/ko/accessibility-devel-guide/figures/label_above.png
+share/help/ko/accessibility-devel-guide/figures/label_below.png
+share/help/ko/accessibility-devel-guide/figures/label_left.png
+share/help/ko/accessibility-devel-guide/figures/label_right.png
+share/help/ko/accessibility-devel-guide/figures/nodrop.png
+share/help/ko/accessibility-devel-guide/index.docbook
+share/help/ko/gnome-devel-demos/02_welcome_to_the_grid.js.page
+share/help/ko/gnome-devel-demos/03_getting_the_signal.js.page
+share/help/ko/gnome-devel-demos/GtkApplicationWindow.c.page
+share/help/ko/gnome-devel-demos/GtkApplicationWindow.js.page
+share/help/ko/gnome-devel-demos/GtkApplicationWindow.py.page
+share/help/ko/gnome-devel-demos/GtkApplicationWindow.vala.page
+share/help/ko/gnome-devel-demos/aboutdialog.c.page
+share/help/ko/gnome-devel-demos/aboutdialog.js.page
+share/help/ko/gnome-devel-demos/aboutdialog.py.page
+share/help/ko/gnome-devel-demos/aboutdialog.vala.page
+share/help/ko/gnome-devel-demos/audio-player.vala.page
+share/help/ko/gnome-devel-demos/audio-player/audio-player.vala
+share/help/ko/gnome-devel-demos/beginner.js.page
+share/help/ko/gnome-devel-demos/beginner.py.page
+share/help/ko/gnome-devel-demos/beginner.vala.page
+share/help/ko/gnome-devel-demos/button.c.page
+share/help/ko/gnome-devel-demos/button.js.page
+share/help/ko/gnome-devel-demos/button.py.page
+share/help/ko/gnome-devel-demos/button.vala.page
+share/help/ko/gnome-devel-demos/buttonbox.js.page
+share/help/ko/gnome-devel-demos/buttonbox.py.page
+share/help/ko/gnome-devel-demos/c.page
+share/help/ko/gnome-devel-demos/checkbutton.c.page
+share/help/ko/gnome-devel-demos/checkbutton.js.page
+share/help/ko/gnome-devel-demos/checkbutton.py.page
+share/help/ko/gnome-devel-demos/checkbutton.vala.page
+share/help/ko/gnome-devel-demos/colorbutton.js.page
+share/help/ko/gnome-devel-demos/colorbutton.py.page
+share/help/ko/gnome-devel-demos/colorbutton.vala.page
+share/help/ko/gnome-devel-demos/combobox.c.page
+share/help/ko/gnome-devel-demos/combobox.js.page
+share/help/ko/gnome-devel-demos/combobox.py.page
+share/help/ko/gnome-devel-demos/combobox.vala.page
+share/help/ko/gnome-devel-demos/combobox_multicolumn.py.page
+share/help/ko/gnome-devel-demos/combobox_multicolumn.vala.page
+share/help/ko/gnome-devel-demos/comboboxtext.js.page
+share/help/ko/gnome-devel-demos/cpp.page
+share/help/ko/gnome-devel-demos/custom-gsource.c.page
+share/help/ko/gnome-devel-demos/dialog.c.page
+share/help/ko/gnome-devel-demos/dialog.js.page
+share/help/ko/gnome-devel-demos/dialog.py.page
+share/help/ko/gnome-devel-demos/dialog.vala.page
+share/help/ko/gnome-devel-demos/entry.c.page
+share/help/ko/gnome-devel-demos/entry.js.page
+share/help/ko/gnome-devel-demos/entry.py.page
+share/help/ko/gnome-devel-demos/entry.vala.page
+share/help/ko/gnome-devel-demos/exercises/menubar.vala.exercises
+share/help/ko/gnome-devel-demos/filechooserdialog.py.page
+share/help/ko/gnome-devel-demos/filechooserdialog.vala.page
+share/help/ko/gnome-devel-demos/fontchooserwidget.js.page
+share/help/ko/gnome-devel-demos/fontchooserwidget.py.page
+share/help/ko/gnome-devel-demos/fontchooserwidget.vala.page
+share/help/ko/gnome-devel-demos/gmenu.c.page
+share/help/ko/gnome-devel-demos/gmenu.js.page
+share/help/ko/gnome-devel-demos/gmenu.py.page
+share/help/ko/gnome-devel-demos/gmenu.vala.page
+share/help/ko/gnome-devel-demos/grid.c.page
+share/help/ko/gnome-devel-demos/grid.js.page
+share/help/ko/gnome-devel-demos/grid.py.page
+share/help/ko/gnome-devel-demos/grid.vala.page
+share/help/ko/gnome-devel-demos/guitar-tuner.c.page
+share/help/ko/gnome-devel-demos/guitar-tuner.cpp.page
+share/help/ko/gnome-devel-demos/guitar-tuner.js.page
+share/help/ko/gnome-devel-demos/guitar-tuner.py.page
+share/help/ko/gnome-devel-demos/guitar-tuner.vala.page
+share/help/ko/gnome-devel-demos/guitar-tuner/guitar-tuner.c
+share/help/ko/gnome-devel-demos/guitar-tuner/guitar-tuner.cc
+share/help/ko/gnome-devel-demos/guitar-tuner/guitar-tuner.js
+share/help/ko/gnome-devel-demos/guitar-tuner/guitar-tuner.py
+share/help/ko/gnome-devel-demos/guitar-tuner/guitar-tuner.vala
+share/help/ko/gnome-devel-demos/hello-world.c.page
+share/help/ko/gnome-devel-demos/hello-world.js.page
+share/help/ko/gnome-devel-demos/hello-world.py.page
+share/help/ko/gnome-devel-demos/hello-world.vala.page
+share/help/ko/gnome-devel-demos/hellognome.js.page
+share/help/ko/gnome-devel-demos/image-viewer.c.page
+share/help/ko/gnome-devel-demos/image-viewer.cpp.page
+share/help/ko/gnome-devel-demos/image-viewer.js.page
+share/help/ko/gnome-devel-demos/image-viewer.py.page
+share/help/ko/gnome-devel-demos/image-viewer.vala.page
+share/help/ko/gnome-devel-demos/image-viewer/image-viewer.c
+share/help/ko/gnome-devel-demos/image-viewer/image-viewer.cc
+share/help/ko/gnome-devel-demos/image-viewer/image-viewer.js
+share/help/ko/gnome-devel-demos/image-viewer/image-viewer.py
+share/help/ko/gnome-devel-demos/image-viewer/image-viewer.vala
+share/help/ko/gnome-devel-demos/image.c.page
+share/help/ko/gnome-devel-demos/image.js.page
+share/help/ko/gnome-devel-demos/image.py.page
+share/help/ko/gnome-devel-demos/image.vala.page
+share/help/ko/gnome-devel-demos/index.page
+share/help/ko/gnome-devel-demos/js.page
+share/help/ko/gnome-devel-demos/label.c.page
+share/help/ko/gnome-devel-demos/label.js.page
+share/help/ko/gnome-devel-demos/label.py.page
+share/help/ko/gnome-devel-demos/label.vala.page
+share/help/ko/gnome-devel-demos/legal.xml
+share/help/ko/gnome-devel-demos/license.page
+share/help/ko/gnome-devel-demos/linkbutton.c.page
+share/help/ko/gnome-devel-demos/linkbutton.js.page
+share/help/ko/gnome-devel-demos/linkbutton.py.page
+share/help/ko/gnome-devel-demos/linkbutton.vala.page
+share/help/ko/gnome-devel-demos/magic-mirror.vala.page
+share/help/ko/gnome-devel-demos/magic-mirror/magic-mirror-advanced.vala
+share/help/ko/gnome-devel-demos/magic-mirror/magic-mirror.vala
+share/help/ko/gnome-devel-demos/media/02_jsgrid_01.png
+share/help/ko/gnome-devel-demos/media/02_jsgrid_02.png
+share/help/ko/gnome-devel-demos/media/02_jsgrid_03.png
+share/help/ko/gnome-devel-demos/media/02_jsgrid_04.png
+share/help/ko/gnome-devel-demos/media/02_jsgrid_05.png
+share/help/ko/gnome-devel-demos/media/02_jsgrid_06.png
+share/help/ko/gnome-devel-demos/media/02_jsgrid_07.png
+share/help/ko/gnome-devel-demos/media/02_jsgrid_08.png
+share/help/ko/gnome-devel-demos/media/03_jssignal_01.png
+share/help/ko/gnome-devel-demos/media/03_jssignal_02.png
+share/help/ko/gnome-devel-demos/media/03_jssignal_03.png
+share/help/ko/gnome-devel-demos/media/03_jssignal_04.png
+share/help/ko/gnome-devel-demos/media/aboutdialog_GMenu.png
+share/help/ko/gnome-devel-demos/media/button.png
+share/help/ko/gnome-devel-demos/media/buttonbox_calculator.png
+share/help/ko/gnome-devel-demos/media/checkbutton.png
+share/help/ko/gnome-devel-demos/media/colorbutton.png
+share/help/ko/gnome-devel-demos/media/combobox.png
+share/help/ko/gnome-devel-demos/media/combobox_multicolumn.png
+share/help/ko/gnome-devel-demos/media/dialog.png
+share/help/ko/gnome-devel-demos/media/entry.png
+share/help/ko/gnome-devel-demos/media/filechooserdialog_menu.png
+share/help/ko/gnome-devel-demos/media/filechooserdialog_save.png
+share/help/ko/gnome-devel-demos/media/fontchooserwidget.png
+share/help/ko/gnome-devel-demos/media/gediteditor.png
+share/help/ko/gnome-devel-demos/media/geditview.png
+share/help/ko/gnome-devel-demos/media/glade_select_toolbar.png
+share/help/ko/gnome-devel-demos/media/glade_toolbar_common.png
+share/help/ko/gnome-devel-demos/media/glade_toolbar_edit.png
+share/help/ko/gnome-devel-demos/media/glade_toolbar_editor.png
+share/help/ko/gnome-devel-demos/media/glade_toolbar_general.png
+share/help/ko/gnome-devel-demos/media/glade_ui.png
+share/help/ko/gnome-devel-demos/media/glade_visible_no.png
+share/help/ko/gnome-devel-demos/media/gmenu.c.png
+share/help/ko/gnome-devel-demos/media/gmenu.js.png
+share/help/ko/gnome-devel-demos/media/gmenu.py.png
+share/help/ko/gnome-devel-demos/media/gmenu.vala.png
+share/help/ko/gnome-devel-demos/media/grid.png
+share/help/ko/gnome-devel-demos/media/grid_simple.png
+share/help/ko/gnome-devel-demos/media/guitar-tuner-glade.png
+share/help/ko/gnome-devel-demos/media/guitar-tuner-pipeline.png
+share/help/ko/gnome-devel-demos/media/guitar-tuner.png
+share/help/ko/gnome-devel-demos/media/hello-world.png
+share/help/ko/gnome-devel-demos/media/image-viewer.png
+share/help/ko/gnome-devel-demos/media/image.png
+share/help/ko/gnome-devel-demos/media/label.png
+share/help/ko/gnome-devel-demos/media/linkbutton.png
+share/help/ko/gnome-devel-demos/media/magic-mirror.png
+share/help/ko/gnome-devel-demos/media/menubar.png
+share/help/ko/gnome-devel-demos/media/menubar_choices.png
+share/help/ko/gnome-devel-demos/media/menubutton.png
+share/help/ko/gnome-devel-demos/media/message-board.ogv
+share/help/ko/gnome-devel-demos/media/messagedialog.png
+share/help/ko/gnome-devel-demos/media/paned.png
+share/help/ko/gnome-devel-demos/media/photo-wall-focused.png
+share/help/ko/gnome-devel-demos/media/photo-wall.png
+share/help/ko/gnome-devel-demos/media/progressbar.ogv
+share/help/ko/gnome-devel-demos/media/progressbar_fill.ogv
+share/help/ko/gnome-devel-demos/media/radiobutton.png
+share/help/ko/gnome-devel-demos/media/radiobuttontravel.png
+share/help/ko/gnome-devel-demos/media/record-collection.png
+share/help/ko/gnome-devel-demos/media/scale.png
+share/help/ko/gnome-devel-demos/media/scale2.png
+share/help/ko/gnome-devel-demos/media/scalepenguins.png
+share/help/ko/gnome-devel-demos/media/scrolledwindow.png
+share/help/ko/gnome-devel-demos/media/separator.png
+share/help/ko/gnome-devel-demos/media/spinbutton.png
+share/help/ko/gnome-devel-demos/media/spinbuttonkittens.png
+share/help/ko/gnome-devel-demos/media/spinner.png
+share/help/ko/gnome-devel-demos/media/statusbar.png
+share/help/ko/gnome-devel-demos/media/statusbar2.png
+share/help/ko/gnome-devel-demos/media/statusbar3.png
+share/help/ko/gnome-devel-demos/media/switch_off.png
+share/help/ko/gnome-devel-demos/media/switch_on.png
+share/help/ko/gnome-devel-demos/media/switchanimals.png
+share/help/ko/gnome-devel-demos/media/textview.png
+share/help/ko/gnome-devel-demos/media/textviewpenguinchat.png
+share/help/ko/gnome-devel-demos/media/togglebutton.png
+share/help/ko/gnome-devel-demos/media/toolbar.png
+share/help/ko/gnome-devel-demos/media/tooltip.png
+share/help/ko/gnome-devel-demos/media/treeview_advanced_liststore.png
+share/help/ko/gnome-devel-demos/media/treeview_cellrenderertoggle.png
+share/help/ko/gnome-devel-demos/media/treeview_simple_liststore.png
+share/help/ko/gnome-devel-demos/media/treeview_simple_liststore_penguins.png
+share/help/ko/gnome-devel-demos/media/treeview_treestore.png
+share/help/ko/gnome-devel-demos/media/weatherAppJs.png
+share/help/ko/gnome-devel-demos/media/window.png
+share/help/ko/gnome-devel-demos/menubar.c.page
+share/help/ko/gnome-devel-demos/menubar.py.page
+share/help/ko/gnome-devel-demos/menubar.vala.page
+share/help/ko/gnome-devel-demos/menubutton.c.page
+share/help/ko/gnome-devel-demos/menubutton.js.page
+share/help/ko/gnome-devel-demos/menubutton.py.page
+share/help/ko/gnome-devel-demos/menubutton.vala.page
+share/help/ko/gnome-devel-demos/message-board.c.page
+share/help/ko/gnome-devel-demos/message-board/message-board.c
+share/help/ko/gnome-devel-demos/messagedialog.c.page
+share/help/ko/gnome-devel-demos/messagedialog.js.page
+share/help/ko/gnome-devel-demos/messagedialog.py.page
+share/help/ko/gnome-devel-demos/messagedialog.vala.page
+share/help/ko/gnome-devel-demos/model-view-controller.py.page
+share/help/ko/gnome-devel-demos/paned.c.page
+share/help/ko/gnome-devel-demos/paned.js.page
+share/help/ko/gnome-devel-demos/paned.py.page
+share/help/ko/gnome-devel-demos/paned.vala.page
+share/help/ko/gnome-devel-demos/photo-wall.c.page
+share/help/ko/gnome-devel-demos/photo-wall/photo-wall.c
+share/help/ko/gnome-devel-demos/progressbar.c.page
+share/help/ko/gnome-devel-demos/progressbar.js.page
+share/help/ko/gnome-devel-demos/progressbar.py.page
+share/help/ko/gnome-devel-demos/progressbar.vala.page
+share/help/ko/gnome-devel-demos/properties.py.page
+share/help/ko/gnome-devel-demos/py.page
+share/help/ko/gnome-devel-demos/radiobutton.c.page
+share/help/ko/gnome-devel-demos/radiobutton.js.page
+share/help/ko/gnome-devel-demos/radiobutton.py.page
+share/help/ko/gnome-devel-demos/radiobutton.vala.page
+share/help/ko/gnome-devel-demos/record-collection.js.page
+share/help/ko/gnome-devel-demos/record-collection/record-collection.js
+share/help/ko/gnome-devel-demos/response-type.page
+share/help/ko/gnome-devel-demos/samples/02_welcome_to_the_grid.js
+share/help/ko/gnome-devel-demos/samples/03_getting_the_signal_01.js
+share/help/ko/gnome-devel-demos/samples/03_getting_the_signal_02.js
+share/help/ko/gnome-devel-demos/samples/03_getting_the_signal_03.js
+share/help/ko/gnome-devel-demos/samples/03_getting_the_signal_04.js
+share/help/ko/gnome-devel-demos/samples/GtkApplicationWindow.c
+share/help/ko/gnome-devel-demos/samples/GtkApplicationWindow.js
+share/help/ko/gnome-devel-demos/samples/GtkApplicationWindow.py
+share/help/ko/gnome-devel-demos/samples/GtkApplicationWindow.vala
+share/help/ko/gnome-devel-demos/samples/aboutdialog.c
+share/help/ko/gnome-devel-demos/samples/aboutdialog.js
+share/help/ko/gnome-devel-demos/samples/aboutdialog.py
+share/help/ko/gnome-devel-demos/samples/aboutdialog.vala
+share/help/ko/gnome-devel-demos/samples/button.c
+share/help/ko/gnome-devel-demos/samples/button.js
+share/help/ko/gnome-devel-demos/samples/button.py
+share/help/ko/gnome-devel-demos/samples/button.vala
+share/help/ko/gnome-devel-demos/samples/buttonbox.js
+share/help/ko/gnome-devel-demos/samples/buttonbox.py
+share/help/ko/gnome-devel-demos/samples/checkbutton.c
+share/help/ko/gnome-devel-demos/samples/checkbutton.js
+share/help/ko/gnome-devel-demos/samples/checkbutton.py
+share/help/ko/gnome-devel-demos/samples/checkbutton.vala
+share/help/ko/gnome-devel-demos/samples/colorbutton.js
+share/help/ko/gnome-devel-demos/samples/colorbutton.py
+share/help/ko/gnome-devel-demos/samples/colorbutton.vala
+share/help/ko/gnome-devel-demos/samples/combobox.c
+share/help/ko/gnome-devel-demos/samples/combobox.js
+share/help/ko/gnome-devel-demos/samples/combobox.py
+share/help/ko/gnome-devel-demos/samples/combobox.vala
+share/help/ko/gnome-devel-demos/samples/combobox_multicolumn.py
+share/help/ko/gnome-devel-demos/samples/combobox_multicolumn.vala
+share/help/ko/gnome-devel-demos/samples/comboboxtext.js
+share/help/ko/gnome-devel-demos/samples/dialog.c
+share/help/ko/gnome-devel-demos/samples/dialog.js
+share/help/ko/gnome-devel-demos/samples/dialog.py
+share/help/ko/gnome-devel-demos/samples/dialog.vala
+share/help/ko/gnome-devel-demos/samples/entry.c
+share/help/ko/gnome-devel-demos/samples/entry.js
+share/help/ko/gnome-devel-demos/samples/entry.py
+share/help/ko/gnome-devel-demos/samples/entry.vala
+share/help/ko/gnome-devel-demos/samples/example-custom-gsource.c
+share/help/ko/gnome-devel-demos/samples/filechooserdialog.py
+share/help/ko/gnome-devel-demos/samples/filechooserdialog.ui
+share/help/ko/gnome-devel-demos/samples/filechooserdialog.vala
+share/help/ko/gnome-devel-demos/samples/fontchooserwidget.js
+share/help/ko/gnome-devel-demos/samples/fontchooserwidget.py
+share/help/ko/gnome-devel-demos/samples/fontchooserwidget.vala
+share/help/ko/gnome-devel-demos/samples/fruitbat.png
+share/help/ko/gnome-devel-demos/samples/gentoopenguin.png
+share/help/ko/gnome-devel-demos/samples/gmenu.c
+share/help/ko/gnome-devel-demos/samples/gmenu.js
+share/help/ko/gnome-devel-demos/samples/gmenu.py
+share/help/ko/gnome-devel-demos/samples/gmenu.vala
+share/help/ko/gnome-devel-demos/samples/gnome-image.png
+share/help/ko/gnome-devel-demos/samples/grid.c
+share/help/ko/gnome-devel-demos/samples/grid.js
+share/help/ko/gnome-devel-demos/samples/grid.py
+share/help/ko/gnome-devel-demos/samples/grid.vala
+share/help/ko/gnome-devel-demos/samples/hello-in-C/Makefile.am
+share/help/ko/gnome-devel-demos/samples/hello-in-C/README
+share/help/ko/gnome-devel-demos/samples/hello-in-C/autogen.sh
+share/help/ko/gnome-devel-demos/samples/hello-in-C/configure.ac
+share/help/ko/gnome-devel-demos/samples/hello-in-C/hello-world.c
+share/help/ko/gnome-devel-demos/samples/hello-in-C/hello-world.desktop.in
+share/help/ko/gnome-devel-demos/samples/hello-in-js/Makefile.am
+share/help/ko/gnome-devel-demos/samples/hello-in-js/README
+share/help/ko/gnome-devel-demos/samples/hello-in-js/autogen.sh
+share/help/ko/gnome-devel-demos/samples/hello-in-js/configure.ac
+share/help/ko/gnome-devel-demos/samples/hello-in-js/hello-world
+share/help/ko/gnome-devel-demos/samples/hello-in-js/hello-world.desktop.in
+share/help/ko/gnome-devel-demos/samples/hello-in-python/Makefile.am
+share/help/ko/gnome-devel-demos/samples/hello-in-python/README
+share/help/ko/gnome-devel-demos/samples/hello-in-python/autogen.sh
+share/help/ko/gnome-devel-demos/samples/hello-in-python/configure.ac
+share/help/ko/gnome-devel-demos/samples/hello-in-python/hello-world.desktop.in
+share/help/ko/gnome-devel-demos/samples/hello-in-python/hello-world.py
+share/help/ko/gnome-devel-demos/samples/hello-in-vala/Makefile.am
+share/help/ko/gnome-devel-demos/samples/hello-in-vala/README
+share/help/ko/gnome-devel-demos/samples/hello-in-vala/autogen.sh
+share/help/ko/gnome-devel-demos/samples/hello-in-vala/configure.ac
+share/help/ko/gnome-devel-demos/samples/hello-in-vala/hello-world.desktop.in
+share/help/ko/gnome-devel-demos/samples/hello-in-vala/hello-world.vala
+share/help/ko/gnome-devel-demos/samples/hellognome.html
+share/help/ko/gnome-devel-demos/samples/hellognome.js
+share/help/ko/gnome-devel-demos/samples/image.c
+share/help/ko/gnome-devel-demos/samples/image.js
+share/help/ko/gnome-devel-demos/samples/image.py
+share/help/ko/gnome-devel-demos/samples/image.vala
+share/help/ko/gnome-devel-demos/samples/label.c
+share/help/ko/gnome-devel-demos/samples/label.js
+share/help/ko/gnome-devel-demos/samples/label.py
+share/help/ko/gnome-devel-demos/samples/label.vala
+share/help/ko/gnome-devel-demos/samples/linkbutton.c
+share/help/ko/gnome-devel-demos/samples/linkbutton.js
+share/help/ko/gnome-devel-demos/samples/linkbutton.py
+share/help/ko/gnome-devel-demos/samples/linkbutton.vala
+share/help/ko/gnome-devel-demos/samples/menubar.c
+share/help/ko/gnome-devel-demos/samples/menubar.py
+share/help/ko/gnome-devel-demos/samples/menubar.ui
+share/help/ko/gnome-devel-demos/samples/menubar.vala
+share/help/ko/gnome-devel-demos/samples/menubar_basis.py
+share/help/ko/gnome-devel-demos/samples/menubar_basis.ui
+share/help/ko/gnome-devel-demos/samples/menubar_basis.vala
+share/help/ko/gnome-devel-demos/samples/menubutton.c
+share/help/ko/gnome-devel-demos/samples/menubutton.js
+share/help/ko/gnome-devel-demos/samples/menubutton.py
+share/help/ko/gnome-devel-demos/samples/menubutton.vala
+share/help/ko/gnome-devel-demos/samples/messagedialog.c
+share/help/ko/gnome-devel-demos/samples/messagedialog.js
+share/help/ko/gnome-devel-demos/samples/messagedialog.py
+share/help/ko/gnome-devel-demos/samples/messagedialog.vala
+share/help/ko/gnome-devel-demos/samples/muteswan.png
+share/help/ko/gnome-devel-demos/samples/paned.c
+share/help/ko/gnome-devel-demos/samples/paned.js
+share/help/ko/gnome-devel-demos/samples/paned.py
+share/help/ko/gnome-devel-demos/samples/paned.vala
+share/help/ko/gnome-devel-demos/samples/progressbar.c
+share/help/ko/gnome-devel-demos/samples/progressbar.js
+share/help/ko/gnome-devel-demos/samples/progressbar.py
+share/help/ko/gnome-devel-demos/samples/progressbar.vala
+share/help/ko/gnome-devel-demos/samples/radiobutton.c
+share/help/ko/gnome-devel-demos/samples/radiobutton.js
+share/help/ko/gnome-devel-demos/samples/radiobutton.py
+share/help/ko/gnome-devel-demos/samples/radiobutton.vala
+share/help/ko/gnome-devel-demos/samples/redfox.png
+share/help/ko/gnome-devel-demos/samples/scale.c
+share/help/ko/gnome-devel-demos/samples/scale.js
+share/help/ko/gnome-devel-demos/samples/scale.py
+share/help/ko/gnome-devel-demos/samples/scale.vala
+share/help/ko/gnome-devel-demos/samples/scrolledwindow.c
+share/help/ko/gnome-devel-demos/samples/scrolledwindow.js
+share/help/ko/gnome-devel-demos/samples/scrolledwindow.py
+share/help/ko/gnome-devel-demos/samples/scrolledwindow.vala
+share/help/ko/gnome-devel-demos/samples/separator.c
+share/help/ko/gnome-devel-demos/samples/separator.py
+share/help/ko/gnome-devel-demos/samples/separator.vala
+share/help/ko/gnome-devel-demos/samples/spinbutton.c
+share/help/ko/gnome-devel-demos/samples/spinbutton.js
+share/help/ko/gnome-devel-demos/samples/spinbutton.py
+share/help/ko/gnome-devel-demos/samples/spinbutton.vala
+share/help/ko/gnome-devel-demos/samples/spinner.c
+share/help/ko/gnome-devel-demos/samples/spinner.js
+share/help/ko/gnome-devel-demos/samples/spinner.py
+share/help/ko/gnome-devel-demos/samples/spinner.vala
+share/help/ko/gnome-devel-demos/samples/statusbar.c
+share/help/ko/gnome-devel-demos/samples/statusbar.js
+share/help/ko/gnome-devel-demos/samples/statusbar.py
+share/help/ko/gnome-devel-demos/samples/statusbar.vala
+share/help/ko/gnome-devel-demos/samples/switch.c
+share/help/ko/gnome-devel-demos/samples/switch.js
+share/help/ko/gnome-devel-demos/samples/switch.py
+share/help/ko/gnome-devel-demos/samples/switch.vala
+share/help/ko/gnome-devel-demos/samples/textview.c
+share/help/ko/gnome-devel-demos/samples/textview.js
+share/help/ko/gnome-devel-demos/samples/textview.py
+share/help/ko/gnome-devel-demos/samples/textview.vala
+share/help/ko/gnome-devel-demos/samples/togglebutton.c
+share/help/ko/gnome-devel-demos/samples/togglebutton.js
+share/help/ko/gnome-devel-demos/samples/togglebutton.py
+share/help/ko/gnome-devel-demos/samples/togglebutton.vala
+share/help/ko/gnome-devel-demos/samples/toolbar.c
+share/help/ko/gnome-devel-demos/samples/toolbar.js
+share/help/ko/gnome-devel-demos/samples/toolbar.py
+share/help/ko/gnome-devel-demos/samples/toolbar.vala
+share/help/ko/gnome-devel-demos/samples/toolbar_builder.py
+share/help/ko/gnome-devel-demos/samples/toolbar_builder.ui
+share/help/ko/gnome-devel-demos/samples/toolbar_builder.vala
+share/help/ko/gnome-devel-demos/samples/tooltip.c
+share/help/ko/gnome-devel-demos/samples/tooltip.js
+share/help/ko/gnome-devel-demos/samples/tooltip.py
+share/help/ko/gnome-devel-demos/samples/tooltip.vala
+share/help/ko/gnome-devel-demos/samples/treeview_advanced_liststore.py
+share/help/ko/gnome-devel-demos/samples/treeview_cellrenderertoggle.py
+share/help/ko/gnome-devel-demos/samples/treeview_simple_liststore.js
+share/help/ko/gnome-devel-demos/samples/treeview_simple_liststore.py
+share/help/ko/gnome-devel-demos/samples/treeview_simple_liststore.vala
+share/help/ko/gnome-devel-demos/samples/treeview_treestore.py
+share/help/ko/gnome-devel-demos/samples/tux.png
+share/help/ko/gnome-devel-demos/samples/widget_drawing.py
+share/help/ko/gnome-devel-demos/samples/window.c
+share/help/ko/gnome-devel-demos/samples/window.js
+share/help/ko/gnome-devel-demos/samples/window.py
+share/help/ko/gnome-devel-demos/samples/window.vala
+share/help/ko/gnome-devel-demos/scale.c.page
+share/help/ko/gnome-devel-demos/scale.js.page
+share/help/ko/gnome-devel-demos/scale.py.page
+share/help/ko/gnome-devel-demos/scale.vala.page
+share/help/ko/gnome-devel-demos/scrolledwindow.c.page
+share/help/ko/gnome-devel-demos/scrolledwindow.js.page
+share/help/ko/gnome-devel-demos/scrolledwindow.py.page
+share/help/ko/gnome-devel-demos/scrolledwindow.vala.page
+share/help/ko/gnome-devel-demos/separator.c.page
+share/help/ko/gnome-devel-demos/separator.py.page
+share/help/ko/gnome-devel-demos/separator.vala.page
+share/help/ko/gnome-devel-demos/set-up-gedit.js.page
+share/help/ko/gnome-devel-demos/signals-callbacks.py.page
+share/help/ko/gnome-devel-demos/spinbutton.c.page
+share/help/ko/gnome-devel-demos/spinbutton.js.page
+share/help/ko/gnome-devel-demos/spinbutton.py.page
+share/help/ko/gnome-devel-demos/spinbutton.vala.page
+share/help/ko/gnome-devel-demos/spinner.c.page
+share/help/ko/gnome-devel-demos/spinner.js.page
+share/help/ko/gnome-devel-demos/spinner.py.page
+share/help/ko/gnome-devel-demos/spinner.vala.page
+share/help/ko/gnome-devel-demos/statusbar.c.page
+share/help/ko/gnome-devel-demos/statusbar.js.page
+share/help/ko/gnome-devel-demos/statusbar.py.page
+share/help/ko/gnome-devel-demos/statusbar.vala.page
+share/help/ko/gnome-devel-demos/strings.py.page
+share/help/ko/gnome-devel-demos/switch.c.page
+share/help/ko/gnome-devel-demos/switch.js.page
+share/help/ko/gnome-devel-demos/switch.py.page
+share/help/ko/gnome-devel-demos/switch.vala.page
+share/help/ko/gnome-devel-demos/textview.c.page
+share/help/ko/gnome-devel-demos/textview.js.page
+share/help/ko/gnome-devel-demos/textview.py.page
+share/help/ko/gnome-devel-demos/textview.vala.page
+share/help/ko/gnome-devel-demos/togglebutton.c.page
+share/help/ko/gnome-devel-demos/togglebutton.js.page
+share/help/ko/gnome-devel-demos/togglebutton.py.page
+share/help/ko/gnome-devel-demos/togglebutton.vala.page
+share/help/ko/gnome-devel-demos/toolbar.c.page
+share/help/ko/gnome-devel-demos/toolbar.js.page
+share/help/ko/gnome-devel-demos/toolbar.py.page
+share/help/ko/gnome-devel-demos/toolbar.vala.page
+share/help/ko/gnome-devel-demos/toolbar_builder.py.page
+share/help/ko/gnome-devel-demos/toolbar_builder.vala.page
+share/help/ko/gnome-devel-demos/tooltip.c.page
+share/help/ko/gnome-devel-demos/tooltip.js.page
+share/help/ko/gnome-devel-demos/tooltip.py.page
+share/help/ko/gnome-devel-demos/tooltip.vala.page
+share/help/ko/gnome-devel-demos/treeview_advanced_liststore.py.page
+share/help/ko/gnome-devel-demos/treeview_cellrenderertoggle.py.page
+share/help/ko/gnome-devel-demos/treeview_simple_liststore.js.page
+share/help/ko/gnome-devel-demos/treeview_simple_liststore.py.page
+share/help/ko/gnome-devel-demos/treeview_simple_liststore.vala.page
+share/help/ko/gnome-devel-demos/treeview_treestore.py.page
+share/help/ko/gnome-devel-demos/tutorial.py.page
+share/help/ko/gnome-devel-demos/vala.page
+share/help/ko/gnome-devel-demos/weatherApp.js.page
+share/help/ko/gnome-devel-demos/weatherAppMain.js.page
+share/help/ko/gnome-devel-demos/weatherAutotools.js.page
+share/help/ko/gnome-devel-demos/weatherGeonames.js.page
+share/help/ko/gnome-devel-demos/widget_drawing.py.page
+share/help/ko/gnome-devel-demos/window.c.page
+share/help/ko/gnome-devel-demos/window.js.page
+share/help/ko/gnome-devel-demos/window.py.page
+share/help/ko/gnome-devel-demos/window.vala.page
+share/help/ko/optimization-guide/figures/massif-after.png
+share/help/ko/optimization-guide/figures/massif-before.png
+share/help/ko/optimization-guide/harmful.page
+share/help/ko/optimization-guide/index.page
+share/help/ko/optimization-guide/introduction.page
+share/help/ko/optimization-guide/massif.page
+share/help/ko/platform-overview/cc-by-sa-3-0.xml
+share/help/ko/platform-overview/dev-help-appmenu.page
+share/help/ko/platform-overview/dev-help-build.page
+share/help/ko/platform-overview/dev-help-write.page
+share/help/ko/platform-overview/dev-help.page
+share/help/ko/platform-overview/dev-launching-desktop.page
+share/help/ko/platform-overview/dev-launching-icons.page
+share/help/ko/platform-overview/dev-launching-mime.page
+share/help/ko/platform-overview/dev-launching-startupnotify.page
+share/help/ko/platform-overview/dev-launching.page
+share/help/ko/platform-overview/dev-thumbnailer.page
+share/help/ko/platform-overview/dev-translate-build.page
+share/help/ko/platform-overview/dev-translate-setup.page
+share/help/ko/platform-overview/dev-translate-tools.page
+share/help/ko/platform-overview/dev-translate.page
+share/help/ko/platform-overview/index.page
+share/help/ko/platform-overview/legal.xml
+share/help/ko/platform-overview/license.page
+share/help/ko/platform-overview/media/glade-new-window.png
+share/help/ko/platform-overview/media/glade-result.png
+share/help/ko/platform-overview/media/glade-set-values.png
+share/help/ko/platform-overview/media/totem-screenshot.png
+share/help/ko/platform-overview/overview-communication.page
+share/help/ko/platform-overview/overview-io.page
+share/help/ko/platform-overview/overview-media.page
+share/help/ko/platform-overview/overview-net.page
+share/help/ko/platform-overview/overview-settings.page
+share/help/ko/platform-overview/overview-ui.page
+share/help/ko/platform-overview/tech-atk.page
+share/help/ko/platform-overview/tech-avahi.page
+share/help/ko/platform-overview/tech-cairo.page
+share/help/ko/platform-overview/tech-canberra.page
+share/help/ko/platform-overview/tech-champlain.page
+share/help/ko/platform-overview/tech-clutter.page
+share/help/ko/platform-overview/tech-d-bus.page
+share/help/ko/platform-overview/tech-eds.page
+share/help/ko/platform-overview/tech-folks.page
+share/help/ko/platform-overview/tech-gda.page
+share/help/ko/platform-overview/tech-gdk.page
+share/help/ko/platform-overview/tech-geoclue2.page
+share/help/ko/platform-overview/tech-geocode-glib.page
+share/help/ko/platform-overview/tech-gio-network.page
+share/help/ko/platform-overview/tech-gio.page
+share/help/ko/platform-overview/tech-glib.page
+share/help/ko/platform-overview/tech-gobject.page
+share/help/ko/platform-overview/tech-gsettings.page
+share/help/ko/platform-overview/tech-gstreamer.page
+share/help/ko/platform-overview/tech-gtk.page
+share/help/ko/platform-overview/tech-gupnp.page
+share/help/ko/platform-overview/tech-help.page
+share/help/ko/platform-overview/tech-network-manager.page
+share/help/ko/platform-overview/tech-notify.page
+share/help/ko/platform-overview/tech-packagekit.page
+share/help/ko/platform-overview/tech-pango.page
+share/help/ko/platform-overview/tech-polkit.page
+share/help/ko/platform-overview/tech-poppler.page
+share/help/ko/platform-overview/tech-pulseaudio.page
+share/help/ko/platform-overview/tech-secret.page
+share/help/ko/platform-overview/tech-soup.page
+share/help/ko/platform-overview/tech-spell-checking.page
+share/help/ko/platform-overview/tech-telepathy.page
+share/help/ko/platform-overview/tech-tracker.page
+share/help/ko/platform-overview/tech-webkit.page
+share/help/ko/platform-overview/tech.page
+share/help/ko/platform-overview/tour-application.page
+share/help/ko/platform-overview/tour-events.page
+share/help/ko/platform-overview/tour-get_object.page
+share/help/ko/platform-overview/tour-gjs.page
+share/help/ko/platform-overview/tour-glade.page
+share/help/ko/platform-overview/tour-summary.page
+share/help/ko/platform-overview/tour.page
+share/help/ko/programming-guidelines/additional-materials.page
+share/help/ko/programming-guidelines/api-stability.page
+share/help/ko/programming-guidelines/c-coding-style.page
+share/help/ko/programming-guidelines/cc-by-sa-3-0.xml
+share/help/ko/programming-guidelines/databases.page
+share/help/ko/programming-guidelines/documentation.page
+share/help/ko/programming-guidelines/file-system.page
+share/help/ko/programming-guidelines/gerror.page
+share/help/ko/programming-guidelines/glist.page
+share/help/ko/programming-guidelines/index.page
+share/help/ko/programming-guidelines/introspection.page
+share/help/ko/programming-guidelines/logging.page
+share/help/ko/programming-guidelines/main-contexts.page
+share/help/ko/programming-guidelines/memory-management.page
+share/help/ko/programming-guidelines/namespacing.page
+share/help/ko/programming-guidelines/parallel-installability.page
+share/help/ko/programming-guidelines/preconditions.page
+share/help/ko/programming-guidelines/threading.page
+share/help/ko/programming-guidelines/tooling.page
+share/help/ko/programming-guidelines/unit-testing.page
+share/help/ko/programming-guidelines/version-control.page
+share/help/ko/programming-guidelines/versioning.page
+share/help/ko/programming-guidelines/writing-good-code.page
share/help/oc/platform-overview/cc-by-sa-3-0.xml
share/help/oc/platform-overview/dev-help-appmenu.page
share/help/oc/platform-overview/dev-help-build.page
@@ -5149,6 +5979,7 @@ share/help/oc/platform-overview/dev-translate-setup.page
share/help/oc/platform-overview/dev-translate-tools.page
share/help/oc/platform-overview/dev-translate.page
share/help/oc/platform-overview/index.page
+share/help/oc/platform-overview/legal.xml
share/help/oc/platform-overview/license.page
share/help/oc/platform-overview/media/glade-new-window.png
share/help/oc/platform-overview/media/glade-result.png
@@ -5168,7 +5999,6 @@ share/help/oc/platform-overview/tech-champlain.page
share/help/oc/platform-overview/tech-clutter.page
share/help/oc/platform-overview/tech-d-bus.page
share/help/oc/platform-overview/tech-eds.page
-share/help/oc/platform-overview/tech-enchant.page
share/help/oc/platform-overview/tech-folks.page
share/help/oc/platform-overview/tech-gda.page
share/help/oc/platform-overview/tech-gdk.page
@@ -5192,6 +6022,7 @@ share/help/oc/platform-overview/tech-poppler.page
share/help/oc/platform-overview/tech-pulseaudio.page
share/help/oc/platform-overview/tech-secret.page
share/help/oc/platform-overview/tech-soup.page
+share/help/oc/platform-overview/tech-spell-checking.page
share/help/oc/platform-overview/tech-telepathy.page
share/help/oc/platform-overview/tech-tracker.page
share/help/oc/platform-overview/tech-webkit.page
@@ -5208,11 +6039,14 @@ share/help/pt_BR/accessibility-devel-guide/figures/at-arch.png
share/help/pt_BR/accessibility-devel-guide/figures/badfocus1.png
share/help/pt_BR/accessibility-devel-guide/figures/badfocus2.png
share/help/pt_BR/accessibility-devel-guide/figures/badfocus3.png
+share/help/pt_BR/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/pt_BR/accessibility-devel-guide/figures/color_only.png
share/help/pt_BR/accessibility-devel-guide/figures/depend1.png
share/help/pt_BR/accessibility-devel-guide/figures/depend1a.png
share/help/pt_BR/accessibility-devel-guide/figures/depend2.png
share/help/pt_BR/accessibility-devel-guide/figures/depend2a.png
share/help/pt_BR/accessibility-devel-guide/figures/depend3.png
+share/help/pt_BR/accessibility-devel-guide/figures/gaa.jpg
share/help/pt_BR/accessibility-devel-guide/figures/goodfocus.png
share/help/pt_BR/accessibility-devel-guide/figures/goodfocus2.png
share/help/pt_BR/accessibility-devel-guide/figures/goodfocus3.png
@@ -5695,6 +6529,118 @@ share/help/pt_BR/gnome-devel-demos/window.c.page
share/help/pt_BR/gnome-devel-demos/window.js.page
share/help/pt_BR/gnome-devel-demos/window.py.page
share/help/pt_BR/gnome-devel-demos/window.vala.page
+share/help/pt_BR/hig/action-bars.page
+share/help/pt_BR/hig/application-basics.page
+share/help/pt_BR/hig/application-menus.page
+share/help/pt_BR/hig/button-menus.page
+share/help/pt_BR/hig/buttons.page
+share/help/pt_BR/hig/check-boxes.page
+share/help/pt_BR/hig/compatibility.page
+share/help/pt_BR/hig/design-principles.page
+share/help/pt_BR/hig/dialogs.page
+share/help/pt_BR/hig/display-compatibility.page
+share/help/pt_BR/hig/drop-down-lists.page
+share/help/pt_BR/hig/empty-placeholders.page
+share/help/pt_BR/hig/figures/hig.png
+share/help/pt_BR/hig/figures/icons/inverting.svg
+share/help/pt_BR/hig/figures/icons/palette/aluminium1.svg
+share/help/pt_BR/hig/figures/icons/palette/aluminium2.svg
+share/help/pt_BR/hig/figures/icons/palette/butter.svg
+share/help/pt_BR/hig/figures/icons/palette/chameleon.svg
+share/help/pt_BR/hig/figures/icons/palette/chocolate.svg
+share/help/pt_BR/hig/figures/icons/palette/orange.svg
+share/help/pt_BR/hig/figures/icons/palette/plum.svg
+share/help/pt_BR/hig/figures/icons/palette/scarlet-red.svg
+share/help/pt_BR/hig/figures/icons/palette/sky-blue.svg
+share/help/pt_BR/hig/figures/icons/sizes-small-24.png
+share/help/pt_BR/hig/figures/icons/sizes.png
+share/help/pt_BR/hig/figures/label-alignment.svg
+share/help/pt_BR/hig/figures/patterns/action-bar.svg
+share/help/pt_BR/hig/figures/patterns/action-dialog.svg
+share/help/pt_BR/hig/figures/patterns/application-menu.svg
+share/help/pt_BR/hig/figures/patterns/editable-lists.svg
+share/help/pt_BR/hig/figures/patterns/empty-placeholder.svg
+share/help/pt_BR/hig/figures/patterns/grid.svg
+share/help/pt_BR/hig/figures/patterns/header-bar-menu.svg
+share/help/pt_BR/hig/figures/patterns/header-bar.svg
+share/help/pt_BR/hig/figures/patterns/in-app-notification.svg
+share/help/pt_BR/hig/figures/patterns/info-bar.svg
+share/help/pt_BR/hig/figures/patterns/list-styles.svg
+share/help/pt_BR/hig/figures/patterns/message-dialog.svg
+share/help/pt_BR/hig/figures/patterns/overlaid-controls.svg
+share/help/pt_BR/hig/figures/patterns/patterns.svg
+share/help/pt_BR/hig/figures/patterns/presentation-dialog.svg
+share/help/pt_BR/hig/figures/patterns/primary-windows.svg
+share/help/pt_BR/hig/figures/patterns/search.svg
+share/help/pt_BR/hig/figures/patterns/selection-mode.svg
+share/help/pt_BR/hig/figures/patterns/sidebar-list.svg
+share/help/pt_BR/hig/figures/patterns/view-switcher.svg
+share/help/pt_BR/hig/figures/touch/3-finger-hold-and-tap.svg
+share/help/pt_BR/hig/figures/touch/3-finger-pinch.svg
+share/help/pt_BR/hig/figures/touch/4-finger-drag.svg
+share/help/pt_BR/hig/figures/touch/double-tap.svg
+share/help/pt_BR/hig/figures/touch/drag.svg
+share/help/pt_BR/hig/figures/touch/edge-drag.svg
+share/help/pt_BR/hig/figures/touch/flick.svg
+share/help/pt_BR/hig/figures/touch/pinch-or-stretch.svg
+share/help/pt_BR/hig/figures/touch/tap-and-hold.svg
+share/help/pt_BR/hig/figures/touch/tap.svg
+share/help/pt_BR/hig/figures/ui-elements/button-menu.svg
+share/help/pt_BR/hig/figures/ui-elements/buttons.svg
+share/help/pt_BR/hig/figures/ui-elements/check-boxes.svg
+share/help/pt_BR/hig/figures/ui-elements/drop-down-list-custom-values.svg
+share/help/pt_BR/hig/figures/ui-elements/drop-down-list.svg
+share/help/pt_BR/hig/figures/ui-elements/hybrid-button-menu.svg
+share/help/pt_BR/hig/figures/ui-elements/menu-bar.svg
+share/help/pt_BR/hig/figures/ui-elements/menu.svg
+share/help/pt_BR/hig/figures/ui-elements/popover.svg
+share/help/pt_BR/hig/figures/ui-elements/progress-bars.svg
+share/help/pt_BR/hig/figures/ui-elements/progress-spinner.svg
+share/help/pt_BR/hig/figures/ui-elements/radio-buttons.svg
+share/help/pt_BR/hig/figures/ui-elements/sliders.svg
+share/help/pt_BR/hig/figures/ui-elements/spin-boxes.svg
+share/help/pt_BR/hig/figures/ui-elements/switches.svg
+share/help/pt_BR/hig/figures/ui-elements/tabs.svg
+share/help/pt_BR/hig/figures/ui-elements/text-fields.svg
+share/help/pt_BR/hig/figures/ui-elements/toolbar.svg
+share/help/pt_BR/hig/figures/visual-alignment-correct.svg
+share/help/pt_BR/hig/figures/visual-alignment-incorrect.svg
+share/help/pt_BR/hig/figures/visual-alignment-spacing.svg
+share/help/pt_BR/hig/grids.page
+share/help/pt_BR/hig/header-bar-menus.page
+share/help/pt_BR/hig/header-bars.page
+share/help/pt_BR/hig/icons-and-artwork.page
+share/help/pt_BR/hig/in-app-notifications.page
+share/help/pt_BR/hig/index.page
+share/help/pt_BR/hig/info-bars.page
+share/help/pt_BR/hig/keyboard-input.page
+share/help/pt_BR/hig/legal.xml
+share/help/pt_BR/hig/lists.page
+share/help/pt_BR/hig/menu-bars.page
+share/help/pt_BR/hig/menus.page
+share/help/pt_BR/hig/notifications.page
+share/help/pt_BR/hig/overlaid-controls.page
+share/help/pt_BR/hig/patterns.page
+share/help/pt_BR/hig/pointer-and-touch-input.page
+share/help/pt_BR/hig/popovers.page
+share/help/pt_BR/hig/primary-windows.page
+share/help/pt_BR/hig/progress-bars.page
+share/help/pt_BR/hig/progress-spinners.page
+share/help/pt_BR/hig/radio-buttons.page
+share/help/pt_BR/hig/search.page
+share/help/pt_BR/hig/selection-mode.page
+share/help/pt_BR/hig/sidebar-lists.page
+share/help/pt_BR/hig/sliders.page
+share/help/pt_BR/hig/spin-boxes.page
+share/help/pt_BR/hig/switches.page
+share/help/pt_BR/hig/tabs.page
+share/help/pt_BR/hig/text-fields.page
+share/help/pt_BR/hig/toolbars.page
+share/help/pt_BR/hig/typography.page
+share/help/pt_BR/hig/ui-elements.page
+share/help/pt_BR/hig/view-switchers.page
+share/help/pt_BR/hig/visual-layout.page
+share/help/pt_BR/hig/writing-style.page
share/help/pt_BR/optimization-guide/figures/massif-after.png
share/help/pt_BR/optimization-guide/figures/massif-before.png
share/help/pt_BR/optimization-guide/harmful.page
@@ -5717,6 +6663,7 @@ share/help/pt_BR/platform-overview/dev-translate-setup.page
share/help/pt_BR/platform-overview/dev-translate-tools.page
share/help/pt_BR/platform-overview/dev-translate.page
share/help/pt_BR/platform-overview/index.page
+share/help/pt_BR/platform-overview/legal.xml
share/help/pt_BR/platform-overview/license.page
share/help/pt_BR/platform-overview/media/glade-new-window.png
share/help/pt_BR/platform-overview/media/glade-result.png
@@ -5736,7 +6683,6 @@ share/help/pt_BR/platform-overview/tech-champlain.page
share/help/pt_BR/platform-overview/tech-clutter.page
share/help/pt_BR/platform-overview/tech-d-bus.page
share/help/pt_BR/platform-overview/tech-eds.page
-share/help/pt_BR/platform-overview/tech-enchant.page
share/help/pt_BR/platform-overview/tech-folks.page
share/help/pt_BR/platform-overview/tech-gda.page
share/help/pt_BR/platform-overview/tech-gdk.page
@@ -5760,6 +6706,7 @@ share/help/pt_BR/platform-overview/tech-poppler.page
share/help/pt_BR/platform-overview/tech-pulseaudio.page
share/help/pt_BR/platform-overview/tech-secret.page
share/help/pt_BR/platform-overview/tech-soup.page
+share/help/pt_BR/platform-overview/tech-spell-checking.page
share/help/pt_BR/platform-overview/tech-telepathy.page
share/help/pt_BR/platform-overview/tech-tracker.page
share/help/pt_BR/platform-overview/tech-webkit.page
@@ -5771,6 +6718,29 @@ share/help/pt_BR/platform-overview/tour-gjs.page
share/help/pt_BR/platform-overview/tour-glade.page
share/help/pt_BR/platform-overview/tour-summary.page
share/help/pt_BR/platform-overview/tour.page
+share/help/pt_BR/programming-guidelines/additional-materials.page
+share/help/pt_BR/programming-guidelines/api-stability.page
+share/help/pt_BR/programming-guidelines/c-coding-style.page
+share/help/pt_BR/programming-guidelines/cc-by-sa-3-0.xml
+share/help/pt_BR/programming-guidelines/databases.page
+share/help/pt_BR/programming-guidelines/documentation.page
+share/help/pt_BR/programming-guidelines/file-system.page
+share/help/pt_BR/programming-guidelines/gerror.page
+share/help/pt_BR/programming-guidelines/glist.page
+share/help/pt_BR/programming-guidelines/index.page
+share/help/pt_BR/programming-guidelines/introspection.page
+share/help/pt_BR/programming-guidelines/logging.page
+share/help/pt_BR/programming-guidelines/main-contexts.page
+share/help/pt_BR/programming-guidelines/memory-management.page
+share/help/pt_BR/programming-guidelines/namespacing.page
+share/help/pt_BR/programming-guidelines/parallel-installability.page
+share/help/pt_BR/programming-guidelines/preconditions.page
+share/help/pt_BR/programming-guidelines/threading.page
+share/help/pt_BR/programming-guidelines/tooling.page
+share/help/pt_BR/programming-guidelines/unit-testing.page
+share/help/pt_BR/programming-guidelines/version-control.page
+share/help/pt_BR/programming-guidelines/versioning.page
+share/help/pt_BR/programming-guidelines/writing-good-code.page
share/help/ru/hig/action-bars.page
share/help/ru/hig/application-basics.page
share/help/ru/hig/application-menus.page
@@ -5899,6 +6869,7 @@ share/help/ru/platform-overview/dev-translate-setup.page
share/help/ru/platform-overview/dev-translate-tools.page
share/help/ru/platform-overview/dev-translate.page
share/help/ru/platform-overview/index.page
+share/help/ru/platform-overview/legal.xml
share/help/ru/platform-overview/license.page
share/help/ru/platform-overview/media/glade-new-window.png
share/help/ru/platform-overview/media/glade-result.png
@@ -5918,7 +6889,6 @@ share/help/ru/platform-overview/tech-champlain.page
share/help/ru/platform-overview/tech-clutter.page
share/help/ru/platform-overview/tech-d-bus.page
share/help/ru/platform-overview/tech-eds.page
-share/help/ru/platform-overview/tech-enchant.page
share/help/ru/platform-overview/tech-folks.page
share/help/ru/platform-overview/tech-gda.page
share/help/ru/platform-overview/tech-gdk.page
@@ -5942,6 +6912,7 @@ share/help/ru/platform-overview/tech-poppler.page
share/help/ru/platform-overview/tech-pulseaudio.page
share/help/ru/platform-overview/tech-secret.page
share/help/ru/platform-overview/tech-soup.page
+share/help/ru/platform-overview/tech-spell-checking.page
share/help/ru/platform-overview/tech-telepathy.page
share/help/ru/platform-overview/tech-tracker.page
share/help/ru/platform-overview/tech-webkit.page
@@ -5958,11 +6929,14 @@ share/help/sl/accessibility-devel-guide/figures/at-arch.png
share/help/sl/accessibility-devel-guide/figures/badfocus1.png
share/help/sl/accessibility-devel-guide/figures/badfocus2.png
share/help/sl/accessibility-devel-guide/figures/badfocus3.png
+share/help/sl/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/sl/accessibility-devel-guide/figures/color_only.png
share/help/sl/accessibility-devel-guide/figures/depend1.png
share/help/sl/accessibility-devel-guide/figures/depend1a.png
share/help/sl/accessibility-devel-guide/figures/depend2.png
share/help/sl/accessibility-devel-guide/figures/depend2a.png
share/help/sl/accessibility-devel-guide/figures/depend3.png
+share/help/sl/accessibility-devel-guide/figures/gaa.jpg
share/help/sl/accessibility-devel-guide/figures/goodfocus.png
share/help/sl/accessibility-devel-guide/figures/goodfocus2.png
share/help/sl/accessibility-devel-guide/figures/goodfocus3.png
@@ -5994,6 +6968,7 @@ share/help/sl/platform-overview/dev-translate-setup.page
share/help/sl/platform-overview/dev-translate-tools.page
share/help/sl/platform-overview/dev-translate.page
share/help/sl/platform-overview/index.page
+share/help/sl/platform-overview/legal.xml
share/help/sl/platform-overview/license.page
share/help/sl/platform-overview/media/glade-new-window.png
share/help/sl/platform-overview/media/glade-result.png
@@ -6013,7 +6988,6 @@ share/help/sl/platform-overview/tech-champlain.page
share/help/sl/platform-overview/tech-clutter.page
share/help/sl/platform-overview/tech-d-bus.page
share/help/sl/platform-overview/tech-eds.page
-share/help/sl/platform-overview/tech-enchant.page
share/help/sl/platform-overview/tech-folks.page
share/help/sl/platform-overview/tech-gda.page
share/help/sl/platform-overview/tech-gdk.page
@@ -6037,6 +7011,7 @@ share/help/sl/platform-overview/tech-poppler.page
share/help/sl/platform-overview/tech-pulseaudio.page
share/help/sl/platform-overview/tech-secret.page
share/help/sl/platform-overview/tech-soup.page
+share/help/sl/platform-overview/tech-spell-checking.page
share/help/sl/platform-overview/tech-telepathy.page
share/help/sl/platform-overview/tech-tracker.page
share/help/sl/platform-overview/tech-webkit.page
@@ -6048,6 +7023,12 @@ share/help/sl/platform-overview/tour-gjs.page
share/help/sl/platform-overview/tour-glade.page
share/help/sl/platform-overview/tour-summary.page
share/help/sl/platform-overview/tour.page
+share/help/sv/optimization-guide/figures/massif-after.png
+share/help/sv/optimization-guide/figures/massif-before.png
+share/help/sv/optimization-guide/harmful.page
+share/help/sv/optimization-guide/index.page
+share/help/sv/optimization-guide/introduction.page
+share/help/sv/optimization-guide/massif.page
share/help/sv/platform-overview/cc-by-sa-3-0.xml
share/help/sv/platform-overview/dev-help-appmenu.page
share/help/sv/platform-overview/dev-help-build.page
@@ -6064,6 +7045,7 @@ share/help/sv/platform-overview/dev-translate-setup.page
share/help/sv/platform-overview/dev-translate-tools.page
share/help/sv/platform-overview/dev-translate.page
share/help/sv/platform-overview/index.page
+share/help/sv/platform-overview/legal.xml
share/help/sv/platform-overview/license.page
share/help/sv/platform-overview/media/glade-new-window.png
share/help/sv/platform-overview/media/glade-result.png
@@ -6083,7 +7065,6 @@ share/help/sv/platform-overview/tech-champlain.page
share/help/sv/platform-overview/tech-clutter.page
share/help/sv/platform-overview/tech-d-bus.page
share/help/sv/platform-overview/tech-eds.page
-share/help/sv/platform-overview/tech-enchant.page
share/help/sv/platform-overview/tech-folks.page
share/help/sv/platform-overview/tech-gda.page
share/help/sv/platform-overview/tech-gdk.page
@@ -6107,6 +7088,7 @@ share/help/sv/platform-overview/tech-poppler.page
share/help/sv/platform-overview/tech-pulseaudio.page
share/help/sv/platform-overview/tech-secret.page
share/help/sv/platform-overview/tech-soup.page
+share/help/sv/platform-overview/tech-spell-checking.page
share/help/sv/platform-overview/tech-telepathy.page
share/help/sv/platform-overview/tech-tracker.page
share/help/sv/platform-overview/tech-webkit.page
@@ -6134,6 +7116,7 @@ share/help/uk/platform-overview/dev-translate-setup.page
share/help/uk/platform-overview/dev-translate-tools.page
share/help/uk/platform-overview/dev-translate.page
share/help/uk/platform-overview/index.page
+share/help/uk/platform-overview/legal.xml
share/help/uk/platform-overview/license.page
share/help/uk/platform-overview/media/glade-new-window.png
share/help/uk/platform-overview/media/glade-result.png
@@ -6153,7 +7136,6 @@ share/help/uk/platform-overview/tech-champlain.page
share/help/uk/platform-overview/tech-clutter.page
share/help/uk/platform-overview/tech-d-bus.page
share/help/uk/platform-overview/tech-eds.page
-share/help/uk/platform-overview/tech-enchant.page
share/help/uk/platform-overview/tech-folks.page
share/help/uk/platform-overview/tech-gda.page
share/help/uk/platform-overview/tech-gdk.page
@@ -6177,6 +7159,7 @@ share/help/uk/platform-overview/tech-poppler.page
share/help/uk/platform-overview/tech-pulseaudio.page
share/help/uk/platform-overview/tech-secret.page
share/help/uk/platform-overview/tech-soup.page
+share/help/uk/platform-overview/tech-spell-checking.page
share/help/uk/platform-overview/tech-telepathy.page
share/help/uk/platform-overview/tech-tracker.page
share/help/uk/platform-overview/tech-webkit.page
@@ -6193,11 +7176,14 @@ share/help/zh_CN/accessibility-devel-guide/figures/at-arch.png
share/help/zh_CN/accessibility-devel-guide/figures/badfocus1.png
share/help/zh_CN/accessibility-devel-guide/figures/badfocus2.png
share/help/zh_CN/accessibility-devel-guide/figures/badfocus3.png
+share/help/zh_CN/accessibility-devel-guide/figures/color_and_arrows.png
+share/help/zh_CN/accessibility-devel-guide/figures/color_only.png
share/help/zh_CN/accessibility-devel-guide/figures/depend1.png
share/help/zh_CN/accessibility-devel-guide/figures/depend1a.png
share/help/zh_CN/accessibility-devel-guide/figures/depend2.png
share/help/zh_CN/accessibility-devel-guide/figures/depend2a.png
share/help/zh_CN/accessibility-devel-guide/figures/depend3.png
+share/help/zh_CN/accessibility-devel-guide/figures/gaa.jpg
share/help/zh_CN/accessibility-devel-guide/figures/goodfocus.png
share/help/zh_CN/accessibility-devel-guide/figures/goodfocus2.png
share/help/zh_CN/accessibility-devel-guide/figures/goodfocus3.png
@@ -6229,6 +7215,7 @@ share/help/zh_CN/platform-overview/dev-translate-setup.page
share/help/zh_CN/platform-overview/dev-translate-tools.page
share/help/zh_CN/platform-overview/dev-translate.page
share/help/zh_CN/platform-overview/index.page
+share/help/zh_CN/platform-overview/legal.xml
share/help/zh_CN/platform-overview/license.page
share/help/zh_CN/platform-overview/media/glade-new-window.png
share/help/zh_CN/platform-overview/media/glade-result.png
@@ -6248,7 +7235,6 @@ share/help/zh_CN/platform-overview/tech-champlain.page
share/help/zh_CN/platform-overview/tech-clutter.page
share/help/zh_CN/platform-overview/tech-d-bus.page
share/help/zh_CN/platform-overview/tech-eds.page
-share/help/zh_CN/platform-overview/tech-enchant.page
share/help/zh_CN/platform-overview/tech-folks.page
share/help/zh_CN/platform-overview/tech-gda.page
share/help/zh_CN/platform-overview/tech-gdk.page
@@ -6272,6 +7258,7 @@ share/help/zh_CN/platform-overview/tech-poppler.page
share/help/zh_CN/platform-overview/tech-pulseaudio.page
share/help/zh_CN/platform-overview/tech-secret.page
share/help/zh_CN/platform-overview/tech-soup.page
+share/help/zh_CN/platform-overview/tech-spell-checking.page
share/help/zh_CN/platform-overview/tech-telepathy.page
share/help/zh_CN/platform-overview/tech-tracker.page
share/help/zh_CN/platform-overview/tech-webkit.page
diff --git a/misc/gnome-getting-started-docs/Makefile b/misc/gnome-getting-started-docs/Makefile
new file mode 100644
index 000000000000..b2072cf63638
--- /dev/null
+++ b/misc/gnome-getting-started-docs/Makefile
@@ -0,0 +1,25 @@
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= gnome-getting-started-docs
+PORTVERSION= 3.28.2
+CATEGORIES= misc gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome3
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 3 getting started guide
+
+LICENSE= CC-BY-3.0
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= itstool:textproc/itstool
+
+PORTSCOUT= limitw:1,even
+
+GNU_CONFIGURE= yes
+NO_ARCH= yes
+USES= gettext-tools gmake gnome pathfix tar:xz
+USE_GNOME= libxml2:build
+
+.include <bsd.port.mk>
diff --git a/misc/gnome-getting-started-docs/distinfo b/misc/gnome-getting-started-docs/distinfo
new file mode 100644
index 000000000000..d822b98a4ad1
--- /dev/null
+++ b/misc/gnome-getting-started-docs/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525956116
+SHA256 (gnome3/gnome-getting-started-docs-3.28.2.tar.xz) = 2eda72c5e399736dee86e8c56f5f42d87058943ff0b4cbca35f2ab932d59e06d
+SIZE (gnome3/gnome-getting-started-docs-3.28.2.tar.xz) = 110245016
diff --git a/misc/gnome-getting-started-docs/pkg-descr b/misc/gnome-getting-started-docs/pkg-descr
new file mode 100644
index 000000000000..42c6c7678a20
--- /dev/null
+++ b/misc/gnome-getting-started-docs/pkg-descr
@@ -0,0 +1 @@
+User documentation for the GNOME 3 desktop.
diff --git a/misc/gnome-getting-started-docs/pkg-plist b/misc/gnome-getting-started-docs/pkg-plist
new file mode 100644
index 000000000000..017468b8ed05
--- /dev/null
+++ b/misc/gnome-getting-started-docs/pkg-plist
@@ -0,0 +1,1599 @@
+share/help/C/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/C/gnome-help/figures/gnome-launching-applications.webm
+share/help/C/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/C/gnome-help/figures/gnome-task-switching.webm
+share/help/C/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/C/gnome-help/getting-started.page
+share/help/C/gnome-help/gs-animation.xml
+share/help/C/gnome-help/gs-browse-web.page
+share/help/C/gnome-help/gs-change-date-time-timezone.page
+share/help/C/gnome-help/gs-change-wallpaper.page
+share/help/C/gnome-help/gs-connect-online-accounts.page
+share/help/C/gnome-help/gs-datetime.svg
+share/help/C/gnome-help/gs-get-online.page
+share/help/C/gnome-help/gs-go-online1.svg
+share/help/C/gnome-help/gs-go-online2.svg
+share/help/C/gnome-help/gs-go-online3.svg
+share/help/C/gnome-help/gs-goa1.svg
+share/help/C/gnome-help/gs-goa2.svg
+share/help/C/gnome-help/gs-goa3.svg
+share/help/C/gnome-help/gs-goa4.svg
+share/help/C/gnome-help/gs-goa5.svg
+share/help/C/gnome-help/gs-launch-applications.page
+share/help/C/gnome-help/gs-legal.xml
+share/help/C/gnome-help/gs-respond-messages.page
+share/help/C/gnome-help/gs-search-settings.svg
+share/help/C/gnome-help/gs-search1.svg
+share/help/C/gnome-help/gs-search2.svg
+share/help/C/gnome-help/gs-switch-tasks.page
+share/help/C/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/C/gnome-help/gs-thumb-launching-apps.svg
+share/help/C/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/C/gnome-help/gs-thumb-task-switching.svg
+share/help/C/gnome-help/gs-thumb-timezone.svg
+share/help/C/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/C/gnome-help/gs-use-system-search.page
+share/help/C/gnome-help/gs-use-windows-workspaces.page
+share/help/C/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/C/gnome-help/gs-web-browser1-firefox.svg
+share/help/C/gnome-help/gs-web-browser1.svg
+share/help/C/gnome-help/gs-web-browser2-firefox.svg
+share/help/C/gnome-help/gs-web-browser2.svg
+share/help/as/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/as/gnome-help/figures/gnome-launching-applications.webm
+share/help/as/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/as/gnome-help/figures/gnome-task-switching.webm
+share/help/as/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/as/gnome-help/getting-started.page
+share/help/as/gnome-help/gs-animation.xml
+share/help/as/gnome-help/gs-browse-web.page
+share/help/as/gnome-help/gs-change-date-time-timezone.page
+share/help/as/gnome-help/gs-change-wallpaper.page
+share/help/as/gnome-help/gs-connect-online-accounts.page
+share/help/as/gnome-help/gs-datetime.svg
+share/help/as/gnome-help/gs-get-online.page
+share/help/as/gnome-help/gs-go-online1.svg
+share/help/as/gnome-help/gs-go-online2.svg
+share/help/as/gnome-help/gs-go-online3.svg
+share/help/as/gnome-help/gs-goa1.svg
+share/help/as/gnome-help/gs-goa2.svg
+share/help/as/gnome-help/gs-goa3.svg
+share/help/as/gnome-help/gs-goa4.svg
+share/help/as/gnome-help/gs-goa5.svg
+share/help/as/gnome-help/gs-launch-applications.page
+share/help/as/gnome-help/gs-legal.xml
+share/help/as/gnome-help/gs-respond-messages.page
+share/help/as/gnome-help/gs-search-settings.svg
+share/help/as/gnome-help/gs-search1.svg
+share/help/as/gnome-help/gs-search2.svg
+share/help/as/gnome-help/gs-switch-tasks.page
+share/help/as/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/as/gnome-help/gs-thumb-launching-apps.svg
+share/help/as/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/as/gnome-help/gs-thumb-task-switching.svg
+share/help/as/gnome-help/gs-thumb-timezone.svg
+share/help/as/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/as/gnome-help/gs-use-system-search.page
+share/help/as/gnome-help/gs-use-windows-workspaces.page
+share/help/as/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/as/gnome-help/gs-web-browser1-firefox.svg
+share/help/as/gnome-help/gs-web-browser1.svg
+share/help/as/gnome-help/gs-web-browser2-firefox.svg
+share/help/as/gnome-help/gs-web-browser2.svg
+share/help/ca/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/ca/gnome-help/figures/gnome-launching-applications.webm
+share/help/ca/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/ca/gnome-help/figures/gnome-task-switching.webm
+share/help/ca/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/ca/gnome-help/getting-started.page
+share/help/ca/gnome-help/gs-animation.xml
+share/help/ca/gnome-help/gs-browse-web.page
+share/help/ca/gnome-help/gs-change-date-time-timezone.page
+share/help/ca/gnome-help/gs-change-wallpaper.page
+share/help/ca/gnome-help/gs-connect-online-accounts.page
+share/help/ca/gnome-help/gs-datetime.svg
+share/help/ca/gnome-help/gs-get-online.page
+share/help/ca/gnome-help/gs-go-online1.svg
+share/help/ca/gnome-help/gs-go-online2.svg
+share/help/ca/gnome-help/gs-go-online3.svg
+share/help/ca/gnome-help/gs-goa1.svg
+share/help/ca/gnome-help/gs-goa2.svg
+share/help/ca/gnome-help/gs-goa3.svg
+share/help/ca/gnome-help/gs-goa4.svg
+share/help/ca/gnome-help/gs-goa5.svg
+share/help/ca/gnome-help/gs-launch-applications.page
+share/help/ca/gnome-help/gs-legal.xml
+share/help/ca/gnome-help/gs-respond-messages.page
+share/help/ca/gnome-help/gs-search-settings.svg
+share/help/ca/gnome-help/gs-search1.svg
+share/help/ca/gnome-help/gs-search2.svg
+share/help/ca/gnome-help/gs-switch-tasks.page
+share/help/ca/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/ca/gnome-help/gs-thumb-launching-apps.svg
+share/help/ca/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/ca/gnome-help/gs-thumb-task-switching.svg
+share/help/ca/gnome-help/gs-thumb-timezone.svg
+share/help/ca/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/ca/gnome-help/gs-use-system-search.page
+share/help/ca/gnome-help/gs-use-windows-workspaces.page
+share/help/ca/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/ca/gnome-help/gs-web-browser1-firefox.svg
+share/help/ca/gnome-help/gs-web-browser1.svg
+share/help/ca/gnome-help/gs-web-browser2-firefox.svg
+share/help/ca/gnome-help/gs-web-browser2.svg
+share/help/cs/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/cs/gnome-help/figures/gnome-launching-applications.webm
+share/help/cs/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/cs/gnome-help/figures/gnome-task-switching.webm
+share/help/cs/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/cs/gnome-help/getting-started.page
+share/help/cs/gnome-help/gs-animation.xml
+share/help/cs/gnome-help/gs-browse-web.page
+share/help/cs/gnome-help/gs-change-date-time-timezone.page
+share/help/cs/gnome-help/gs-change-wallpaper.page
+share/help/cs/gnome-help/gs-connect-online-accounts.page
+share/help/cs/gnome-help/gs-datetime.svg
+share/help/cs/gnome-help/gs-get-online.page
+share/help/cs/gnome-help/gs-go-online1.svg
+share/help/cs/gnome-help/gs-go-online2.svg
+share/help/cs/gnome-help/gs-go-online3.svg
+share/help/cs/gnome-help/gs-goa1.svg
+share/help/cs/gnome-help/gs-goa2.svg
+share/help/cs/gnome-help/gs-goa3.svg
+share/help/cs/gnome-help/gs-goa4.svg
+share/help/cs/gnome-help/gs-goa5.svg
+share/help/cs/gnome-help/gs-launch-applications.page
+share/help/cs/gnome-help/gs-legal.xml
+share/help/cs/gnome-help/gs-respond-messages.page
+share/help/cs/gnome-help/gs-search-settings.svg
+share/help/cs/gnome-help/gs-search1.svg
+share/help/cs/gnome-help/gs-search2.svg
+share/help/cs/gnome-help/gs-switch-tasks.page
+share/help/cs/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/cs/gnome-help/gs-thumb-launching-apps.svg
+share/help/cs/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/cs/gnome-help/gs-thumb-task-switching.svg
+share/help/cs/gnome-help/gs-thumb-timezone.svg
+share/help/cs/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/cs/gnome-help/gs-use-system-search.page
+share/help/cs/gnome-help/gs-use-windows-workspaces.page
+share/help/cs/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/cs/gnome-help/gs-web-browser1-firefox.svg
+share/help/cs/gnome-help/gs-web-browser1.svg
+share/help/cs/gnome-help/gs-web-browser2-firefox.svg
+share/help/cs/gnome-help/gs-web-browser2.svg
+share/help/da/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/da/gnome-help/figures/gnome-launching-applications.webm
+share/help/da/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/da/gnome-help/figures/gnome-task-switching.webm
+share/help/da/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/da/gnome-help/getting-started.page
+share/help/da/gnome-help/gs-animation.xml
+share/help/da/gnome-help/gs-browse-web.page
+share/help/da/gnome-help/gs-change-date-time-timezone.page
+share/help/da/gnome-help/gs-change-wallpaper.page
+share/help/da/gnome-help/gs-connect-online-accounts.page
+share/help/da/gnome-help/gs-datetime.svg
+share/help/da/gnome-help/gs-get-online.page
+share/help/da/gnome-help/gs-go-online1.svg
+share/help/da/gnome-help/gs-go-online2.svg
+share/help/da/gnome-help/gs-go-online3.svg
+share/help/da/gnome-help/gs-goa1.svg
+share/help/da/gnome-help/gs-goa2.svg
+share/help/da/gnome-help/gs-goa3.svg
+share/help/da/gnome-help/gs-goa4.svg
+share/help/da/gnome-help/gs-goa5.svg
+share/help/da/gnome-help/gs-launch-applications.page
+share/help/da/gnome-help/gs-legal.xml
+share/help/da/gnome-help/gs-respond-messages.page
+share/help/da/gnome-help/gs-search-settings.svg
+share/help/da/gnome-help/gs-search1.svg
+share/help/da/gnome-help/gs-search2.svg
+share/help/da/gnome-help/gs-switch-tasks.page
+share/help/da/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/da/gnome-help/gs-thumb-launching-apps.svg
+share/help/da/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/da/gnome-help/gs-thumb-task-switching.svg
+share/help/da/gnome-help/gs-thumb-timezone.svg
+share/help/da/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/da/gnome-help/gs-use-system-search.page
+share/help/da/gnome-help/gs-use-windows-workspaces.page
+share/help/da/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/da/gnome-help/gs-web-browser1-firefox.svg
+share/help/da/gnome-help/gs-web-browser1.svg
+share/help/da/gnome-help/gs-web-browser2-firefox.svg
+share/help/da/gnome-help/gs-web-browser2.svg
+share/help/de/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/de/gnome-help/figures/gnome-launching-applications.webm
+share/help/de/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/de/gnome-help/figures/gnome-task-switching.webm
+share/help/de/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/de/gnome-help/getting-started.page
+share/help/de/gnome-help/gs-animation.xml
+share/help/de/gnome-help/gs-browse-web.page
+share/help/de/gnome-help/gs-change-date-time-timezone.page
+share/help/de/gnome-help/gs-change-wallpaper.page
+share/help/de/gnome-help/gs-connect-online-accounts.page
+share/help/de/gnome-help/gs-datetime.svg
+share/help/de/gnome-help/gs-get-online.page
+share/help/de/gnome-help/gs-go-online1.svg
+share/help/de/gnome-help/gs-go-online2.svg
+share/help/de/gnome-help/gs-go-online3.svg
+share/help/de/gnome-help/gs-goa1.svg
+share/help/de/gnome-help/gs-goa2.svg
+share/help/de/gnome-help/gs-goa3.svg
+share/help/de/gnome-help/gs-goa4.svg
+share/help/de/gnome-help/gs-goa5.svg
+share/help/de/gnome-help/gs-launch-applications.page
+share/help/de/gnome-help/gs-legal.xml
+share/help/de/gnome-help/gs-respond-messages.page
+share/help/de/gnome-help/gs-search-settings.svg
+share/help/de/gnome-help/gs-search1.svg
+share/help/de/gnome-help/gs-search2.svg
+share/help/de/gnome-help/gs-switch-tasks.page
+share/help/de/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/de/gnome-help/gs-thumb-launching-apps.svg
+share/help/de/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/de/gnome-help/gs-thumb-task-switching.svg
+share/help/de/gnome-help/gs-thumb-timezone.svg
+share/help/de/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/de/gnome-help/gs-use-system-search.page
+share/help/de/gnome-help/gs-use-windows-workspaces.page
+share/help/de/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/de/gnome-help/gs-web-browser1-firefox.svg
+share/help/de/gnome-help/gs-web-browser1.svg
+share/help/de/gnome-help/gs-web-browser2-firefox.svg
+share/help/de/gnome-help/gs-web-browser2.svg
+share/help/el/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/el/gnome-help/figures/gnome-launching-applications.webm
+share/help/el/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/el/gnome-help/figures/gnome-task-switching.webm
+share/help/el/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/el/gnome-help/getting-started.page
+share/help/el/gnome-help/gs-animation.xml
+share/help/el/gnome-help/gs-browse-web.page
+share/help/el/gnome-help/gs-change-date-time-timezone.page
+share/help/el/gnome-help/gs-change-wallpaper.page
+share/help/el/gnome-help/gs-connect-online-accounts.page
+share/help/el/gnome-help/gs-datetime.svg
+share/help/el/gnome-help/gs-get-online.page
+share/help/el/gnome-help/gs-go-online1.svg
+share/help/el/gnome-help/gs-go-online2.svg
+share/help/el/gnome-help/gs-go-online3.svg
+share/help/el/gnome-help/gs-goa1.svg
+share/help/el/gnome-help/gs-goa2.svg
+share/help/el/gnome-help/gs-goa3.svg
+share/help/el/gnome-help/gs-goa4.svg
+share/help/el/gnome-help/gs-goa5.svg
+share/help/el/gnome-help/gs-launch-applications.page
+share/help/el/gnome-help/gs-legal.xml
+share/help/el/gnome-help/gs-respond-messages.page
+share/help/el/gnome-help/gs-search-settings.svg
+share/help/el/gnome-help/gs-search1.svg
+share/help/el/gnome-help/gs-search2.svg
+share/help/el/gnome-help/gs-switch-tasks.page
+share/help/el/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/el/gnome-help/gs-thumb-launching-apps.svg
+share/help/el/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/el/gnome-help/gs-thumb-task-switching.svg
+share/help/el/gnome-help/gs-thumb-timezone.svg
+share/help/el/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/el/gnome-help/gs-use-system-search.page
+share/help/el/gnome-help/gs-use-windows-workspaces.page
+share/help/el/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/el/gnome-help/gs-web-browser1-firefox.svg
+share/help/el/gnome-help/gs-web-browser1.svg
+share/help/el/gnome-help/gs-web-browser2-firefox.svg
+share/help/el/gnome-help/gs-web-browser2.svg
+share/help/es/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/es/gnome-help/figures/gnome-launching-applications.webm
+share/help/es/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/es/gnome-help/figures/gnome-task-switching.webm
+share/help/es/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/es/gnome-help/getting-started.page
+share/help/es/gnome-help/gs-animation.xml
+share/help/es/gnome-help/gs-browse-web.page
+share/help/es/gnome-help/gs-change-date-time-timezone.page
+share/help/es/gnome-help/gs-change-wallpaper.page
+share/help/es/gnome-help/gs-connect-online-accounts.page
+share/help/es/gnome-help/gs-datetime.svg
+share/help/es/gnome-help/gs-get-online.page
+share/help/es/gnome-help/gs-go-online1.svg
+share/help/es/gnome-help/gs-go-online2.svg
+share/help/es/gnome-help/gs-go-online3.svg
+share/help/es/gnome-help/gs-goa1.svg
+share/help/es/gnome-help/gs-goa2.svg
+share/help/es/gnome-help/gs-goa3.svg
+share/help/es/gnome-help/gs-goa4.svg
+share/help/es/gnome-help/gs-goa5.svg
+share/help/es/gnome-help/gs-launch-applications.page
+share/help/es/gnome-help/gs-legal.xml
+share/help/es/gnome-help/gs-respond-messages.page
+share/help/es/gnome-help/gs-search-settings.svg
+share/help/es/gnome-help/gs-search1.svg
+share/help/es/gnome-help/gs-search2.svg
+share/help/es/gnome-help/gs-switch-tasks.page
+share/help/es/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/es/gnome-help/gs-thumb-launching-apps.svg
+share/help/es/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/es/gnome-help/gs-thumb-task-switching.svg
+share/help/es/gnome-help/gs-thumb-timezone.svg
+share/help/es/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/es/gnome-help/gs-use-system-search.page
+share/help/es/gnome-help/gs-use-windows-workspaces.page
+share/help/es/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/es/gnome-help/gs-web-browser1-firefox.svg
+share/help/es/gnome-help/gs-web-browser1.svg
+share/help/es/gnome-help/gs-web-browser2-firefox.svg
+share/help/es/gnome-help/gs-web-browser2.svg
+share/help/fi/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/fi/gnome-help/figures/gnome-launching-applications.webm
+share/help/fi/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/fi/gnome-help/figures/gnome-task-switching.webm
+share/help/fi/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/fi/gnome-help/getting-started.page
+share/help/fi/gnome-help/gs-animation.xml
+share/help/fi/gnome-help/gs-browse-web.page
+share/help/fi/gnome-help/gs-change-date-time-timezone.page
+share/help/fi/gnome-help/gs-change-wallpaper.page
+share/help/fi/gnome-help/gs-connect-online-accounts.page
+share/help/fi/gnome-help/gs-datetime.svg
+share/help/fi/gnome-help/gs-get-online.page
+share/help/fi/gnome-help/gs-go-online1.svg
+share/help/fi/gnome-help/gs-go-online2.svg
+share/help/fi/gnome-help/gs-go-online3.svg
+share/help/fi/gnome-help/gs-goa1.svg
+share/help/fi/gnome-help/gs-goa2.svg
+share/help/fi/gnome-help/gs-goa3.svg
+share/help/fi/gnome-help/gs-goa4.svg
+share/help/fi/gnome-help/gs-goa5.svg
+share/help/fi/gnome-help/gs-launch-applications.page
+share/help/fi/gnome-help/gs-legal.xml
+share/help/fi/gnome-help/gs-respond-messages.page
+share/help/fi/gnome-help/gs-search-settings.svg
+share/help/fi/gnome-help/gs-search1.svg
+share/help/fi/gnome-help/gs-search2.svg
+share/help/fi/gnome-help/gs-switch-tasks.page
+share/help/fi/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/fi/gnome-help/gs-thumb-launching-apps.svg
+share/help/fi/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/fi/gnome-help/gs-thumb-task-switching.svg
+share/help/fi/gnome-help/gs-thumb-timezone.svg
+share/help/fi/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/fi/gnome-help/gs-use-system-search.page
+share/help/fi/gnome-help/gs-use-windows-workspaces.page
+share/help/fi/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/fi/gnome-help/gs-web-browser1-firefox.svg
+share/help/fi/gnome-help/gs-web-browser1.svg
+share/help/fi/gnome-help/gs-web-browser2-firefox.svg
+share/help/fi/gnome-help/gs-web-browser2.svg
+share/help/fr/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/fr/gnome-help/figures/gnome-launching-applications.webm
+share/help/fr/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/fr/gnome-help/figures/gnome-task-switching.webm
+share/help/fr/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/fr/gnome-help/getting-started.page
+share/help/fr/gnome-help/gs-animation.xml
+share/help/fr/gnome-help/gs-browse-web.page
+share/help/fr/gnome-help/gs-change-date-time-timezone.page
+share/help/fr/gnome-help/gs-change-wallpaper.page
+share/help/fr/gnome-help/gs-connect-online-accounts.page
+share/help/fr/gnome-help/gs-datetime.svg
+share/help/fr/gnome-help/gs-get-online.page
+share/help/fr/gnome-help/gs-go-online1.svg
+share/help/fr/gnome-help/gs-go-online2.svg
+share/help/fr/gnome-help/gs-go-online3.svg
+share/help/fr/gnome-help/gs-goa1.svg
+share/help/fr/gnome-help/gs-goa2.svg
+share/help/fr/gnome-help/gs-goa3.svg
+share/help/fr/gnome-help/gs-goa4.svg
+share/help/fr/gnome-help/gs-goa5.svg
+share/help/fr/gnome-help/gs-launch-applications.page
+share/help/fr/gnome-help/gs-legal.xml
+share/help/fr/gnome-help/gs-respond-messages.page
+share/help/fr/gnome-help/gs-search-settings.svg
+share/help/fr/gnome-help/gs-search1.svg
+share/help/fr/gnome-help/gs-search2.svg
+share/help/fr/gnome-help/gs-switch-tasks.page
+share/help/fr/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/fr/gnome-help/gs-thumb-launching-apps.svg
+share/help/fr/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/fr/gnome-help/gs-thumb-task-switching.svg
+share/help/fr/gnome-help/gs-thumb-timezone.svg
+share/help/fr/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/fr/gnome-help/gs-use-system-search.page
+share/help/fr/gnome-help/gs-use-windows-workspaces.page
+share/help/fr/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/fr/gnome-help/gs-web-browser1-firefox.svg
+share/help/fr/gnome-help/gs-web-browser1.svg
+share/help/fr/gnome-help/gs-web-browser2-firefox.svg
+share/help/fr/gnome-help/gs-web-browser2.svg
+share/help/gl/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/gl/gnome-help/figures/gnome-launching-applications.webm
+share/help/gl/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/gl/gnome-help/figures/gnome-task-switching.webm
+share/help/gl/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/gl/gnome-help/getting-started.page
+share/help/gl/gnome-help/gs-animation.xml
+share/help/gl/gnome-help/gs-browse-web.page
+share/help/gl/gnome-help/gs-change-date-time-timezone.page
+share/help/gl/gnome-help/gs-change-wallpaper.page
+share/help/gl/gnome-help/gs-connect-online-accounts.page
+share/help/gl/gnome-help/gs-datetime.svg
+share/help/gl/gnome-help/gs-get-online.page
+share/help/gl/gnome-help/gs-go-online1.svg
+share/help/gl/gnome-help/gs-go-online2.svg
+share/help/gl/gnome-help/gs-go-online3.svg
+share/help/gl/gnome-help/gs-goa1.svg
+share/help/gl/gnome-help/gs-goa2.svg
+share/help/gl/gnome-help/gs-goa3.svg
+share/help/gl/gnome-help/gs-goa4.svg
+share/help/gl/gnome-help/gs-goa5.svg
+share/help/gl/gnome-help/gs-launch-applications.page
+share/help/gl/gnome-help/gs-legal.xml
+share/help/gl/gnome-help/gs-respond-messages.page
+share/help/gl/gnome-help/gs-search-settings.svg
+share/help/gl/gnome-help/gs-search1.svg
+share/help/gl/gnome-help/gs-search2.svg
+share/help/gl/gnome-help/gs-switch-tasks.page
+share/help/gl/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/gl/gnome-help/gs-thumb-launching-apps.svg
+share/help/gl/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/gl/gnome-help/gs-thumb-task-switching.svg
+share/help/gl/gnome-help/gs-thumb-timezone.svg
+share/help/gl/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/gl/gnome-help/gs-use-system-search.page
+share/help/gl/gnome-help/gs-use-windows-workspaces.page
+share/help/gl/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/gl/gnome-help/gs-web-browser1-firefox.svg
+share/help/gl/gnome-help/gs-web-browser1.svg
+share/help/gl/gnome-help/gs-web-browser2-firefox.svg
+share/help/gl/gnome-help/gs-web-browser2.svg
+share/help/gu/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/gu/gnome-help/figures/gnome-launching-applications.webm
+share/help/gu/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/gu/gnome-help/figures/gnome-task-switching.webm
+share/help/gu/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/gu/gnome-help/getting-started.page
+share/help/gu/gnome-help/gs-animation.xml
+share/help/gu/gnome-help/gs-browse-web.page
+share/help/gu/gnome-help/gs-change-date-time-timezone.page
+share/help/gu/gnome-help/gs-change-wallpaper.page
+share/help/gu/gnome-help/gs-connect-online-accounts.page
+share/help/gu/gnome-help/gs-datetime.svg
+share/help/gu/gnome-help/gs-get-online.page
+share/help/gu/gnome-help/gs-go-online1.svg
+share/help/gu/gnome-help/gs-go-online2.svg
+share/help/gu/gnome-help/gs-go-online3.svg
+share/help/gu/gnome-help/gs-goa1.svg
+share/help/gu/gnome-help/gs-goa2.svg
+share/help/gu/gnome-help/gs-goa3.svg
+share/help/gu/gnome-help/gs-goa4.svg
+share/help/gu/gnome-help/gs-goa5.svg
+share/help/gu/gnome-help/gs-launch-applications.page
+share/help/gu/gnome-help/gs-legal.xml
+share/help/gu/gnome-help/gs-respond-messages.page
+share/help/gu/gnome-help/gs-search-settings.svg
+share/help/gu/gnome-help/gs-search1.svg
+share/help/gu/gnome-help/gs-search2.svg
+share/help/gu/gnome-help/gs-switch-tasks.page
+share/help/gu/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/gu/gnome-help/gs-thumb-launching-apps.svg
+share/help/gu/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/gu/gnome-help/gs-thumb-task-switching.svg
+share/help/gu/gnome-help/gs-thumb-timezone.svg
+share/help/gu/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/gu/gnome-help/gs-use-system-search.page
+share/help/gu/gnome-help/gs-use-windows-workspaces.page
+share/help/gu/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/gu/gnome-help/gs-web-browser1-firefox.svg
+share/help/gu/gnome-help/gs-web-browser1.svg
+share/help/gu/gnome-help/gs-web-browser2-firefox.svg
+share/help/gu/gnome-help/gs-web-browser2.svg
+share/help/he/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/he/gnome-help/figures/gnome-launching-applications.webm
+share/help/he/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/he/gnome-help/figures/gnome-task-switching.webm
+share/help/he/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/he/gnome-help/getting-started.page
+share/help/he/gnome-help/gs-animation.xml
+share/help/he/gnome-help/gs-browse-web.page
+share/help/he/gnome-help/gs-change-date-time-timezone.page
+share/help/he/gnome-help/gs-change-wallpaper.page
+share/help/he/gnome-help/gs-connect-online-accounts.page
+share/help/he/gnome-help/gs-datetime.svg
+share/help/he/gnome-help/gs-get-online.page
+share/help/he/gnome-help/gs-go-online1.svg
+share/help/he/gnome-help/gs-go-online2.svg
+share/help/he/gnome-help/gs-go-online3.svg
+share/help/he/gnome-help/gs-goa1.svg
+share/help/he/gnome-help/gs-goa2.svg
+share/help/he/gnome-help/gs-goa3.svg
+share/help/he/gnome-help/gs-goa4.svg
+share/help/he/gnome-help/gs-goa5.svg
+share/help/he/gnome-help/gs-launch-applications.page
+share/help/he/gnome-help/gs-legal.xml
+share/help/he/gnome-help/gs-respond-messages.page
+share/help/he/gnome-help/gs-search-settings.svg
+share/help/he/gnome-help/gs-search1.svg
+share/help/he/gnome-help/gs-search2.svg
+share/help/he/gnome-help/gs-switch-tasks.page
+share/help/he/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/he/gnome-help/gs-thumb-launching-apps.svg
+share/help/he/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/he/gnome-help/gs-thumb-task-switching.svg
+share/help/he/gnome-help/gs-thumb-timezone.svg
+share/help/he/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/he/gnome-help/gs-use-system-search.page
+share/help/he/gnome-help/gs-use-windows-workspaces.page
+share/help/he/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/he/gnome-help/gs-web-browser1-firefox.svg
+share/help/he/gnome-help/gs-web-browser1.svg
+share/help/he/gnome-help/gs-web-browser2-firefox.svg
+share/help/he/gnome-help/gs-web-browser2.svg
+share/help/hi/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/hi/gnome-help/figures/gnome-launching-applications.webm
+share/help/hi/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/hi/gnome-help/figures/gnome-task-switching.webm
+share/help/hi/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/hi/gnome-help/getting-started.page
+share/help/hi/gnome-help/gs-animation.xml
+share/help/hi/gnome-help/gs-browse-web.page
+share/help/hi/gnome-help/gs-change-date-time-timezone.page
+share/help/hi/gnome-help/gs-change-wallpaper.page
+share/help/hi/gnome-help/gs-connect-online-accounts.page
+share/help/hi/gnome-help/gs-datetime.svg
+share/help/hi/gnome-help/gs-get-online.page
+share/help/hi/gnome-help/gs-go-online1.svg
+share/help/hi/gnome-help/gs-go-online2.svg
+share/help/hi/gnome-help/gs-go-online3.svg
+share/help/hi/gnome-help/gs-goa1.svg
+share/help/hi/gnome-help/gs-goa2.svg
+share/help/hi/gnome-help/gs-goa3.svg
+share/help/hi/gnome-help/gs-goa4.svg
+share/help/hi/gnome-help/gs-goa5.svg
+share/help/hi/gnome-help/gs-launch-applications.page
+share/help/hi/gnome-help/gs-legal.xml
+share/help/hi/gnome-help/gs-respond-messages.page
+share/help/hi/gnome-help/gs-search-settings.svg
+share/help/hi/gnome-help/gs-search1.svg
+share/help/hi/gnome-help/gs-search2.svg
+share/help/hi/gnome-help/gs-switch-tasks.page
+share/help/hi/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/hi/gnome-help/gs-thumb-launching-apps.svg
+share/help/hi/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/hi/gnome-help/gs-thumb-task-switching.svg
+share/help/hi/gnome-help/gs-thumb-timezone.svg
+share/help/hi/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/hi/gnome-help/gs-use-system-search.page
+share/help/hi/gnome-help/gs-use-windows-workspaces.page
+share/help/hi/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/hi/gnome-help/gs-web-browser1-firefox.svg
+share/help/hi/gnome-help/gs-web-browser1.svg
+share/help/hi/gnome-help/gs-web-browser2-firefox.svg
+share/help/hi/gnome-help/gs-web-browser2.svg
+share/help/hr/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/hr/gnome-help/figures/gnome-launching-applications.webm
+share/help/hr/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/hr/gnome-help/figures/gnome-task-switching.webm
+share/help/hr/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/hr/gnome-help/getting-started.page
+share/help/hr/gnome-help/gs-animation.xml
+share/help/hr/gnome-help/gs-browse-web.page
+share/help/hr/gnome-help/gs-change-date-time-timezone.page
+share/help/hr/gnome-help/gs-change-wallpaper.page
+share/help/hr/gnome-help/gs-connect-online-accounts.page
+share/help/hr/gnome-help/gs-datetime.svg
+share/help/hr/gnome-help/gs-get-online.page
+share/help/hr/gnome-help/gs-go-online1.svg
+share/help/hr/gnome-help/gs-go-online2.svg
+share/help/hr/gnome-help/gs-go-online3.svg
+share/help/hr/gnome-help/gs-goa1.svg
+share/help/hr/gnome-help/gs-goa2.svg
+share/help/hr/gnome-help/gs-goa3.svg
+share/help/hr/gnome-help/gs-goa4.svg
+share/help/hr/gnome-help/gs-goa5.svg
+share/help/hr/gnome-help/gs-launch-applications.page
+share/help/hr/gnome-help/gs-legal.xml
+share/help/hr/gnome-help/gs-respond-messages.page
+share/help/hr/gnome-help/gs-search-settings.svg
+share/help/hr/gnome-help/gs-search1.svg
+share/help/hr/gnome-help/gs-search2.svg
+share/help/hr/gnome-help/gs-switch-tasks.page
+share/help/hr/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/hr/gnome-help/gs-thumb-launching-apps.svg
+share/help/hr/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/hr/gnome-help/gs-thumb-task-switching.svg
+share/help/hr/gnome-help/gs-thumb-timezone.svg
+share/help/hr/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/hr/gnome-help/gs-use-system-search.page
+share/help/hr/gnome-help/gs-use-windows-workspaces.page
+share/help/hr/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/hr/gnome-help/gs-web-browser1-firefox.svg
+share/help/hr/gnome-help/gs-web-browser1.svg
+share/help/hr/gnome-help/gs-web-browser2-firefox.svg
+share/help/hr/gnome-help/gs-web-browser2.svg
+share/help/hu/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/hu/gnome-help/figures/gnome-launching-applications.webm
+share/help/hu/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/hu/gnome-help/figures/gnome-task-switching.webm
+share/help/hu/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/hu/gnome-help/getting-started.page
+share/help/hu/gnome-help/gs-animation.xml
+share/help/hu/gnome-help/gs-browse-web.page
+share/help/hu/gnome-help/gs-change-date-time-timezone.page
+share/help/hu/gnome-help/gs-change-wallpaper.page
+share/help/hu/gnome-help/gs-connect-online-accounts.page
+share/help/hu/gnome-help/gs-datetime.svg
+share/help/hu/gnome-help/gs-get-online.page
+share/help/hu/gnome-help/gs-go-online1.svg
+share/help/hu/gnome-help/gs-go-online2.svg
+share/help/hu/gnome-help/gs-go-online3.svg
+share/help/hu/gnome-help/gs-goa1.svg
+share/help/hu/gnome-help/gs-goa2.svg
+share/help/hu/gnome-help/gs-goa3.svg
+share/help/hu/gnome-help/gs-goa4.svg
+share/help/hu/gnome-help/gs-goa5.svg
+share/help/hu/gnome-help/gs-launch-applications.page
+share/help/hu/gnome-help/gs-legal.xml
+share/help/hu/gnome-help/gs-respond-messages.page
+share/help/hu/gnome-help/gs-search-settings.svg
+share/help/hu/gnome-help/gs-search1.svg
+share/help/hu/gnome-help/gs-search2.svg
+share/help/hu/gnome-help/gs-switch-tasks.page
+share/help/hu/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/hu/gnome-help/gs-thumb-launching-apps.svg
+share/help/hu/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/hu/gnome-help/gs-thumb-task-switching.svg
+share/help/hu/gnome-help/gs-thumb-timezone.svg
+share/help/hu/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/hu/gnome-help/gs-use-system-search.page
+share/help/hu/gnome-help/gs-use-windows-workspaces.page
+share/help/hu/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/hu/gnome-help/gs-web-browser1-firefox.svg
+share/help/hu/gnome-help/gs-web-browser1.svg
+share/help/hu/gnome-help/gs-web-browser2-firefox.svg
+share/help/hu/gnome-help/gs-web-browser2.svg
+share/help/id/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/id/gnome-help/figures/gnome-launching-applications.webm
+share/help/id/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/id/gnome-help/figures/gnome-task-switching.webm
+share/help/id/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/id/gnome-help/getting-started.page
+share/help/id/gnome-help/gs-animation.xml
+share/help/id/gnome-help/gs-browse-web.page
+share/help/id/gnome-help/gs-change-date-time-timezone.page
+share/help/id/gnome-help/gs-change-wallpaper.page
+share/help/id/gnome-help/gs-connect-online-accounts.page
+share/help/id/gnome-help/gs-datetime.svg
+share/help/id/gnome-help/gs-get-online.page
+share/help/id/gnome-help/gs-go-online1.svg
+share/help/id/gnome-help/gs-go-online2.svg
+share/help/id/gnome-help/gs-go-online3.svg
+share/help/id/gnome-help/gs-goa1.svg
+share/help/id/gnome-help/gs-goa2.svg
+share/help/id/gnome-help/gs-goa3.svg
+share/help/id/gnome-help/gs-goa4.svg
+share/help/id/gnome-help/gs-goa5.svg
+share/help/id/gnome-help/gs-launch-applications.page
+share/help/id/gnome-help/gs-legal.xml
+share/help/id/gnome-help/gs-respond-messages.page
+share/help/id/gnome-help/gs-search-settings.svg
+share/help/id/gnome-help/gs-search1.svg
+share/help/id/gnome-help/gs-search2.svg
+share/help/id/gnome-help/gs-switch-tasks.page
+share/help/id/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/id/gnome-help/gs-thumb-launching-apps.svg
+share/help/id/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/id/gnome-help/gs-thumb-task-switching.svg
+share/help/id/gnome-help/gs-thumb-timezone.svg
+share/help/id/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/id/gnome-help/gs-use-system-search.page
+share/help/id/gnome-help/gs-use-windows-workspaces.page
+share/help/id/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/id/gnome-help/gs-web-browser1-firefox.svg
+share/help/id/gnome-help/gs-web-browser1.svg
+share/help/id/gnome-help/gs-web-browser2-firefox.svg
+share/help/id/gnome-help/gs-web-browser2.svg
+share/help/it/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/it/gnome-help/figures/gnome-launching-applications.webm
+share/help/it/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/it/gnome-help/figures/gnome-task-switching.webm
+share/help/it/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/it/gnome-help/getting-started.page
+share/help/it/gnome-help/gs-animation.xml
+share/help/it/gnome-help/gs-browse-web.page
+share/help/it/gnome-help/gs-change-date-time-timezone.page
+share/help/it/gnome-help/gs-change-wallpaper.page
+share/help/it/gnome-help/gs-connect-online-accounts.page
+share/help/it/gnome-help/gs-datetime.svg
+share/help/it/gnome-help/gs-get-online.page
+share/help/it/gnome-help/gs-go-online1.svg
+share/help/it/gnome-help/gs-go-online2.svg
+share/help/it/gnome-help/gs-go-online3.svg
+share/help/it/gnome-help/gs-goa1.svg
+share/help/it/gnome-help/gs-goa2.svg
+share/help/it/gnome-help/gs-goa3.svg
+share/help/it/gnome-help/gs-goa4.svg
+share/help/it/gnome-help/gs-goa5.svg
+share/help/it/gnome-help/gs-launch-applications.page
+share/help/it/gnome-help/gs-legal.xml
+share/help/it/gnome-help/gs-respond-messages.page
+share/help/it/gnome-help/gs-search-settings.svg
+share/help/it/gnome-help/gs-search1.svg
+share/help/it/gnome-help/gs-search2.svg
+share/help/it/gnome-help/gs-switch-tasks.page
+share/help/it/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/it/gnome-help/gs-thumb-launching-apps.svg
+share/help/it/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/it/gnome-help/gs-thumb-task-switching.svg
+share/help/it/gnome-help/gs-thumb-timezone.svg
+share/help/it/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/it/gnome-help/gs-use-system-search.page
+share/help/it/gnome-help/gs-use-windows-workspaces.page
+share/help/it/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/it/gnome-help/gs-web-browser1-firefox.svg
+share/help/it/gnome-help/gs-web-browser1.svg
+share/help/it/gnome-help/gs-web-browser2-firefox.svg
+share/help/it/gnome-help/gs-web-browser2.svg
+share/help/ja/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/ja/gnome-help/figures/gnome-launching-applications.webm
+share/help/ja/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/ja/gnome-help/figures/gnome-task-switching.webm
+share/help/ja/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/ja/gnome-help/getting-started.page
+share/help/ja/gnome-help/gs-animation.xml
+share/help/ja/gnome-help/gs-browse-web.page
+share/help/ja/gnome-help/gs-change-date-time-timezone.page
+share/help/ja/gnome-help/gs-change-wallpaper.page
+share/help/ja/gnome-help/gs-connect-online-accounts.page
+share/help/ja/gnome-help/gs-datetime.svg
+share/help/ja/gnome-help/gs-get-online.page
+share/help/ja/gnome-help/gs-go-online1.svg
+share/help/ja/gnome-help/gs-go-online2.svg
+share/help/ja/gnome-help/gs-go-online3.svg
+share/help/ja/gnome-help/gs-goa1.svg
+share/help/ja/gnome-help/gs-goa2.svg
+share/help/ja/gnome-help/gs-goa3.svg
+share/help/ja/gnome-help/gs-goa4.svg
+share/help/ja/gnome-help/gs-goa5.svg
+share/help/ja/gnome-help/gs-launch-applications.page
+share/help/ja/gnome-help/gs-legal.xml
+share/help/ja/gnome-help/gs-respond-messages.page
+share/help/ja/gnome-help/gs-search-settings.svg
+share/help/ja/gnome-help/gs-search1.svg
+share/help/ja/gnome-help/gs-search2.svg
+share/help/ja/gnome-help/gs-switch-tasks.page
+share/help/ja/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/ja/gnome-help/gs-thumb-launching-apps.svg
+share/help/ja/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/ja/gnome-help/gs-thumb-task-switching.svg
+share/help/ja/gnome-help/gs-thumb-timezone.svg
+share/help/ja/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/ja/gnome-help/gs-use-system-search.page
+share/help/ja/gnome-help/gs-use-windows-workspaces.page
+share/help/ja/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/ja/gnome-help/gs-web-browser1-firefox.svg
+share/help/ja/gnome-help/gs-web-browser1.svg
+share/help/ja/gnome-help/gs-web-browser2-firefox.svg
+share/help/ja/gnome-help/gs-web-browser2.svg
+share/help/kn/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/kn/gnome-help/figures/gnome-launching-applications.webm
+share/help/kn/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/kn/gnome-help/figures/gnome-task-switching.webm
+share/help/kn/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/kn/gnome-help/getting-started.page
+share/help/kn/gnome-help/gs-animation.xml
+share/help/kn/gnome-help/gs-browse-web.page
+share/help/kn/gnome-help/gs-change-date-time-timezone.page
+share/help/kn/gnome-help/gs-change-wallpaper.page
+share/help/kn/gnome-help/gs-connect-online-accounts.page
+share/help/kn/gnome-help/gs-datetime.svg
+share/help/kn/gnome-help/gs-get-online.page
+share/help/kn/gnome-help/gs-go-online1.svg
+share/help/kn/gnome-help/gs-go-online2.svg
+share/help/kn/gnome-help/gs-go-online3.svg
+share/help/kn/gnome-help/gs-goa1.svg
+share/help/kn/gnome-help/gs-goa2.svg
+share/help/kn/gnome-help/gs-goa3.svg
+share/help/kn/gnome-help/gs-goa4.svg
+share/help/kn/gnome-help/gs-goa5.svg
+share/help/kn/gnome-help/gs-launch-applications.page
+share/help/kn/gnome-help/gs-legal.xml
+share/help/kn/gnome-help/gs-respond-messages.page
+share/help/kn/gnome-help/gs-search-settings.svg
+share/help/kn/gnome-help/gs-search1.svg
+share/help/kn/gnome-help/gs-search2.svg
+share/help/kn/gnome-help/gs-switch-tasks.page
+share/help/kn/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/kn/gnome-help/gs-thumb-launching-apps.svg
+share/help/kn/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/kn/gnome-help/gs-thumb-task-switching.svg
+share/help/kn/gnome-help/gs-thumb-timezone.svg
+share/help/kn/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/kn/gnome-help/gs-use-system-search.page
+share/help/kn/gnome-help/gs-use-windows-workspaces.page
+share/help/kn/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/kn/gnome-help/gs-web-browser1-firefox.svg
+share/help/kn/gnome-help/gs-web-browser1.svg
+share/help/kn/gnome-help/gs-web-browser2-firefox.svg
+share/help/kn/gnome-help/gs-web-browser2.svg
+share/help/ko/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/ko/gnome-help/figures/gnome-launching-applications.webm
+share/help/ko/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/ko/gnome-help/figures/gnome-task-switching.webm
+share/help/ko/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/ko/gnome-help/getting-started.page
+share/help/ko/gnome-help/gs-animation.xml
+share/help/ko/gnome-help/gs-browse-web.page
+share/help/ko/gnome-help/gs-change-date-time-timezone.page
+share/help/ko/gnome-help/gs-change-wallpaper.page
+share/help/ko/gnome-help/gs-connect-online-accounts.page
+share/help/ko/gnome-help/gs-datetime.svg
+share/help/ko/gnome-help/gs-get-online.page
+share/help/ko/gnome-help/gs-go-online1.svg
+share/help/ko/gnome-help/gs-go-online2.svg
+share/help/ko/gnome-help/gs-go-online3.svg
+share/help/ko/gnome-help/gs-goa1.svg
+share/help/ko/gnome-help/gs-goa2.svg
+share/help/ko/gnome-help/gs-goa3.svg
+share/help/ko/gnome-help/gs-goa4.svg
+share/help/ko/gnome-help/gs-goa5.svg
+share/help/ko/gnome-help/gs-launch-applications.page
+share/help/ko/gnome-help/gs-legal.xml
+share/help/ko/gnome-help/gs-respond-messages.page
+share/help/ko/gnome-help/gs-search-settings.svg
+share/help/ko/gnome-help/gs-search1.svg
+share/help/ko/gnome-help/gs-search2.svg
+share/help/ko/gnome-help/gs-switch-tasks.page
+share/help/ko/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/ko/gnome-help/gs-thumb-launching-apps.svg
+share/help/ko/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/ko/gnome-help/gs-thumb-task-switching.svg
+share/help/ko/gnome-help/gs-thumb-timezone.svg
+share/help/ko/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/ko/gnome-help/gs-use-system-search.page
+share/help/ko/gnome-help/gs-use-windows-workspaces.page
+share/help/ko/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/ko/gnome-help/gs-web-browser1-firefox.svg
+share/help/ko/gnome-help/gs-web-browser1.svg
+share/help/ko/gnome-help/gs-web-browser2-firefox.svg
+share/help/ko/gnome-help/gs-web-browser2.svg
+share/help/lt/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/lt/gnome-help/figures/gnome-launching-applications.webm
+share/help/lt/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/lt/gnome-help/figures/gnome-task-switching.webm
+share/help/lt/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/lt/gnome-help/getting-started.page
+share/help/lt/gnome-help/gs-animation.xml
+share/help/lt/gnome-help/gs-browse-web.page
+share/help/lt/gnome-help/gs-change-date-time-timezone.page
+share/help/lt/gnome-help/gs-change-wallpaper.page
+share/help/lt/gnome-help/gs-connect-online-accounts.page
+share/help/lt/gnome-help/gs-datetime.svg
+share/help/lt/gnome-help/gs-get-online.page
+share/help/lt/gnome-help/gs-go-online1.svg
+share/help/lt/gnome-help/gs-go-online2.svg
+share/help/lt/gnome-help/gs-go-online3.svg
+share/help/lt/gnome-help/gs-goa1.svg
+share/help/lt/gnome-help/gs-goa2.svg
+share/help/lt/gnome-help/gs-goa3.svg
+share/help/lt/gnome-help/gs-goa4.svg
+share/help/lt/gnome-help/gs-goa5.svg
+share/help/lt/gnome-help/gs-launch-applications.page
+share/help/lt/gnome-help/gs-legal.xml
+share/help/lt/gnome-help/gs-respond-messages.page
+share/help/lt/gnome-help/gs-search-settings.svg
+share/help/lt/gnome-help/gs-search1.svg
+share/help/lt/gnome-help/gs-search2.svg
+share/help/lt/gnome-help/gs-switch-tasks.page
+share/help/lt/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/lt/gnome-help/gs-thumb-launching-apps.svg
+share/help/lt/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/lt/gnome-help/gs-thumb-task-switching.svg
+share/help/lt/gnome-help/gs-thumb-timezone.svg
+share/help/lt/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/lt/gnome-help/gs-use-system-search.page
+share/help/lt/gnome-help/gs-use-windows-workspaces.page
+share/help/lt/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/lt/gnome-help/gs-web-browser1-firefox.svg
+share/help/lt/gnome-help/gs-web-browser1.svg
+share/help/lt/gnome-help/gs-web-browser2-firefox.svg
+share/help/lt/gnome-help/gs-web-browser2.svg
+share/help/lv/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/lv/gnome-help/figures/gnome-launching-applications.webm
+share/help/lv/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/lv/gnome-help/figures/gnome-task-switching.webm
+share/help/lv/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/lv/gnome-help/getting-started.page
+share/help/lv/gnome-help/gs-animation.xml
+share/help/lv/gnome-help/gs-browse-web.page
+share/help/lv/gnome-help/gs-change-date-time-timezone.page
+share/help/lv/gnome-help/gs-change-wallpaper.page
+share/help/lv/gnome-help/gs-connect-online-accounts.page
+share/help/lv/gnome-help/gs-datetime.svg
+share/help/lv/gnome-help/gs-get-online.page
+share/help/lv/gnome-help/gs-go-online1.svg
+share/help/lv/gnome-help/gs-go-online2.svg
+share/help/lv/gnome-help/gs-go-online3.svg
+share/help/lv/gnome-help/gs-goa1.svg
+share/help/lv/gnome-help/gs-goa2.svg
+share/help/lv/gnome-help/gs-goa3.svg
+share/help/lv/gnome-help/gs-goa4.svg
+share/help/lv/gnome-help/gs-goa5.svg
+share/help/lv/gnome-help/gs-launch-applications.page
+share/help/lv/gnome-help/gs-legal.xml
+share/help/lv/gnome-help/gs-respond-messages.page
+share/help/lv/gnome-help/gs-search-settings.svg
+share/help/lv/gnome-help/gs-search1.svg
+share/help/lv/gnome-help/gs-search2.svg
+share/help/lv/gnome-help/gs-switch-tasks.page
+share/help/lv/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/lv/gnome-help/gs-thumb-launching-apps.svg
+share/help/lv/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/lv/gnome-help/gs-thumb-task-switching.svg
+share/help/lv/gnome-help/gs-thumb-timezone.svg
+share/help/lv/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/lv/gnome-help/gs-use-system-search.page
+share/help/lv/gnome-help/gs-use-windows-workspaces.page
+share/help/lv/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/lv/gnome-help/gs-web-browser1-firefox.svg
+share/help/lv/gnome-help/gs-web-browser1.svg
+share/help/lv/gnome-help/gs-web-browser2-firefox.svg
+share/help/lv/gnome-help/gs-web-browser2.svg
+share/help/mr/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/mr/gnome-help/figures/gnome-launching-applications.webm
+share/help/mr/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/mr/gnome-help/figures/gnome-task-switching.webm
+share/help/mr/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/mr/gnome-help/getting-started.page
+share/help/mr/gnome-help/gs-animation.xml
+share/help/mr/gnome-help/gs-browse-web.page
+share/help/mr/gnome-help/gs-change-date-time-timezone.page
+share/help/mr/gnome-help/gs-change-wallpaper.page
+share/help/mr/gnome-help/gs-connect-online-accounts.page
+share/help/mr/gnome-help/gs-datetime.svg
+share/help/mr/gnome-help/gs-get-online.page
+share/help/mr/gnome-help/gs-go-online1.svg
+share/help/mr/gnome-help/gs-go-online2.svg
+share/help/mr/gnome-help/gs-go-online3.svg
+share/help/mr/gnome-help/gs-goa1.svg
+share/help/mr/gnome-help/gs-goa2.svg
+share/help/mr/gnome-help/gs-goa3.svg
+share/help/mr/gnome-help/gs-goa4.svg
+share/help/mr/gnome-help/gs-goa5.svg
+share/help/mr/gnome-help/gs-launch-applications.page
+share/help/mr/gnome-help/gs-legal.xml
+share/help/mr/gnome-help/gs-respond-messages.page
+share/help/mr/gnome-help/gs-search-settings.svg
+share/help/mr/gnome-help/gs-search1.svg
+share/help/mr/gnome-help/gs-search2.svg
+share/help/mr/gnome-help/gs-switch-tasks.page
+share/help/mr/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/mr/gnome-help/gs-thumb-launching-apps.svg
+share/help/mr/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/mr/gnome-help/gs-thumb-task-switching.svg
+share/help/mr/gnome-help/gs-thumb-timezone.svg
+share/help/mr/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/mr/gnome-help/gs-use-system-search.page
+share/help/mr/gnome-help/gs-use-windows-workspaces.page
+share/help/mr/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/mr/gnome-help/gs-web-browser1-firefox.svg
+share/help/mr/gnome-help/gs-web-browser1.svg
+share/help/mr/gnome-help/gs-web-browser2-firefox.svg
+share/help/mr/gnome-help/gs-web-browser2.svg
+share/help/nl/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/nl/gnome-help/figures/gnome-launching-applications.webm
+share/help/nl/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/nl/gnome-help/figures/gnome-task-switching.webm
+share/help/nl/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/nl/gnome-help/getting-started.page
+share/help/nl/gnome-help/gs-animation.xml
+share/help/nl/gnome-help/gs-browse-web.page
+share/help/nl/gnome-help/gs-change-date-time-timezone.page
+share/help/nl/gnome-help/gs-change-wallpaper.page
+share/help/nl/gnome-help/gs-connect-online-accounts.page
+share/help/nl/gnome-help/gs-datetime.svg
+share/help/nl/gnome-help/gs-get-online.page
+share/help/nl/gnome-help/gs-go-online1.svg
+share/help/nl/gnome-help/gs-go-online2.svg
+share/help/nl/gnome-help/gs-go-online3.svg
+share/help/nl/gnome-help/gs-goa1.svg
+share/help/nl/gnome-help/gs-goa2.svg
+share/help/nl/gnome-help/gs-goa3.svg
+share/help/nl/gnome-help/gs-goa4.svg
+share/help/nl/gnome-help/gs-goa5.svg
+share/help/nl/gnome-help/gs-launch-applications.page
+share/help/nl/gnome-help/gs-legal.xml
+share/help/nl/gnome-help/gs-respond-messages.page
+share/help/nl/gnome-help/gs-search-settings.svg
+share/help/nl/gnome-help/gs-search1.svg
+share/help/nl/gnome-help/gs-search2.svg
+share/help/nl/gnome-help/gs-switch-tasks.page
+share/help/nl/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/nl/gnome-help/gs-thumb-launching-apps.svg
+share/help/nl/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/nl/gnome-help/gs-thumb-task-switching.svg
+share/help/nl/gnome-help/gs-thumb-timezone.svg
+share/help/nl/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/nl/gnome-help/gs-use-system-search.page
+share/help/nl/gnome-help/gs-use-windows-workspaces.page
+share/help/nl/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/nl/gnome-help/gs-web-browser1-firefox.svg
+share/help/nl/gnome-help/gs-web-browser1.svg
+share/help/nl/gnome-help/gs-web-browser2-firefox.svg
+share/help/nl/gnome-help/gs-web-browser2.svg
+share/help/pa/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/pa/gnome-help/figures/gnome-launching-applications.webm
+share/help/pa/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/pa/gnome-help/figures/gnome-task-switching.webm
+share/help/pa/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/pa/gnome-help/getting-started.page
+share/help/pa/gnome-help/gs-animation.xml
+share/help/pa/gnome-help/gs-browse-web.page
+share/help/pa/gnome-help/gs-change-date-time-timezone.page
+share/help/pa/gnome-help/gs-change-wallpaper.page
+share/help/pa/gnome-help/gs-connect-online-accounts.page
+share/help/pa/gnome-help/gs-datetime.svg
+share/help/pa/gnome-help/gs-get-online.page
+share/help/pa/gnome-help/gs-go-online1.svg
+share/help/pa/gnome-help/gs-go-online2.svg
+share/help/pa/gnome-help/gs-go-online3.svg
+share/help/pa/gnome-help/gs-goa1.svg
+share/help/pa/gnome-help/gs-goa2.svg
+share/help/pa/gnome-help/gs-goa3.svg
+share/help/pa/gnome-help/gs-goa4.svg
+share/help/pa/gnome-help/gs-goa5.svg
+share/help/pa/gnome-help/gs-launch-applications.page
+share/help/pa/gnome-help/gs-legal.xml
+share/help/pa/gnome-help/gs-respond-messages.page
+share/help/pa/gnome-help/gs-search-settings.svg
+share/help/pa/gnome-help/gs-search1.svg
+share/help/pa/gnome-help/gs-search2.svg
+share/help/pa/gnome-help/gs-switch-tasks.page
+share/help/pa/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/pa/gnome-help/gs-thumb-launching-apps.svg
+share/help/pa/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/pa/gnome-help/gs-thumb-task-switching.svg
+share/help/pa/gnome-help/gs-thumb-timezone.svg
+share/help/pa/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/pa/gnome-help/gs-use-system-search.page
+share/help/pa/gnome-help/gs-use-windows-workspaces.page
+share/help/pa/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/pa/gnome-help/gs-web-browser1-firefox.svg
+share/help/pa/gnome-help/gs-web-browser1.svg
+share/help/pa/gnome-help/gs-web-browser2-firefox.svg
+share/help/pa/gnome-help/gs-web-browser2.svg
+share/help/pl/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/pl/gnome-help/figures/gnome-launching-applications.webm
+share/help/pl/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/pl/gnome-help/figures/gnome-task-switching.webm
+share/help/pl/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/pl/gnome-help/getting-started.page
+share/help/pl/gnome-help/gs-animation.xml
+share/help/pl/gnome-help/gs-browse-web.page
+share/help/pl/gnome-help/gs-change-date-time-timezone.page
+share/help/pl/gnome-help/gs-change-wallpaper.page
+share/help/pl/gnome-help/gs-connect-online-accounts.page
+share/help/pl/gnome-help/gs-datetime.svg
+share/help/pl/gnome-help/gs-get-online.page
+share/help/pl/gnome-help/gs-go-online1.svg
+share/help/pl/gnome-help/gs-go-online2.svg
+share/help/pl/gnome-help/gs-go-online3.svg
+share/help/pl/gnome-help/gs-goa1.svg
+share/help/pl/gnome-help/gs-goa2.svg
+share/help/pl/gnome-help/gs-goa3.svg
+share/help/pl/gnome-help/gs-goa4.svg
+share/help/pl/gnome-help/gs-goa5.svg
+share/help/pl/gnome-help/gs-launch-applications.page
+share/help/pl/gnome-help/gs-legal.xml
+share/help/pl/gnome-help/gs-respond-messages.page
+share/help/pl/gnome-help/gs-search-settings.svg
+share/help/pl/gnome-help/gs-search1.svg
+share/help/pl/gnome-help/gs-search2.svg
+share/help/pl/gnome-help/gs-switch-tasks.page
+share/help/pl/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/pl/gnome-help/gs-thumb-launching-apps.svg
+share/help/pl/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/pl/gnome-help/gs-thumb-task-switching.svg
+share/help/pl/gnome-help/gs-thumb-timezone.svg
+share/help/pl/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/pl/gnome-help/gs-use-system-search.page
+share/help/pl/gnome-help/gs-use-windows-workspaces.page
+share/help/pl/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/pl/gnome-help/gs-web-browser1-firefox.svg
+share/help/pl/gnome-help/gs-web-browser1.svg
+share/help/pl/gnome-help/gs-web-browser2-firefox.svg
+share/help/pl/gnome-help/gs-web-browser2.svg
+share/help/pt/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/pt/gnome-help/figures/gnome-launching-applications.webm
+share/help/pt/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/pt/gnome-help/figures/gnome-task-switching.webm
+share/help/pt/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/pt/gnome-help/getting-started.page
+share/help/pt/gnome-help/gs-animation.xml
+share/help/pt/gnome-help/gs-browse-web.page
+share/help/pt/gnome-help/gs-change-date-time-timezone.page
+share/help/pt/gnome-help/gs-change-wallpaper.page
+share/help/pt/gnome-help/gs-connect-online-accounts.page
+share/help/pt/gnome-help/gs-datetime.svg
+share/help/pt/gnome-help/gs-get-online.page
+share/help/pt/gnome-help/gs-go-online1.svg
+share/help/pt/gnome-help/gs-go-online2.svg
+share/help/pt/gnome-help/gs-go-online3.svg
+share/help/pt/gnome-help/gs-goa1.svg
+share/help/pt/gnome-help/gs-goa2.svg
+share/help/pt/gnome-help/gs-goa3.svg
+share/help/pt/gnome-help/gs-goa4.svg
+share/help/pt/gnome-help/gs-goa5.svg
+share/help/pt/gnome-help/gs-launch-applications.page
+share/help/pt/gnome-help/gs-legal.xml
+share/help/pt/gnome-help/gs-respond-messages.page
+share/help/pt/gnome-help/gs-search-settings.svg
+share/help/pt/gnome-help/gs-search1.svg
+share/help/pt/gnome-help/gs-search2.svg
+share/help/pt/gnome-help/gs-switch-tasks.page
+share/help/pt/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/pt/gnome-help/gs-thumb-launching-apps.svg
+share/help/pt/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/pt/gnome-help/gs-thumb-task-switching.svg
+share/help/pt/gnome-help/gs-thumb-timezone.svg
+share/help/pt/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/pt/gnome-help/gs-use-system-search.page
+share/help/pt/gnome-help/gs-use-windows-workspaces.page
+share/help/pt/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/pt/gnome-help/gs-web-browser1-firefox.svg
+share/help/pt/gnome-help/gs-web-browser1.svg
+share/help/pt/gnome-help/gs-web-browser2-firefox.svg
+share/help/pt/gnome-help/gs-web-browser2.svg
+share/help/pt_BR/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/pt_BR/gnome-help/figures/gnome-launching-applications.webm
+share/help/pt_BR/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/pt_BR/gnome-help/figures/gnome-task-switching.webm
+share/help/pt_BR/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/pt_BR/gnome-help/getting-started.page
+share/help/pt_BR/gnome-help/gs-animation.xml
+share/help/pt_BR/gnome-help/gs-browse-web.page
+share/help/pt_BR/gnome-help/gs-change-date-time-timezone.page
+share/help/pt_BR/gnome-help/gs-change-wallpaper.page
+share/help/pt_BR/gnome-help/gs-connect-online-accounts.page
+share/help/pt_BR/gnome-help/gs-datetime.svg
+share/help/pt_BR/gnome-help/gs-get-online.page
+share/help/pt_BR/gnome-help/gs-go-online1.svg
+share/help/pt_BR/gnome-help/gs-go-online2.svg
+share/help/pt_BR/gnome-help/gs-go-online3.svg
+share/help/pt_BR/gnome-help/gs-goa1.svg
+share/help/pt_BR/gnome-help/gs-goa2.svg
+share/help/pt_BR/gnome-help/gs-goa3.svg
+share/help/pt_BR/gnome-help/gs-goa4.svg
+share/help/pt_BR/gnome-help/gs-goa5.svg
+share/help/pt_BR/gnome-help/gs-launch-applications.page
+share/help/pt_BR/gnome-help/gs-legal.xml
+share/help/pt_BR/gnome-help/gs-respond-messages.page
+share/help/pt_BR/gnome-help/gs-search-settings.svg
+share/help/pt_BR/gnome-help/gs-search1.svg
+share/help/pt_BR/gnome-help/gs-search2.svg
+share/help/pt_BR/gnome-help/gs-switch-tasks.page
+share/help/pt_BR/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/pt_BR/gnome-help/gs-thumb-launching-apps.svg
+share/help/pt_BR/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/pt_BR/gnome-help/gs-thumb-task-switching.svg
+share/help/pt_BR/gnome-help/gs-thumb-timezone.svg
+share/help/pt_BR/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/pt_BR/gnome-help/gs-use-system-search.page
+share/help/pt_BR/gnome-help/gs-use-windows-workspaces.page
+share/help/pt_BR/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/pt_BR/gnome-help/gs-web-browser1-firefox.svg
+share/help/pt_BR/gnome-help/gs-web-browser1.svg
+share/help/pt_BR/gnome-help/gs-web-browser2-firefox.svg
+share/help/pt_BR/gnome-help/gs-web-browser2.svg
+share/help/ro/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/ro/gnome-help/figures/gnome-launching-applications.webm
+share/help/ro/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/ro/gnome-help/figures/gnome-task-switching.webm
+share/help/ro/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/ro/gnome-help/getting-started.page
+share/help/ro/gnome-help/gs-animation.xml
+share/help/ro/gnome-help/gs-browse-web.page
+share/help/ro/gnome-help/gs-change-date-time-timezone.page
+share/help/ro/gnome-help/gs-change-wallpaper.page
+share/help/ro/gnome-help/gs-connect-online-accounts.page
+share/help/ro/gnome-help/gs-datetime.svg
+share/help/ro/gnome-help/gs-get-online.page
+share/help/ro/gnome-help/gs-go-online1.svg
+share/help/ro/gnome-help/gs-go-online2.svg
+share/help/ro/gnome-help/gs-go-online3.svg
+share/help/ro/gnome-help/gs-goa1.svg
+share/help/ro/gnome-help/gs-goa2.svg
+share/help/ro/gnome-help/gs-goa3.svg
+share/help/ro/gnome-help/gs-goa4.svg
+share/help/ro/gnome-help/gs-goa5.svg
+share/help/ro/gnome-help/gs-launch-applications.page
+share/help/ro/gnome-help/gs-legal.xml
+share/help/ro/gnome-help/gs-respond-messages.page
+share/help/ro/gnome-help/gs-search-settings.svg
+share/help/ro/gnome-help/gs-search1.svg
+share/help/ro/gnome-help/gs-search2.svg
+share/help/ro/gnome-help/gs-switch-tasks.page
+share/help/ro/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/ro/gnome-help/gs-thumb-launching-apps.svg
+share/help/ro/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/ro/gnome-help/gs-thumb-task-switching.svg
+share/help/ro/gnome-help/gs-thumb-timezone.svg
+share/help/ro/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/ro/gnome-help/gs-use-system-search.page
+share/help/ro/gnome-help/gs-use-windows-workspaces.page
+share/help/ro/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/ro/gnome-help/gs-web-browser1-firefox.svg
+share/help/ro/gnome-help/gs-web-browser1.svg
+share/help/ro/gnome-help/gs-web-browser2-firefox.svg
+share/help/ro/gnome-help/gs-web-browser2.svg
+share/help/ru/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/ru/gnome-help/figures/gnome-launching-applications.webm
+share/help/ru/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/ru/gnome-help/figures/gnome-task-switching.webm
+share/help/ru/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/ru/gnome-help/getting-started.page
+share/help/ru/gnome-help/gs-animation.xml
+share/help/ru/gnome-help/gs-browse-web.page
+share/help/ru/gnome-help/gs-change-date-time-timezone.page
+share/help/ru/gnome-help/gs-change-wallpaper.page
+share/help/ru/gnome-help/gs-connect-online-accounts.page
+share/help/ru/gnome-help/gs-datetime.svg
+share/help/ru/gnome-help/gs-get-online.page
+share/help/ru/gnome-help/gs-go-online1.svg
+share/help/ru/gnome-help/gs-go-online2.svg
+share/help/ru/gnome-help/gs-go-online3.svg
+share/help/ru/gnome-help/gs-goa1.svg
+share/help/ru/gnome-help/gs-goa2.svg
+share/help/ru/gnome-help/gs-goa3.svg
+share/help/ru/gnome-help/gs-goa4.svg
+share/help/ru/gnome-help/gs-goa5.svg
+share/help/ru/gnome-help/gs-launch-applications.page
+share/help/ru/gnome-help/gs-legal.xml
+share/help/ru/gnome-help/gs-respond-messages.page
+share/help/ru/gnome-help/gs-search-settings.svg
+share/help/ru/gnome-help/gs-search1.svg
+share/help/ru/gnome-help/gs-search2.svg
+share/help/ru/gnome-help/gs-switch-tasks.page
+share/help/ru/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/ru/gnome-help/gs-thumb-launching-apps.svg
+share/help/ru/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/ru/gnome-help/gs-thumb-task-switching.svg
+share/help/ru/gnome-help/gs-thumb-timezone.svg
+share/help/ru/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/ru/gnome-help/gs-use-system-search.page
+share/help/ru/gnome-help/gs-use-windows-workspaces.page
+share/help/ru/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/ru/gnome-help/gs-web-browser1-firefox.svg
+share/help/ru/gnome-help/gs-web-browser1.svg
+share/help/ru/gnome-help/gs-web-browser2-firefox.svg
+share/help/ru/gnome-help/gs-web-browser2.svg
+share/help/sk/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/sk/gnome-help/figures/gnome-launching-applications.webm
+share/help/sk/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/sk/gnome-help/figures/gnome-task-switching.webm
+share/help/sk/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/sk/gnome-help/getting-started.page
+share/help/sk/gnome-help/gs-animation.xml
+share/help/sk/gnome-help/gs-browse-web.page
+share/help/sk/gnome-help/gs-change-date-time-timezone.page
+share/help/sk/gnome-help/gs-change-wallpaper.page
+share/help/sk/gnome-help/gs-connect-online-accounts.page
+share/help/sk/gnome-help/gs-datetime.svg
+share/help/sk/gnome-help/gs-get-online.page
+share/help/sk/gnome-help/gs-go-online1.svg
+share/help/sk/gnome-help/gs-go-online2.svg
+share/help/sk/gnome-help/gs-go-online3.svg
+share/help/sk/gnome-help/gs-goa1.svg
+share/help/sk/gnome-help/gs-goa2.svg
+share/help/sk/gnome-help/gs-goa3.svg
+share/help/sk/gnome-help/gs-goa4.svg
+share/help/sk/gnome-help/gs-goa5.svg
+share/help/sk/gnome-help/gs-launch-applications.page
+share/help/sk/gnome-help/gs-legal.xml
+share/help/sk/gnome-help/gs-respond-messages.page
+share/help/sk/gnome-help/gs-search-settings.svg
+share/help/sk/gnome-help/gs-search1.svg
+share/help/sk/gnome-help/gs-search2.svg
+share/help/sk/gnome-help/gs-switch-tasks.page
+share/help/sk/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/sk/gnome-help/gs-thumb-launching-apps.svg
+share/help/sk/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/sk/gnome-help/gs-thumb-task-switching.svg
+share/help/sk/gnome-help/gs-thumb-timezone.svg
+share/help/sk/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/sk/gnome-help/gs-use-system-search.page
+share/help/sk/gnome-help/gs-use-windows-workspaces.page
+share/help/sk/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/sk/gnome-help/gs-web-browser1-firefox.svg
+share/help/sk/gnome-help/gs-web-browser1.svg
+share/help/sk/gnome-help/gs-web-browser2-firefox.svg
+share/help/sk/gnome-help/gs-web-browser2.svg
+share/help/sr/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/sr/gnome-help/figures/gnome-launching-applications.webm
+share/help/sr/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/sr/gnome-help/figures/gnome-task-switching.webm
+share/help/sr/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/sr/gnome-help/getting-started.page
+share/help/sr/gnome-help/gs-animation.xml
+share/help/sr/gnome-help/gs-browse-web.page
+share/help/sr/gnome-help/gs-change-date-time-timezone.page
+share/help/sr/gnome-help/gs-change-wallpaper.page
+share/help/sr/gnome-help/gs-connect-online-accounts.page
+share/help/sr/gnome-help/gs-datetime.svg
+share/help/sr/gnome-help/gs-get-online.page
+share/help/sr/gnome-help/gs-go-online1.svg
+share/help/sr/gnome-help/gs-go-online2.svg
+share/help/sr/gnome-help/gs-go-online3.svg
+share/help/sr/gnome-help/gs-goa1.svg
+share/help/sr/gnome-help/gs-goa2.svg
+share/help/sr/gnome-help/gs-goa3.svg
+share/help/sr/gnome-help/gs-goa4.svg
+share/help/sr/gnome-help/gs-goa5.svg
+share/help/sr/gnome-help/gs-launch-applications.page
+share/help/sr/gnome-help/gs-legal.xml
+share/help/sr/gnome-help/gs-respond-messages.page
+share/help/sr/gnome-help/gs-search-settings.svg
+share/help/sr/gnome-help/gs-search1.svg
+share/help/sr/gnome-help/gs-search2.svg
+share/help/sr/gnome-help/gs-switch-tasks.page
+share/help/sr/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/sr/gnome-help/gs-thumb-launching-apps.svg
+share/help/sr/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/sr/gnome-help/gs-thumb-task-switching.svg
+share/help/sr/gnome-help/gs-thumb-timezone.svg
+share/help/sr/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/sr/gnome-help/gs-use-system-search.page
+share/help/sr/gnome-help/gs-use-windows-workspaces.page
+share/help/sr/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/sr/gnome-help/gs-web-browser1-firefox.svg
+share/help/sr/gnome-help/gs-web-browser1.svg
+share/help/sr/gnome-help/gs-web-browser2-firefox.svg
+share/help/sr/gnome-help/gs-web-browser2.svg
+share/help/sr@latin/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/sr@latin/gnome-help/figures/gnome-launching-applications.webm
+share/help/sr@latin/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/sr@latin/gnome-help/figures/gnome-task-switching.webm
+share/help/sr@latin/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/sr@latin/gnome-help/getting-started.page
+share/help/sr@latin/gnome-help/gs-animation.xml
+share/help/sr@latin/gnome-help/gs-browse-web.page
+share/help/sr@latin/gnome-help/gs-change-date-time-timezone.page
+share/help/sr@latin/gnome-help/gs-change-wallpaper.page
+share/help/sr@latin/gnome-help/gs-connect-online-accounts.page
+share/help/sr@latin/gnome-help/gs-datetime.svg
+share/help/sr@latin/gnome-help/gs-get-online.page
+share/help/sr@latin/gnome-help/gs-go-online1.svg
+share/help/sr@latin/gnome-help/gs-go-online2.svg
+share/help/sr@latin/gnome-help/gs-go-online3.svg
+share/help/sr@latin/gnome-help/gs-goa1.svg
+share/help/sr@latin/gnome-help/gs-goa2.svg
+share/help/sr@latin/gnome-help/gs-goa3.svg
+share/help/sr@latin/gnome-help/gs-goa4.svg
+share/help/sr@latin/gnome-help/gs-goa5.svg
+share/help/sr@latin/gnome-help/gs-launch-applications.page
+share/help/sr@latin/gnome-help/gs-legal.xml
+share/help/sr@latin/gnome-help/gs-respond-messages.page
+share/help/sr@latin/gnome-help/gs-search-settings.svg
+share/help/sr@latin/gnome-help/gs-search1.svg
+share/help/sr@latin/gnome-help/gs-search2.svg
+share/help/sr@latin/gnome-help/gs-switch-tasks.page
+share/help/sr@latin/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/sr@latin/gnome-help/gs-thumb-launching-apps.svg
+share/help/sr@latin/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/sr@latin/gnome-help/gs-thumb-task-switching.svg
+share/help/sr@latin/gnome-help/gs-thumb-timezone.svg
+share/help/sr@latin/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/sr@latin/gnome-help/gs-use-system-search.page
+share/help/sr@latin/gnome-help/gs-use-windows-workspaces.page
+share/help/sr@latin/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/sr@latin/gnome-help/gs-web-browser1-firefox.svg
+share/help/sr@latin/gnome-help/gs-web-browser1.svg
+share/help/sr@latin/gnome-help/gs-web-browser2-firefox.svg
+share/help/sr@latin/gnome-help/gs-web-browser2.svg
+share/help/sv/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/sv/gnome-help/figures/gnome-launching-applications.webm
+share/help/sv/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/sv/gnome-help/figures/gnome-task-switching.webm
+share/help/sv/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/sv/gnome-help/getting-started.page
+share/help/sv/gnome-help/gs-animation.xml
+share/help/sv/gnome-help/gs-browse-web.page
+share/help/sv/gnome-help/gs-change-date-time-timezone.page
+share/help/sv/gnome-help/gs-change-wallpaper.page
+share/help/sv/gnome-help/gs-connect-online-accounts.page
+share/help/sv/gnome-help/gs-datetime.svg
+share/help/sv/gnome-help/gs-get-online.page
+share/help/sv/gnome-help/gs-go-online1.svg
+share/help/sv/gnome-help/gs-go-online2.svg
+share/help/sv/gnome-help/gs-go-online3.svg
+share/help/sv/gnome-help/gs-goa1.svg
+share/help/sv/gnome-help/gs-goa2.svg
+share/help/sv/gnome-help/gs-goa3.svg
+share/help/sv/gnome-help/gs-goa4.svg
+share/help/sv/gnome-help/gs-goa5.svg
+share/help/sv/gnome-help/gs-launch-applications.page
+share/help/sv/gnome-help/gs-legal.xml
+share/help/sv/gnome-help/gs-respond-messages.page
+share/help/sv/gnome-help/gs-search-settings.svg
+share/help/sv/gnome-help/gs-search1.svg
+share/help/sv/gnome-help/gs-search2.svg
+share/help/sv/gnome-help/gs-switch-tasks.page
+share/help/sv/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/sv/gnome-help/gs-thumb-launching-apps.svg
+share/help/sv/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/sv/gnome-help/gs-thumb-task-switching.svg
+share/help/sv/gnome-help/gs-thumb-timezone.svg
+share/help/sv/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/sv/gnome-help/gs-use-system-search.page
+share/help/sv/gnome-help/gs-use-windows-workspaces.page
+share/help/sv/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/sv/gnome-help/gs-web-browser1-firefox.svg
+share/help/sv/gnome-help/gs-web-browser1.svg
+share/help/sv/gnome-help/gs-web-browser2-firefox.svg
+share/help/sv/gnome-help/gs-web-browser2.svg
+share/help/ta/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/ta/gnome-help/figures/gnome-launching-applications.webm
+share/help/ta/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/ta/gnome-help/figures/gnome-task-switching.webm
+share/help/ta/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/ta/gnome-help/getting-started.page
+share/help/ta/gnome-help/gs-animation.xml
+share/help/ta/gnome-help/gs-browse-web.page
+share/help/ta/gnome-help/gs-change-date-time-timezone.page
+share/help/ta/gnome-help/gs-change-wallpaper.page
+share/help/ta/gnome-help/gs-connect-online-accounts.page
+share/help/ta/gnome-help/gs-datetime.svg
+share/help/ta/gnome-help/gs-get-online.page
+share/help/ta/gnome-help/gs-go-online1.svg
+share/help/ta/gnome-help/gs-go-online2.svg
+share/help/ta/gnome-help/gs-go-online3.svg
+share/help/ta/gnome-help/gs-goa1.svg
+share/help/ta/gnome-help/gs-goa2.svg
+share/help/ta/gnome-help/gs-goa3.svg
+share/help/ta/gnome-help/gs-goa4.svg
+share/help/ta/gnome-help/gs-goa5.svg
+share/help/ta/gnome-help/gs-launch-applications.page
+share/help/ta/gnome-help/gs-legal.xml
+share/help/ta/gnome-help/gs-respond-messages.page
+share/help/ta/gnome-help/gs-search-settings.svg
+share/help/ta/gnome-help/gs-search1.svg
+share/help/ta/gnome-help/gs-search2.svg
+share/help/ta/gnome-help/gs-switch-tasks.page
+share/help/ta/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/ta/gnome-help/gs-thumb-launching-apps.svg
+share/help/ta/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/ta/gnome-help/gs-thumb-task-switching.svg
+share/help/ta/gnome-help/gs-thumb-timezone.svg
+share/help/ta/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/ta/gnome-help/gs-use-system-search.page
+share/help/ta/gnome-help/gs-use-windows-workspaces.page
+share/help/ta/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/ta/gnome-help/gs-web-browser1-firefox.svg
+share/help/ta/gnome-help/gs-web-browser1.svg
+share/help/ta/gnome-help/gs-web-browser2-firefox.svg
+share/help/ta/gnome-help/gs-web-browser2.svg
+share/help/te/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/te/gnome-help/figures/gnome-launching-applications.webm
+share/help/te/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/te/gnome-help/figures/gnome-task-switching.webm
+share/help/te/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/te/gnome-help/getting-started.page
+share/help/te/gnome-help/gs-animation.xml
+share/help/te/gnome-help/gs-browse-web.page
+share/help/te/gnome-help/gs-change-date-time-timezone.page
+share/help/te/gnome-help/gs-change-wallpaper.page
+share/help/te/gnome-help/gs-connect-online-accounts.page
+share/help/te/gnome-help/gs-datetime.svg
+share/help/te/gnome-help/gs-get-online.page
+share/help/te/gnome-help/gs-go-online1.svg
+share/help/te/gnome-help/gs-go-online2.svg
+share/help/te/gnome-help/gs-go-online3.svg
+share/help/te/gnome-help/gs-goa1.svg
+share/help/te/gnome-help/gs-goa2.svg
+share/help/te/gnome-help/gs-goa3.svg
+share/help/te/gnome-help/gs-goa4.svg
+share/help/te/gnome-help/gs-goa5.svg
+share/help/te/gnome-help/gs-launch-applications.page
+share/help/te/gnome-help/gs-legal.xml
+share/help/te/gnome-help/gs-respond-messages.page
+share/help/te/gnome-help/gs-search-settings.svg
+share/help/te/gnome-help/gs-search1.svg
+share/help/te/gnome-help/gs-search2.svg
+share/help/te/gnome-help/gs-switch-tasks.page
+share/help/te/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/te/gnome-help/gs-thumb-launching-apps.svg
+share/help/te/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/te/gnome-help/gs-thumb-task-switching.svg
+share/help/te/gnome-help/gs-thumb-timezone.svg
+share/help/te/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/te/gnome-help/gs-use-system-search.page
+share/help/te/gnome-help/gs-use-windows-workspaces.page
+share/help/te/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/te/gnome-help/gs-web-browser1-firefox.svg
+share/help/te/gnome-help/gs-web-browser1.svg
+share/help/te/gnome-help/gs-web-browser2-firefox.svg
+share/help/te/gnome-help/gs-web-browser2.svg
+share/help/zh_HK/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/zh_HK/gnome-help/figures/gnome-launching-applications.webm
+share/help/zh_HK/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/zh_HK/gnome-help/figures/gnome-task-switching.webm
+share/help/zh_HK/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/zh_HK/gnome-help/getting-started.page
+share/help/zh_HK/gnome-help/gs-animation.xml
+share/help/zh_HK/gnome-help/gs-browse-web.page
+share/help/zh_HK/gnome-help/gs-change-date-time-timezone.page
+share/help/zh_HK/gnome-help/gs-change-wallpaper.page
+share/help/zh_HK/gnome-help/gs-connect-online-accounts.page
+share/help/zh_HK/gnome-help/gs-datetime.svg
+share/help/zh_HK/gnome-help/gs-get-online.page
+share/help/zh_HK/gnome-help/gs-go-online1.svg
+share/help/zh_HK/gnome-help/gs-go-online2.svg
+share/help/zh_HK/gnome-help/gs-go-online3.svg
+share/help/zh_HK/gnome-help/gs-goa1.svg
+share/help/zh_HK/gnome-help/gs-goa2.svg
+share/help/zh_HK/gnome-help/gs-goa3.svg
+share/help/zh_HK/gnome-help/gs-goa4.svg
+share/help/zh_HK/gnome-help/gs-goa5.svg
+share/help/zh_HK/gnome-help/gs-launch-applications.page
+share/help/zh_HK/gnome-help/gs-legal.xml
+share/help/zh_HK/gnome-help/gs-respond-messages.page
+share/help/zh_HK/gnome-help/gs-search-settings.svg
+share/help/zh_HK/gnome-help/gs-search1.svg
+share/help/zh_HK/gnome-help/gs-search2.svg
+share/help/zh_HK/gnome-help/gs-switch-tasks.page
+share/help/zh_HK/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/zh_HK/gnome-help/gs-thumb-launching-apps.svg
+share/help/zh_HK/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/zh_HK/gnome-help/gs-thumb-task-switching.svg
+share/help/zh_HK/gnome-help/gs-thumb-timezone.svg
+share/help/zh_HK/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/zh_HK/gnome-help/gs-use-system-search.page
+share/help/zh_HK/gnome-help/gs-use-windows-workspaces.page
+share/help/zh_HK/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/zh_HK/gnome-help/gs-web-browser1-firefox.svg
+share/help/zh_HK/gnome-help/gs-web-browser1.svg
+share/help/zh_HK/gnome-help/gs-web-browser2-firefox.svg
+share/help/zh_HK/gnome-help/gs-web-browser2.svg
+share/help/zh_TW/gnome-help/figures/gnome-change-wallpaper.webm
+share/help/zh_TW/gnome-help/figures/gnome-launching-applications.webm
+share/help/zh_TW/gnome-help/figures/gnome-responding-to-messages.webm
+share/help/zh_TW/gnome-help/figures/gnome-task-switching.webm
+share/help/zh_TW/gnome-help/figures/gnome-windows-and-workspaces.webm
+share/help/zh_TW/gnome-help/getting-started.page
+share/help/zh_TW/gnome-help/gs-animation.xml
+share/help/zh_TW/gnome-help/gs-browse-web.page
+share/help/zh_TW/gnome-help/gs-change-date-time-timezone.page
+share/help/zh_TW/gnome-help/gs-change-wallpaper.page
+share/help/zh_TW/gnome-help/gs-connect-online-accounts.page
+share/help/zh_TW/gnome-help/gs-datetime.svg
+share/help/zh_TW/gnome-help/gs-get-online.page
+share/help/zh_TW/gnome-help/gs-go-online1.svg
+share/help/zh_TW/gnome-help/gs-go-online2.svg
+share/help/zh_TW/gnome-help/gs-go-online3.svg
+share/help/zh_TW/gnome-help/gs-goa1.svg
+share/help/zh_TW/gnome-help/gs-goa2.svg
+share/help/zh_TW/gnome-help/gs-goa3.svg
+share/help/zh_TW/gnome-help/gs-goa4.svg
+share/help/zh_TW/gnome-help/gs-goa5.svg
+share/help/zh_TW/gnome-help/gs-launch-applications.page
+share/help/zh_TW/gnome-help/gs-legal.xml
+share/help/zh_TW/gnome-help/gs-respond-messages.page
+share/help/zh_TW/gnome-help/gs-search-settings.svg
+share/help/zh_TW/gnome-help/gs-search1.svg
+share/help/zh_TW/gnome-help/gs-search2.svg
+share/help/zh_TW/gnome-help/gs-switch-tasks.page
+share/help/zh_TW/gnome-help/gs-thumb-changing-wallpaper.svg
+share/help/zh_TW/gnome-help/gs-thumb-launching-apps.svg
+share/help/zh_TW/gnome-help/gs-thumb-responding-to-messages.svg
+share/help/zh_TW/gnome-help/gs-thumb-task-switching.svg
+share/help/zh_TW/gnome-help/gs-thumb-timezone.svg
+share/help/zh_TW/gnome-help/gs-thumb-windows-and-workspaces.svg
+share/help/zh_TW/gnome-help/gs-use-system-search.page
+share/help/zh_TW/gnome-help/gs-use-windows-workspaces.page
+share/help/zh_TW/gnome-help/gs-web-browser1-firefox-classic.svg
+share/help/zh_TW/gnome-help/gs-web-browser1-firefox.svg
+share/help/zh_TW/gnome-help/gs-web-browser1.svg
+share/help/zh_TW/gnome-help/gs-web-browser2-firefox.svg
+share/help/zh_TW/gnome-help/gs-web-browser2.svg
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index ff603b247a09..0e49f979cddd 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-user-docs
-PORTVERSION= 3.18.1
+PORTVERSION= 3.28.2
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -10,11 +10,15 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 3 users guide
+LICENSE= CC-BY-3.0
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= itstool:textproc/itstool
PORTSCOUT= limitw:1,even
GNU_CONFIGURE= yes
+NO_ARCH= yes
USES= gettext-tools gmake gnome pathfix tar:xz
USE_GNOME= libxml2:build
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index 3111ee25eefc..72c01a87012a 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-user-docs-3.18.1.tar.xz) = 83e52528de6afe4412679d7fd8c7f8124b07770b4e291592f24e9e50657efae4
-SIZE (gnome3/gnome-user-docs-3.18.1.tar.xz) = 14213948
+TIMESTAMP = 1525955606
+SHA256 (gnome3/gnome-user-docs-3.28.2.tar.xz) = 8d6919447f54266049d39808a03d11a56ab4a5fb0a537e79936fd112decbe13d
+SIZE (gnome3/gnome-user-docs-3.28.2.tar.xz) = 15489560
diff --git a/misc/gnome-user-docs/pkg-descr b/misc/gnome-user-docs/pkg-descr
index 0ed2fb1bc819..42c6c7678a20 100644
--- a/misc/gnome-user-docs/pkg-descr
+++ b/misc/gnome-user-docs/pkg-descr
@@ -1 +1 @@
-User documentation for the GNOME 2 desktop.
+User documentation for the GNOME 3 desktop.
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index 793b734deb68..187acde68054 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -71,6 +71,8 @@ share/help/C/gnome-help/disk-capacity.page
share/help/C/gnome-help/disk-check.page
share/help/C/gnome-help/disk-format.page
share/help/C/gnome-help/disk-partitions.page
+share/help/C/gnome-help/disk-repair.page
+share/help/C/gnome-help/disk-resize.page
share/help/C/gnome-help/disk.page
share/help/C/gnome-help/display-blank.page
share/help/C/gnome-help/display-brightness.page
@@ -94,7 +96,6 @@ share/help/C/gnome-help/figures/battery-missing-symbolic.svg
share/help/C/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/C/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/C/gnome-help/figures/bluetooth-menu.png
-share/help/C/gnome-help/figures/camera-photo-symbolic.svg
share/help/C/gnome-help/figures/color-average.png
share/help/C/gnome-help/figures/color-camera.png
share/help/C/gnome-help/figures/color-display.png
@@ -102,15 +103,30 @@ share/help/C/gnome-help/figures/color-printer.png
share/help/C/gnome-help/figures/color-profile-default.png
share/help/C/gnome-help/figures/color-space.png
share/help/C/gnome-help/figures/display-dual-monitors.webm
-share/help/C/gnome-help/figures/documents-icon.png
share/help/C/gnome-help/figures/emblem-system-symbolic.svg
share/help/C/gnome-help/figures/emblem-system.png
share/help/C/gnome-help/figures/gnome.png
share/help/C/gnome-help/figures/go-down.png
share/help/C/gnome-help/figures/input-keyboard-symbolic.png
share/help/C/gnome-help/figures/input-methods-switcher.png
+share/help/C/gnome-help/figures/keyboard-key-calculator.svg
+share/help/C/gnome-help/figures/keyboard-key-computer.svg
+share/help/C/gnome-help/figures/keyboard-key-eject.svg
+share/help/C/gnome-help/figures/keyboard-key-folder.svg
+share/help/C/gnome-help/figures/keyboard-key-home.svg
+share/help/C/gnome-help/figures/keyboard-key-mail.svg
+share/help/C/gnome-help/figures/keyboard-key-media.svg
share/help/C/gnome-help/figures/keyboard-key-menu.svg
-share/help/C/gnome-help/figures/nautilus-3-10.png
+share/help/C/gnome-help/figures/keyboard-key-mute.svg
+share/help/C/gnome-help/figures/keyboard-key-next.svg
+share/help/C/gnome-help/figures/keyboard-key-pause.svg
+share/help/C/gnome-help/figures/keyboard-key-play.svg
+share/help/C/gnome-help/figures/keyboard-key-previous.svg
+share/help/C/gnome-help/figures/keyboard-key-search.svg
+share/help/C/gnome-help/figures/keyboard-key-stop.svg
+share/help/C/gnome-help/figures/keyboard-key-voldown.svg
+share/help/C/gnome-help/figures/keyboard-key-volup.svg
+share/help/C/gnome-help/figures/keyboard-key-world.svg
share/help/C/gnome-help/figures/nautilus-icons.png
share/help/C/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/C/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -144,35 +160,26 @@ share/help/C/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/C/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/C/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/C/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/C/gnome-help/figures/notification-buttons.png
share/help/C/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/C/gnome-help/figures/printing-select.png
share/help/C/gnome-help/figures/shell-activities-classic.png
share/help/C/gnome-help/figures/shell-activities.png
share/help/C/gnome-help/figures/shell-appmenu-classic.png
share/help/C/gnome-help/figures/shell-appmenu-shell.png
-share/help/C/gnome-help/figures/shell-apps-open.png
share/help/C/gnome-help/figures/shell-appts-classic.png
share/help/C/gnome-help/figures/shell-appts.png
share/help/C/gnome-help/figures/shell-dash.png
share/help/C/gnome-help/figures/shell-exit-classic.png
share/help/C/gnome-help/figures/shell-exit.png
-share/help/C/gnome-help/figures/shell-files.png
-share/help/C/gnome-help/figures/shell-introduction.png
-share/help/C/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/C/gnome-help/figures/shell-lock.png
-share/help/C/gnome-help/figures/shell-notification.png
share/help/C/gnome-help/figures/shell-top-bar-classic.png
share/help/C/gnome-help/figures/shell-top-bar.png
share/help/C/gnome-help/figures/shell-window-list-classic.png
-share/help/C/gnome-help/figures/shell-windows.png
share/help/C/gnome-help/figures/shell-workspaces.png
-share/help/C/gnome-help/figures/shell.png
share/help/C/gnome-help/figures/system-run-symbolic.svg
share/help/C/gnome-help/figures/top-bar-icons-classic.png
share/help/C/gnome-help/figures/top-bar-icons.png
share/help/C/gnome-help/figures/universal-access-menu.png
-share/help/C/gnome-help/figures/view-fullscreen-16.png
share/help/C/gnome-help/figures/view-more-symbolic.svg
share/help/C/gnome-help/figures/yelp-icon-big.png
share/help/C/gnome-help/files-autorun.page
@@ -283,6 +290,8 @@ share/help/C/gnome-help/net-wireless-troubleshooting.page
share/help/C/gnome-help/net-wireless-wepwpa.page
share/help/C/gnome-help/net-wireless.page
share/help/C/gnome-help/net.page
+share/help/C/gnome-help/power-autobrightness.page
+share/help/C/gnome-help/power-autosuspend.page
share/help/C/gnome-help/power-batteryestimate.page
share/help/C/gnome-help/power-batterylife.page
share/help/C/gnome-help/power-batteryoptimal.page
@@ -294,10 +303,12 @@ share/help/C/gnome-help/power-hotcomputer.page
share/help/C/gnome-help/power-lowpower.page
share/help/C/gnome-help/power-nowireless.page
share/help/C/gnome-help/power-othercountry.page
+share/help/C/gnome-help/power-status.page
share/help/C/gnome-help/power-suspend.page
share/help/C/gnome-help/power-suspendfail.page
share/help/C/gnome-help/power-whydim.page
share/help/C/gnome-help/power-willnotturnon.page
+share/help/C/gnome-help/power-wireless.page
share/help/C/gnome-help/power.page
share/help/C/gnome-help/prefs-display.page
share/help/C/gnome-help/prefs-language.page
@@ -389,11 +400,15 @@ share/help/C/system-admin-guide/dconf-nfs-home.page
share/help/C/system-admin-guide/dconf-profiles.page
share/help/C/system-admin-guide/dconf-snippets.xml
share/help/C/system-admin-guide/dconf.page
+share/help/C/system-admin-guide/desktop-background.page
share/help/C/system-admin-guide/desktop-favorite-applications.page
+share/help/C/system-admin-guide/desktop-lockscreen.page
+share/help/C/system-admin-guide/desktop-shield.page
share/help/C/system-admin-guide/extensions-enable.page
share/help/C/system-admin-guide/extensions-lockdown.page
share/help/C/system-admin-guide/extensions.page
share/help/C/system-admin-guide/fonts-user.page
+share/help/C/system-admin-guide/fonts.page
share/help/C/system-admin-guide/index.page
share/help/C/system-admin-guide/keyboard-layout.page
share/help/C/system-admin-guide/legal.xml
@@ -406,16 +421,26 @@ share/help/C/system-admin-guide/login-automatic.page
share/help/C/system-admin-guide/login-banner.page
share/help/C/system-admin-guide/login-enterprise.page
share/help/C/system-admin-guide/login-fingerprint.page
+share/help/C/system-admin-guide/login-logo.page
share/help/C/system-admin-guide/login-userlist-disable.page
share/help/C/system-admin-guide/login.page
+share/help/C/system-admin-guide/logout-automatic.page
share/help/C/system-admin-guide/mime-types-application-user.page
share/help/C/system-admin-guide/mime-types-application.page
share/help/C/system-admin-guide/mime-types-custom-user.page
share/help/C/system-admin-guide/mime-types-custom.page
share/help/C/system-admin-guide/mime-types.page
share/help/C/system-admin-guide/network-printer-config.page
+share/help/C/system-admin-guide/network-server-list.page
+share/help/C/system-admin-guide/network-vpn.page
+share/help/C/system-admin-guide/network.page
+share/help/C/system-admin-guide/overrides.page
+share/help/C/system-admin-guide/power-dim-screen.page
+share/help/C/system-admin-guide/processes.page
share/help/C/system-admin-guide/session-custom.page
+share/help/C/system-admin-guide/session-debug.page
share/help/C/system-admin-guide/session-user.page
+share/help/C/system-admin-guide/setup.page
share/help/C/system-admin-guide/software.page
share/help/C/system-admin-guide/sundry.page
share/help/C/system-admin-guide/user-settings.page
@@ -492,6 +517,8 @@ share/help/as/gnome-help/disk-capacity.page
share/help/as/gnome-help/disk-check.page
share/help/as/gnome-help/disk-format.page
share/help/as/gnome-help/disk-partitions.page
+share/help/as/gnome-help/disk-repair.page
+share/help/as/gnome-help/disk-resize.page
share/help/as/gnome-help/disk.page
share/help/as/gnome-help/display-blank.page
share/help/as/gnome-help/display-brightness.page
@@ -515,7 +542,6 @@ share/help/as/gnome-help/figures/battery-missing-symbolic.svg
share/help/as/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/as/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/as/gnome-help/figures/bluetooth-menu.png
-share/help/as/gnome-help/figures/camera-photo-symbolic.svg
share/help/as/gnome-help/figures/color-average.png
share/help/as/gnome-help/figures/color-camera.png
share/help/as/gnome-help/figures/color-display.png
@@ -523,15 +549,30 @@ share/help/as/gnome-help/figures/color-printer.png
share/help/as/gnome-help/figures/color-profile-default.png
share/help/as/gnome-help/figures/color-space.png
share/help/as/gnome-help/figures/display-dual-monitors.webm
-share/help/as/gnome-help/figures/documents-icon.png
share/help/as/gnome-help/figures/emblem-system-symbolic.svg
share/help/as/gnome-help/figures/emblem-system.png
share/help/as/gnome-help/figures/gnome.png
share/help/as/gnome-help/figures/go-down.png
share/help/as/gnome-help/figures/input-keyboard-symbolic.png
share/help/as/gnome-help/figures/input-methods-switcher.png
+share/help/as/gnome-help/figures/keyboard-key-calculator.svg
+share/help/as/gnome-help/figures/keyboard-key-computer.svg
+share/help/as/gnome-help/figures/keyboard-key-eject.svg
+share/help/as/gnome-help/figures/keyboard-key-folder.svg
+share/help/as/gnome-help/figures/keyboard-key-home.svg
+share/help/as/gnome-help/figures/keyboard-key-mail.svg
+share/help/as/gnome-help/figures/keyboard-key-media.svg
share/help/as/gnome-help/figures/keyboard-key-menu.svg
-share/help/as/gnome-help/figures/nautilus-3-10.png
+share/help/as/gnome-help/figures/keyboard-key-mute.svg
+share/help/as/gnome-help/figures/keyboard-key-next.svg
+share/help/as/gnome-help/figures/keyboard-key-pause.svg
+share/help/as/gnome-help/figures/keyboard-key-play.svg
+share/help/as/gnome-help/figures/keyboard-key-previous.svg
+share/help/as/gnome-help/figures/keyboard-key-search.svg
+share/help/as/gnome-help/figures/keyboard-key-stop.svg
+share/help/as/gnome-help/figures/keyboard-key-voldown.svg
+share/help/as/gnome-help/figures/keyboard-key-volup.svg
+share/help/as/gnome-help/figures/keyboard-key-world.svg
share/help/as/gnome-help/figures/nautilus-icons.png
share/help/as/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/as/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -565,35 +606,26 @@ share/help/as/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/as/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/as/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/as/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/as/gnome-help/figures/notification-buttons.png
share/help/as/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/as/gnome-help/figures/printing-select.png
share/help/as/gnome-help/figures/shell-activities-classic.png
share/help/as/gnome-help/figures/shell-activities.png
share/help/as/gnome-help/figures/shell-appmenu-classic.png
share/help/as/gnome-help/figures/shell-appmenu-shell.png
-share/help/as/gnome-help/figures/shell-apps-open.png
share/help/as/gnome-help/figures/shell-appts-classic.png
share/help/as/gnome-help/figures/shell-appts.png
share/help/as/gnome-help/figures/shell-dash.png
share/help/as/gnome-help/figures/shell-exit-classic.png
share/help/as/gnome-help/figures/shell-exit.png
-share/help/as/gnome-help/figures/shell-files.png
-share/help/as/gnome-help/figures/shell-introduction.png
-share/help/as/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/as/gnome-help/figures/shell-lock.png
-share/help/as/gnome-help/figures/shell-notification.png
share/help/as/gnome-help/figures/shell-top-bar-classic.png
share/help/as/gnome-help/figures/shell-top-bar.png
share/help/as/gnome-help/figures/shell-window-list-classic.png
-share/help/as/gnome-help/figures/shell-windows.png
share/help/as/gnome-help/figures/shell-workspaces.png
-share/help/as/gnome-help/figures/shell.png
share/help/as/gnome-help/figures/system-run-symbolic.svg
share/help/as/gnome-help/figures/top-bar-icons-classic.png
share/help/as/gnome-help/figures/top-bar-icons.png
share/help/as/gnome-help/figures/universal-access-menu.png
-share/help/as/gnome-help/figures/view-fullscreen-16.png
share/help/as/gnome-help/figures/view-more-symbolic.svg
share/help/as/gnome-help/figures/yelp-icon-big.png
share/help/as/gnome-help/files-autorun.page
@@ -704,6 +736,8 @@ share/help/as/gnome-help/net-wireless-troubleshooting.page
share/help/as/gnome-help/net-wireless-wepwpa.page
share/help/as/gnome-help/net-wireless.page
share/help/as/gnome-help/net.page
+share/help/as/gnome-help/power-autobrightness.page
+share/help/as/gnome-help/power-autosuspend.page
share/help/as/gnome-help/power-batteryestimate.page
share/help/as/gnome-help/power-batterylife.page
share/help/as/gnome-help/power-batteryoptimal.page
@@ -715,10 +749,12 @@ share/help/as/gnome-help/power-hotcomputer.page
share/help/as/gnome-help/power-lowpower.page
share/help/as/gnome-help/power-nowireless.page
share/help/as/gnome-help/power-othercountry.page
+share/help/as/gnome-help/power-status.page
share/help/as/gnome-help/power-suspend.page
share/help/as/gnome-help/power-suspendfail.page
share/help/as/gnome-help/power-whydim.page
share/help/as/gnome-help/power-willnotturnon.page
+share/help/as/gnome-help/power-wireless.page
share/help/as/gnome-help/power.page
share/help/as/gnome-help/prefs-display.page
share/help/as/gnome-help/prefs-language.page
@@ -875,6 +911,8 @@ share/help/ca/gnome-help/disk-capacity.page
share/help/ca/gnome-help/disk-check.page
share/help/ca/gnome-help/disk-format.page
share/help/ca/gnome-help/disk-partitions.page
+share/help/ca/gnome-help/disk-repair.page
+share/help/ca/gnome-help/disk-resize.page
share/help/ca/gnome-help/disk.page
share/help/ca/gnome-help/display-blank.page
share/help/ca/gnome-help/display-brightness.page
@@ -898,7 +936,6 @@ share/help/ca/gnome-help/figures/battery-missing-symbolic.svg
share/help/ca/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/ca/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/ca/gnome-help/figures/bluetooth-menu.png
-share/help/ca/gnome-help/figures/camera-photo-symbolic.svg
share/help/ca/gnome-help/figures/color-average.png
share/help/ca/gnome-help/figures/color-camera.png
share/help/ca/gnome-help/figures/color-display.png
@@ -906,15 +943,30 @@ share/help/ca/gnome-help/figures/color-printer.png
share/help/ca/gnome-help/figures/color-profile-default.png
share/help/ca/gnome-help/figures/color-space.png
share/help/ca/gnome-help/figures/display-dual-monitors.webm
-share/help/ca/gnome-help/figures/documents-icon.png
share/help/ca/gnome-help/figures/emblem-system-symbolic.svg
share/help/ca/gnome-help/figures/emblem-system.png
share/help/ca/gnome-help/figures/gnome.png
share/help/ca/gnome-help/figures/go-down.png
share/help/ca/gnome-help/figures/input-keyboard-symbolic.png
share/help/ca/gnome-help/figures/input-methods-switcher.png
+share/help/ca/gnome-help/figures/keyboard-key-calculator.svg
+share/help/ca/gnome-help/figures/keyboard-key-computer.svg
+share/help/ca/gnome-help/figures/keyboard-key-eject.svg
+share/help/ca/gnome-help/figures/keyboard-key-folder.svg
+share/help/ca/gnome-help/figures/keyboard-key-home.svg
+share/help/ca/gnome-help/figures/keyboard-key-mail.svg
+share/help/ca/gnome-help/figures/keyboard-key-media.svg
share/help/ca/gnome-help/figures/keyboard-key-menu.svg
-share/help/ca/gnome-help/figures/nautilus-3-10.png
+share/help/ca/gnome-help/figures/keyboard-key-mute.svg
+share/help/ca/gnome-help/figures/keyboard-key-next.svg
+share/help/ca/gnome-help/figures/keyboard-key-pause.svg
+share/help/ca/gnome-help/figures/keyboard-key-play.svg
+share/help/ca/gnome-help/figures/keyboard-key-previous.svg
+share/help/ca/gnome-help/figures/keyboard-key-search.svg
+share/help/ca/gnome-help/figures/keyboard-key-stop.svg
+share/help/ca/gnome-help/figures/keyboard-key-voldown.svg
+share/help/ca/gnome-help/figures/keyboard-key-volup.svg
+share/help/ca/gnome-help/figures/keyboard-key-world.svg
share/help/ca/gnome-help/figures/nautilus-icons.png
share/help/ca/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/ca/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -948,35 +1000,26 @@ share/help/ca/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/ca/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/ca/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/ca/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/ca/gnome-help/figures/notification-buttons.png
share/help/ca/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/ca/gnome-help/figures/printing-select.png
share/help/ca/gnome-help/figures/shell-activities-classic.png
share/help/ca/gnome-help/figures/shell-activities.png
share/help/ca/gnome-help/figures/shell-appmenu-classic.png
share/help/ca/gnome-help/figures/shell-appmenu-shell.png
-share/help/ca/gnome-help/figures/shell-apps-open.png
share/help/ca/gnome-help/figures/shell-appts-classic.png
share/help/ca/gnome-help/figures/shell-appts.png
share/help/ca/gnome-help/figures/shell-dash.png
share/help/ca/gnome-help/figures/shell-exit-classic.png
share/help/ca/gnome-help/figures/shell-exit.png
-share/help/ca/gnome-help/figures/shell-files.png
-share/help/ca/gnome-help/figures/shell-introduction.png
-share/help/ca/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/ca/gnome-help/figures/shell-lock.png
-share/help/ca/gnome-help/figures/shell-notification.png
share/help/ca/gnome-help/figures/shell-top-bar-classic.png
share/help/ca/gnome-help/figures/shell-top-bar.png
share/help/ca/gnome-help/figures/shell-window-list-classic.png
-share/help/ca/gnome-help/figures/shell-windows.png
share/help/ca/gnome-help/figures/shell-workspaces.png
-share/help/ca/gnome-help/figures/shell.png
share/help/ca/gnome-help/figures/system-run-symbolic.svg
share/help/ca/gnome-help/figures/top-bar-icons-classic.png
share/help/ca/gnome-help/figures/top-bar-icons.png
share/help/ca/gnome-help/figures/universal-access-menu.png
-share/help/ca/gnome-help/figures/view-fullscreen-16.png
share/help/ca/gnome-help/figures/view-more-symbolic.svg
share/help/ca/gnome-help/figures/yelp-icon-big.png
share/help/ca/gnome-help/files-autorun.page
@@ -1087,6 +1130,8 @@ share/help/ca/gnome-help/net-wireless-troubleshooting.page
share/help/ca/gnome-help/net-wireless-wepwpa.page
share/help/ca/gnome-help/net-wireless.page
share/help/ca/gnome-help/net.page
+share/help/ca/gnome-help/power-autobrightness.page
+share/help/ca/gnome-help/power-autosuspend.page
share/help/ca/gnome-help/power-batteryestimate.page
share/help/ca/gnome-help/power-batterylife.page
share/help/ca/gnome-help/power-batteryoptimal.page
@@ -1098,10 +1143,12 @@ share/help/ca/gnome-help/power-hotcomputer.page
share/help/ca/gnome-help/power-lowpower.page
share/help/ca/gnome-help/power-nowireless.page
share/help/ca/gnome-help/power-othercountry.page
+share/help/ca/gnome-help/power-status.page
share/help/ca/gnome-help/power-suspend.page
share/help/ca/gnome-help/power-suspendfail.page
share/help/ca/gnome-help/power-whydim.page
share/help/ca/gnome-help/power-willnotturnon.page
+share/help/ca/gnome-help/power-wireless.page
share/help/ca/gnome-help/power.page
share/help/ca/gnome-help/prefs-display.page
share/help/ca/gnome-help/prefs-language.page
@@ -1258,6 +1305,8 @@ share/help/cs/gnome-help/disk-capacity.page
share/help/cs/gnome-help/disk-check.page
share/help/cs/gnome-help/disk-format.page
share/help/cs/gnome-help/disk-partitions.page
+share/help/cs/gnome-help/disk-repair.page
+share/help/cs/gnome-help/disk-resize.page
share/help/cs/gnome-help/disk.page
share/help/cs/gnome-help/display-blank.page
share/help/cs/gnome-help/display-brightness.page
@@ -1281,7 +1330,6 @@ share/help/cs/gnome-help/figures/battery-missing-symbolic.svg
share/help/cs/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/cs/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/cs/gnome-help/figures/bluetooth-menu.png
-share/help/cs/gnome-help/figures/camera-photo-symbolic.svg
share/help/cs/gnome-help/figures/color-average.png
share/help/cs/gnome-help/figures/color-camera.png
share/help/cs/gnome-help/figures/color-display.png
@@ -1289,15 +1337,30 @@ share/help/cs/gnome-help/figures/color-printer.png
share/help/cs/gnome-help/figures/color-profile-default.png
share/help/cs/gnome-help/figures/color-space.png
share/help/cs/gnome-help/figures/display-dual-monitors.webm
-share/help/cs/gnome-help/figures/documents-icon.png
share/help/cs/gnome-help/figures/emblem-system-symbolic.svg
share/help/cs/gnome-help/figures/emblem-system.png
share/help/cs/gnome-help/figures/gnome.png
share/help/cs/gnome-help/figures/go-down.png
share/help/cs/gnome-help/figures/input-keyboard-symbolic.png
share/help/cs/gnome-help/figures/input-methods-switcher.png
+share/help/cs/gnome-help/figures/keyboard-key-calculator.svg
+share/help/cs/gnome-help/figures/keyboard-key-computer.svg
+share/help/cs/gnome-help/figures/keyboard-key-eject.svg
+share/help/cs/gnome-help/figures/keyboard-key-folder.svg
+share/help/cs/gnome-help/figures/keyboard-key-home.svg
+share/help/cs/gnome-help/figures/keyboard-key-mail.svg
+share/help/cs/gnome-help/figures/keyboard-key-media.svg
share/help/cs/gnome-help/figures/keyboard-key-menu.svg
-share/help/cs/gnome-help/figures/nautilus-3-10.png
+share/help/cs/gnome-help/figures/keyboard-key-mute.svg
+share/help/cs/gnome-help/figures/keyboard-key-next.svg
+share/help/cs/gnome-help/figures/keyboard-key-pause.svg
+share/help/cs/gnome-help/figures/keyboard-key-play.svg
+share/help/cs/gnome-help/figures/keyboard-key-previous.svg
+share/help/cs/gnome-help/figures/keyboard-key-search.svg
+share/help/cs/gnome-help/figures/keyboard-key-stop.svg
+share/help/cs/gnome-help/figures/keyboard-key-voldown.svg
+share/help/cs/gnome-help/figures/keyboard-key-volup.svg
+share/help/cs/gnome-help/figures/keyboard-key-world.svg
share/help/cs/gnome-help/figures/nautilus-icons.png
share/help/cs/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/cs/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -1331,35 +1394,26 @@ share/help/cs/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/cs/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/cs/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/cs/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/cs/gnome-help/figures/notification-buttons.png
share/help/cs/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/cs/gnome-help/figures/printing-select.png
share/help/cs/gnome-help/figures/shell-activities-classic.png
share/help/cs/gnome-help/figures/shell-activities.png
share/help/cs/gnome-help/figures/shell-appmenu-classic.png
share/help/cs/gnome-help/figures/shell-appmenu-shell.png
-share/help/cs/gnome-help/figures/shell-apps-open.png
share/help/cs/gnome-help/figures/shell-appts-classic.png
share/help/cs/gnome-help/figures/shell-appts.png
share/help/cs/gnome-help/figures/shell-dash.png
share/help/cs/gnome-help/figures/shell-exit-classic.png
share/help/cs/gnome-help/figures/shell-exit.png
-share/help/cs/gnome-help/figures/shell-files.png
-share/help/cs/gnome-help/figures/shell-introduction.png
-share/help/cs/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/cs/gnome-help/figures/shell-lock.png
-share/help/cs/gnome-help/figures/shell-notification.png
share/help/cs/gnome-help/figures/shell-top-bar-classic.png
share/help/cs/gnome-help/figures/shell-top-bar.png
share/help/cs/gnome-help/figures/shell-window-list-classic.png
-share/help/cs/gnome-help/figures/shell-windows.png
share/help/cs/gnome-help/figures/shell-workspaces.png
-share/help/cs/gnome-help/figures/shell.png
share/help/cs/gnome-help/figures/system-run-symbolic.svg
share/help/cs/gnome-help/figures/top-bar-icons-classic.png
share/help/cs/gnome-help/figures/top-bar-icons.png
share/help/cs/gnome-help/figures/universal-access-menu.png
-share/help/cs/gnome-help/figures/view-fullscreen-16.png
share/help/cs/gnome-help/figures/view-more-symbolic.svg
share/help/cs/gnome-help/figures/yelp-icon-big.png
share/help/cs/gnome-help/files-autorun.page
@@ -1470,6 +1524,8 @@ share/help/cs/gnome-help/net-wireless-troubleshooting.page
share/help/cs/gnome-help/net-wireless-wepwpa.page
share/help/cs/gnome-help/net-wireless.page
share/help/cs/gnome-help/net.page
+share/help/cs/gnome-help/power-autobrightness.page
+share/help/cs/gnome-help/power-autosuspend.page
share/help/cs/gnome-help/power-batteryestimate.page
share/help/cs/gnome-help/power-batterylife.page
share/help/cs/gnome-help/power-batteryoptimal.page
@@ -1481,10 +1537,12 @@ share/help/cs/gnome-help/power-hotcomputer.page
share/help/cs/gnome-help/power-lowpower.page
share/help/cs/gnome-help/power-nowireless.page
share/help/cs/gnome-help/power-othercountry.page
+share/help/cs/gnome-help/power-status.page
share/help/cs/gnome-help/power-suspend.page
share/help/cs/gnome-help/power-suspendfail.page
share/help/cs/gnome-help/power-whydim.page
share/help/cs/gnome-help/power-willnotturnon.page
+share/help/cs/gnome-help/power-wireless.page
share/help/cs/gnome-help/power.page
share/help/cs/gnome-help/prefs-display.page
share/help/cs/gnome-help/prefs-language.page
@@ -1568,6 +1626,452 @@ share/help/cs/gnome-help/wacom-mode.page
share/help/cs/gnome-help/wacom-multi-monitor.page
share/help/cs/gnome-help/wacom-stylus.page
share/help/cs/gnome-help/wacom.page
+share/help/cs/system-admin-guide/appearance.page
+share/help/cs/system-admin-guide/dconf-custom-defaults.page
+share/help/cs/system-admin-guide/dconf-keyfiles.page
+share/help/cs/system-admin-guide/dconf-lockdown.page
+share/help/cs/system-admin-guide/dconf-nfs-home.page
+share/help/cs/system-admin-guide/dconf-profiles.page
+share/help/cs/system-admin-guide/dconf-snippets.xml
+share/help/cs/system-admin-guide/dconf.page
+share/help/cs/system-admin-guide/desktop-background.page
+share/help/cs/system-admin-guide/desktop-favorite-applications.page
+share/help/cs/system-admin-guide/desktop-lockscreen.page
+share/help/cs/system-admin-guide/desktop-shield.page
+share/help/cs/system-admin-guide/extensions-enable.page
+share/help/cs/system-admin-guide/extensions-lockdown.page
+share/help/cs/system-admin-guide/extensions.page
+share/help/cs/system-admin-guide/fonts-user.page
+share/help/cs/system-admin-guide/fonts.page
+share/help/cs/system-admin-guide/index.page
+share/help/cs/system-admin-guide/keyboard-layout.page
+share/help/cs/system-admin-guide/legal.xml
+share/help/cs/system-admin-guide/lockdown-command-line.page
+share/help/cs/system-admin-guide/lockdown-file-saving.page
+share/help/cs/system-admin-guide/lockdown-online-accounts.page
+share/help/cs/system-admin-guide/lockdown-printing.page
+share/help/cs/system-admin-guide/lockdown-repartitioning.page
+share/help/cs/system-admin-guide/login-automatic.page
+share/help/cs/system-admin-guide/login-banner.page
+share/help/cs/system-admin-guide/login-enterprise.page
+share/help/cs/system-admin-guide/login-fingerprint.page
+share/help/cs/system-admin-guide/login-logo.page
+share/help/cs/system-admin-guide/login-userlist-disable.page
+share/help/cs/system-admin-guide/login.page
+share/help/cs/system-admin-guide/logout-automatic.page
+share/help/cs/system-admin-guide/mime-types-application-user.page
+share/help/cs/system-admin-guide/mime-types-application.page
+share/help/cs/system-admin-guide/mime-types-custom-user.page
+share/help/cs/system-admin-guide/mime-types-custom.page
+share/help/cs/system-admin-guide/mime-types.page
+share/help/cs/system-admin-guide/network-printer-config.page
+share/help/cs/system-admin-guide/network-server-list.page
+share/help/cs/system-admin-guide/network-vpn.page
+share/help/cs/system-admin-guide/network.page
+share/help/cs/system-admin-guide/overrides.page
+share/help/cs/system-admin-guide/power-dim-screen.page
+share/help/cs/system-admin-guide/processes.page
+share/help/cs/system-admin-guide/session-custom.page
+share/help/cs/system-admin-guide/session-debug.page
+share/help/cs/system-admin-guide/session-user.page
+share/help/cs/system-admin-guide/setup.page
+share/help/cs/system-admin-guide/software.page
+share/help/cs/system-admin-guide/sundry.page
+share/help/cs/system-admin-guide/user-settings.page
+share/help/da/gnome-help/a11y-bouncekeys.page
+share/help/da/gnome-help/a11y-braille.page
+share/help/da/gnome-help/a11y-contrast.page
+share/help/da/gnome-help/a11y-dwellclick.page
+share/help/da/gnome-help/a11y-font-size.page
+share/help/da/gnome-help/a11y-icon.page
+share/help/da/gnome-help/a11y-mag.page
+share/help/da/gnome-help/a11y-right-click.page
+share/help/da/gnome-help/a11y-screen-reader.page
+share/help/da/gnome-help/a11y-slowkeys.page
+share/help/da/gnome-help/a11y-stickykeys.page
+share/help/da/gnome-help/a11y-visualalert.page
+share/help/da/gnome-help/a11y.page
+share/help/da/gnome-help/about-this-guide.page
+share/help/da/gnome-help/accounts-add.page
+share/help/da/gnome-help/accounts-disable-service.page
+share/help/da/gnome-help/accounts-provider-not-available.page
+share/help/da/gnome-help/accounts-remove.page
+share/help/da/gnome-help/accounts-which-application.page
+share/help/da/gnome-help/accounts-whyadd.page
+share/help/da/gnome-help/accounts.page
+share/help/da/gnome-help/backup-check.page
+share/help/da/gnome-help/backup-frequency.page
+share/help/da/gnome-help/backup-how.page
+share/help/da/gnome-help/backup-restore.page
+share/help/da/gnome-help/backup-thinkabout.page
+share/help/da/gnome-help/backup-what.page
+share/help/da/gnome-help/backup-where.page
+share/help/da/gnome-help/backup-why.page
+share/help/da/gnome-help/bluetooth-connect-device.page
+share/help/da/gnome-help/bluetooth-problem-connecting.page
+share/help/da/gnome-help/bluetooth-remove-connection.page
+share/help/da/gnome-help/bluetooth-send-file.page
+share/help/da/gnome-help/bluetooth-turn-on-off.page
+share/help/da/gnome-help/bluetooth-visibility.page
+share/help/da/gnome-help/bluetooth.page
+share/help/da/gnome-help/clock-calendar.page
+share/help/da/gnome-help/clock-set.page
+share/help/da/gnome-help/clock-timezone.page
+share/help/da/gnome-help/clock-world.page
+share/help/da/gnome-help/clock.page
+share/help/da/gnome-help/color-assignprofiles.page
+share/help/da/gnome-help/color-calibrate-camera.page
+share/help/da/gnome-help/color-calibrate-printer.page
+share/help/da/gnome-help/color-calibrate-scanner.page
+share/help/da/gnome-help/color-calibrate-screen.page
+share/help/da/gnome-help/color-calibrationcharacterization.page
+share/help/da/gnome-help/color-calibrationdevices.page
+share/help/da/gnome-help/color-calibrationtargets.page
+share/help/da/gnome-help/color-canshareprofiles.page
+share/help/da/gnome-help/color-gettingprofiles.page
+share/help/da/gnome-help/color-howtoimport.page
+share/help/da/gnome-help/color-missingvcgt.page
+share/help/da/gnome-help/color-notifications.page
+share/help/da/gnome-help/color-notspecifiededid.page
+share/help/da/gnome-help/color-testing.page
+share/help/da/gnome-help/color-whatisprofile.page
+share/help/da/gnome-help/color-whatisspace.page
+share/help/da/gnome-help/color-why-calibrate.page
+share/help/da/gnome-help/color-whyimportant.page
+share/help/da/gnome-help/color.page
+share/help/da/gnome-help/contacts-add-remove.page
+share/help/da/gnome-help/contacts-connect.page
+share/help/da/gnome-help/contacts-edit-details.page
+share/help/da/gnome-help/contacts-link-unlink.page
+share/help/da/gnome-help/contacts-search.page
+share/help/da/gnome-help/contacts-setup.page
+share/help/da/gnome-help/contacts.page
+share/help/da/gnome-help/disk-benchmark.page
+share/help/da/gnome-help/disk-capacity.page
+share/help/da/gnome-help/disk-check.page
+share/help/da/gnome-help/disk-format.page
+share/help/da/gnome-help/disk-partitions.page
+share/help/da/gnome-help/disk-repair.page
+share/help/da/gnome-help/disk-resize.page
+share/help/da/gnome-help/disk.page
+share/help/da/gnome-help/display-blank.page
+share/help/da/gnome-help/display-brightness.page
+share/help/da/gnome-help/display-dual-monitors.page
+share/help/da/gnome-help/figures/audio-volume-high-symbolic.svg
+share/help/da/gnome-help/figures/audio-volume-low-symbolic.svg
+share/help/da/gnome-help/figures/audio-volume-medium-symbolic.svg
+share/help/da/gnome-help/figures/audio-volume-muted-symbolic.svg
+share/help/da/gnome-help/figures/battery-caution-charging-symbolic.svg
+share/help/da/gnome-help/figures/battery-caution-symbolic.svg
+share/help/da/gnome-help/figures/battery-empty-charging-symbolic.svg
+share/help/da/gnome-help/figures/battery-empty-symbolic.svg
+share/help/da/gnome-help/figures/battery-full-charged-symbolic.svg
+share/help/da/gnome-help/figures/battery-full-charging-symbolic.svg
+share/help/da/gnome-help/figures/battery-full-symbolic.svg
+share/help/da/gnome-help/figures/battery-good-charging-symbolic.svg
+share/help/da/gnome-help/figures/battery-good-symbolic.svg
+share/help/da/gnome-help/figures/battery-low-charging-symbolic.svg
+share/help/da/gnome-help/figures/battery-low-symbolic.svg
+share/help/da/gnome-help/figures/battery-missing-symbolic.svg
+share/help/da/gnome-help/figures/bluetooth-active-symbolic.svg
+share/help/da/gnome-help/figures/bluetooth-disabled-symbolic.svg
+share/help/da/gnome-help/figures/bluetooth-menu.png
+share/help/da/gnome-help/figures/color-average.png
+share/help/da/gnome-help/figures/color-camera.png
+share/help/da/gnome-help/figures/color-display.png
+share/help/da/gnome-help/figures/color-printer.png
+share/help/da/gnome-help/figures/color-profile-default.png
+share/help/da/gnome-help/figures/color-space.png
+share/help/da/gnome-help/figures/display-dual-monitors.webm
+share/help/da/gnome-help/figures/emblem-system-symbolic.svg
+share/help/da/gnome-help/figures/emblem-system.png
+share/help/da/gnome-help/figures/gnome.png
+share/help/da/gnome-help/figures/go-down.png
+share/help/da/gnome-help/figures/input-keyboard-symbolic.png
+share/help/da/gnome-help/figures/input-methods-switcher.png
+share/help/da/gnome-help/figures/keyboard-key-calculator.svg
+share/help/da/gnome-help/figures/keyboard-key-computer.svg
+share/help/da/gnome-help/figures/keyboard-key-eject.svg
+share/help/da/gnome-help/figures/keyboard-key-folder.svg
+share/help/da/gnome-help/figures/keyboard-key-home.svg
+share/help/da/gnome-help/figures/keyboard-key-mail.svg
+share/help/da/gnome-help/figures/keyboard-key-media.svg
+share/help/da/gnome-help/figures/keyboard-key-menu.svg
+share/help/da/gnome-help/figures/keyboard-key-mute.svg
+share/help/da/gnome-help/figures/keyboard-key-next.svg
+share/help/da/gnome-help/figures/keyboard-key-pause.svg
+share/help/da/gnome-help/figures/keyboard-key-play.svg
+share/help/da/gnome-help/figures/keyboard-key-previous.svg
+share/help/da/gnome-help/figures/keyboard-key-search.svg
+share/help/da/gnome-help/figures/keyboard-key-stop.svg
+share/help/da/gnome-help/figures/keyboard-key-voldown.svg
+share/help/da/gnome-help/figures/keyboard-key-volup.svg
+share/help/da/gnome-help/figures/keyboard-key-world.svg
+share/help/da/gnome-help/figures/nautilus-icons.png
+share/help/da/gnome-help/figures/network-cellular-3g-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-4g-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-acquiring-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-connected-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-edge-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-gprs-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-signal-excellent-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-signal-good-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-signal-none-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-signal-ok-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-signal-weak-symbolic.svg
+share/help/da/gnome-help/figures/network-cellular-umts-symbolic.svg
+share/help/da/gnome-help/figures/network-error-symbolic.svg
+share/help/da/gnome-help/figures/network-idle-symbolic.svg
+share/help/da/gnome-help/figures/network-no-route-symbolic.svg
+share/help/da/gnome-help/figures/network-offline-symbolic.svg
+share/help/da/gnome-help/figures/network-receive-symbolic.svg
+share/help/da/gnome-help/figures/network-transmit-receive-symbolic.svg
+share/help/da/gnome-help/figures/network-transmit-symbolic.svg
+share/help/da/gnome-help/figures/network-vpn-acquiring-symbolic.svg
+share/help/da/gnome-help/figures/network-vpn-symbolic.svg
+share/help/da/gnome-help/figures/network-wired-acquiring-symbolic.svg
+share/help/da/gnome-help/figures/network-wired-disconnected-symbolic.svg
+share/help/da/gnome-help/figures/network-wired-symbolic.svg
+share/help/da/gnome-help/figures/network-wireless-acquiring-symbolic.svg
+share/help/da/gnome-help/figures/network-wireless-connected-symbolic.svg
+share/help/da/gnome-help/figures/network-wireless-encrypted-symbolic.svg
+share/help/da/gnome-help/figures/network-wireless-signal-excellent-symbolic.svg
+share/help/da/gnome-help/figures/network-wireless-signal-good-symbolic.svg
+share/help/da/gnome-help/figures/network-wireless-signal-none-symbolic.svg
+share/help/da/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
+share/help/da/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
+share/help/da/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
+share/help/da/gnome-help/figures/printing-select.png
+share/help/da/gnome-help/figures/shell-activities-classic.png
+share/help/da/gnome-help/figures/shell-activities.png
+share/help/da/gnome-help/figures/shell-appmenu-classic.png
+share/help/da/gnome-help/figures/shell-appmenu-shell.png
+share/help/da/gnome-help/figures/shell-appts-classic.png
+share/help/da/gnome-help/figures/shell-appts.png
+share/help/da/gnome-help/figures/shell-dash.png
+share/help/da/gnome-help/figures/shell-exit-classic.png
+share/help/da/gnome-help/figures/shell-exit.png
+share/help/da/gnome-help/figures/shell-lock.png
+share/help/da/gnome-help/figures/shell-top-bar-classic.png
+share/help/da/gnome-help/figures/shell-top-bar.png
+share/help/da/gnome-help/figures/shell-window-list-classic.png
+share/help/da/gnome-help/figures/shell-workspaces.png
+share/help/da/gnome-help/figures/system-run-symbolic.svg
+share/help/da/gnome-help/figures/top-bar-icons-classic.png
+share/help/da/gnome-help/figures/top-bar-icons.png
+share/help/da/gnome-help/figures/universal-access-menu.png
+share/help/da/gnome-help/figures/view-more-symbolic.svg
+share/help/da/gnome-help/figures/yelp-icon-big.png
+share/help/da/gnome-help/files-autorun.page
+share/help/da/gnome-help/files-browse.page
+share/help/da/gnome-help/files-copy.page
+share/help/da/gnome-help/files-delete.page
+share/help/da/gnome-help/files-disc-write.page
+share/help/da/gnome-help/files-hidden.page
+share/help/da/gnome-help/files-lost.page
+share/help/da/gnome-help/files-open.page
+share/help/da/gnome-help/files-preview.page
+share/help/da/gnome-help/files-recover.page
+share/help/da/gnome-help/files-removedrive.page
+share/help/da/gnome-help/files-rename.page
+share/help/da/gnome-help/files-search.page
+share/help/da/gnome-help/files-select.page
+share/help/da/gnome-help/files-share.page
+share/help/da/gnome-help/files-sort.page
+share/help/da/gnome-help/files-templates.page
+share/help/da/gnome-help/files-tilde.page
+share/help/da/gnome-help/files.page
+share/help/da/gnome-help/get-involved.page
+share/help/da/gnome-help/gnome-classic.page
+share/help/da/gnome-help/gnome-version.page
+share/help/da/gnome-help/hardware-auth.page
+share/help/da/gnome-help/hardware-cardreader.page
+share/help/da/gnome-help/hardware-driver.page
+share/help/da/gnome-help/hardware-problems-graphics.page
+share/help/da/gnome-help/hardware.page
+share/help/da/gnome-help/help-irc.page
+share/help/da/gnome-help/help-mailing-list.page
+share/help/da/gnome-help/index.page
+share/help/da/gnome-help/keyboard-cursor-blink.page
+share/help/da/gnome-help/keyboard-key-menu.page
+share/help/da/gnome-help/keyboard-key-super.page
+share/help/da/gnome-help/keyboard-layouts.page
+share/help/da/gnome-help/keyboard-nav.page
+share/help/da/gnome-help/keyboard-osk.page
+share/help/da/gnome-help/keyboard-repeat-keys.page
+share/help/da/gnome-help/keyboard-shortcuts-set.page
+share/help/da/gnome-help/keyboard.page
+share/help/da/gnome-help/legal.xml
+share/help/da/gnome-help/look-background.page
+share/help/da/gnome-help/look-display-fuzzy.page
+share/help/da/gnome-help/look-resolution.page
+share/help/da/gnome-help/media.page
+share/help/da/gnome-help/more-help.page
+share/help/da/gnome-help/mouse-doubleclick.page
+share/help/da/gnome-help/mouse-lefthanded.page
+share/help/da/gnome-help/mouse-middleclick.page
+share/help/da/gnome-help/mouse-mousekeys.page
+share/help/da/gnome-help/mouse-problem-notmoving.page
+share/help/da/gnome-help/mouse-sensitivity.page
+share/help/da/gnome-help/mouse-touchpad-click.page
+share/help/da/gnome-help/mouse-wakeup.page
+share/help/da/gnome-help/mouse.page
+share/help/da/gnome-help/music-cantplay-drm.page
+share/help/da/gnome-help/music-player-ipodtransfer.page
+share/help/da/gnome-help/music-player-newipod.page
+share/help/da/gnome-help/nautilus-behavior.page
+share/help/da/gnome-help/nautilus-bookmarks-edit.page
+share/help/da/gnome-help/nautilus-connect.page
+share/help/da/gnome-help/nautilus-display.page
+share/help/da/gnome-help/nautilus-file-properties-basic.page
+share/help/da/gnome-help/nautilus-file-properties-permissions.page
+share/help/da/gnome-help/nautilus-list.page
+share/help/da/gnome-help/nautilus-prefs.page
+share/help/da/gnome-help/nautilus-preview.page
+share/help/da/gnome-help/nautilus-views.page
+share/help/da/gnome-help/net-antivirus.page
+share/help/da/gnome-help/net-browser.page
+share/help/da/gnome-help/net-default-browser.page
+share/help/da/gnome-help/net-default-email.page
+share/help/da/gnome-help/net-email-virus.page
+share/help/da/gnome-help/net-email.page
+share/help/da/gnome-help/net-findip.page
+share/help/da/gnome-help/net-firewall-on-off.page
+share/help/da/gnome-help/net-firewall-ports.page
+share/help/da/gnome-help/net-fixed-ip-address.page
+share/help/da/gnome-help/net-general.page
+share/help/da/gnome-help/net-install-flash.page
+share/help/da/gnome-help/net-macaddress.page
+share/help/da/gnome-help/net-manual.page
+share/help/da/gnome-help/net-mobile.page
+share/help/da/gnome-help/net-othersconnect.page
+share/help/da/gnome-help/net-othersedit.page
+share/help/da/gnome-help/net-problem.page
+share/help/da/gnome-help/net-proxy.page
+share/help/da/gnome-help/net-security-tips.page
+share/help/da/gnome-help/net-security.page
+share/help/da/gnome-help/net-slow.page
+share/help/da/gnome-help/net-vpn-connect.page
+share/help/da/gnome-help/net-what-is-ip-address.page
+share/help/da/gnome-help/net-wired-connect.page
+share/help/da/gnome-help/net-wired.page
+share/help/da/gnome-help/net-wireless-adhoc.page
+share/help/da/gnome-help/net-wireless-airplane.page
+share/help/da/gnome-help/net-wireless-connect.page
+share/help/da/gnome-help/net-wireless-disconnecting.page
+share/help/da/gnome-help/net-wireless-find.page
+share/help/da/gnome-help/net-wireless-hidden.page
+share/help/da/gnome-help/net-wireless-noconnection.page
+share/help/da/gnome-help/net-wireless-troubleshooting-device-drivers.page
+share/help/da/gnome-help/net-wireless-troubleshooting-hardware-check.page
+share/help/da/gnome-help/net-wireless-troubleshooting-hardware-info.page
+share/help/da/gnome-help/net-wireless-troubleshooting-initial-check.page
+share/help/da/gnome-help/net-wireless-troubleshooting.page
+share/help/da/gnome-help/net-wireless-wepwpa.page
+share/help/da/gnome-help/net-wireless.page
+share/help/da/gnome-help/net.page
+share/help/da/gnome-help/power-autobrightness.page
+share/help/da/gnome-help/power-autosuspend.page
+share/help/da/gnome-help/power-batteryestimate.page
+share/help/da/gnome-help/power-batterylife.page
+share/help/da/gnome-help/power-batteryoptimal.page
+share/help/da/gnome-help/power-batteryslow.page
+share/help/da/gnome-help/power-batterywindows.page
+share/help/da/gnome-help/power-closelid.page
+share/help/da/gnome-help/power-constantfan.page
+share/help/da/gnome-help/power-hotcomputer.page
+share/help/da/gnome-help/power-lowpower.page
+share/help/da/gnome-help/power-nowireless.page
+share/help/da/gnome-help/power-othercountry.page
+share/help/da/gnome-help/power-status.page
+share/help/da/gnome-help/power-suspend.page
+share/help/da/gnome-help/power-suspendfail.page
+share/help/da/gnome-help/power-whydim.page
+share/help/da/gnome-help/power-willnotturnon.page
+share/help/da/gnome-help/power-wireless.page
+share/help/da/gnome-help/power.page
+share/help/da/gnome-help/prefs-display.page
+share/help/da/gnome-help/prefs-language.page
+share/help/da/gnome-help/prefs-sharing.page
+share/help/da/gnome-help/prefs.page
+share/help/da/gnome-help/printing-2sided.page
+share/help/da/gnome-help/printing-booklet-duplex.page
+share/help/da/gnome-help/printing-booklet-singlesided.page
+share/help/da/gnome-help/printing-booklet.page
+share/help/da/gnome-help/printing-cancel-job.page
+share/help/da/gnome-help/printing-differentsize.page
+share/help/da/gnome-help/printing-envelopes.page
+share/help/da/gnome-help/printing-inklevel.page
+share/help/da/gnome-help/printing-name-location.page
+share/help/da/gnome-help/printing-order.page
+share/help/da/gnome-help/printing-paperjam.page
+share/help/da/gnome-help/printing-select.page
+share/help/da/gnome-help/printing-setup-default-printer.page
+share/help/da/gnome-help/printing-setup.page
+share/help/da/gnome-help/printing-streaks.page
+share/help/da/gnome-help/printing-to-file.page
+share/help/da/gnome-help/printing.page
+share/help/da/gnome-help/privacy-history-recent-off.page
+share/help/da/gnome-help/privacy-location.page
+share/help/da/gnome-help/privacy-purge.page
+share/help/da/gnome-help/privacy-screen-lock.page
+share/help/da/gnome-help/privacy.page
+share/help/da/gnome-help/screen-shot-record.page
+share/help/da/gnome-help/session-fingerprint.page
+share/help/da/gnome-help/session-formats.page
+share/help/da/gnome-help/session-language.page
+share/help/da/gnome-help/session-screenlocks.page
+share/help/da/gnome-help/sharing-bluetooth.page
+share/help/da/gnome-help/sharing-desktop.page
+share/help/da/gnome-help/sharing-displayname.page
+share/help/da/gnome-help/sharing-media.page
+share/help/da/gnome-help/sharing-personal.page
+share/help/da/gnome-help/sharing.page
+share/help/da/gnome-help/shell-apps-favorites.page
+share/help/da/gnome-help/shell-apps-open.page
+share/help/da/gnome-help/shell-exit.page
+share/help/da/gnome-help/shell-introduction.page
+share/help/da/gnome-help/shell-keyboard-shortcuts.page
+share/help/da/gnome-help/shell-lockscreen.page
+share/help/da/gnome-help/shell-notifications.page
+share/help/da/gnome-help/shell-overview.page
+share/help/da/gnome-help/shell-windows-lost.page
+share/help/da/gnome-help/shell-windows-maximize.page
+share/help/da/gnome-help/shell-windows-states.page
+share/help/da/gnome-help/shell-windows-switching.page
+share/help/da/gnome-help/shell-windows-tiled.page
+share/help/da/gnome-help/shell-windows.page
+share/help/da/gnome-help/shell-workspaces-movewindow.page
+share/help/da/gnome-help/shell-workspaces-switch.page
+share/help/da/gnome-help/shell-workspaces.page
+share/help/da/gnome-help/sound-alert.page
+share/help/da/gnome-help/sound-broken.page
+share/help/da/gnome-help/sound-crackle.page
+share/help/da/gnome-help/sound-nosound.page
+share/help/da/gnome-help/sound-usemic.page
+share/help/da/gnome-help/sound-usespeakers.page
+share/help/da/gnome-help/sound-volume.page
+share/help/da/gnome-help/status-icons.page
+share/help/da/gnome-help/tips-specialchars.page
+share/help/da/gnome-help/tips.page
+share/help/da/gnome-help/translate.page
+share/help/da/gnome-help/user-accounts.page
+share/help/da/gnome-help/user-add.page
+share/help/da/gnome-help/user-admin-change.page
+share/help/da/gnome-help/user-admin-explain.page
+share/help/da/gnome-help/user-admin-problems.page
+share/help/da/gnome-help/user-autologin.page
+share/help/da/gnome-help/user-changepassword.page
+share/help/da/gnome-help/user-changepicture.page
+share/help/da/gnome-help/user-delete.page
+share/help/da/gnome-help/user-goodpassword.page
+share/help/da/gnome-help/video-dvd.page
+share/help/da/gnome-help/video-sending.page
+share/help/da/gnome-help/wacom-left-handed.page
+share/help/da/gnome-help/wacom-mode.page
+share/help/da/gnome-help/wacom-multi-monitor.page
+share/help/da/gnome-help/wacom-stylus.page
+share/help/da/gnome-help/wacom.page
share/help/de/gnome-help/a11y-bouncekeys.page
share/help/de/gnome-help/a11y-braille.page
share/help/de/gnome-help/a11y-contrast.page
@@ -1641,6 +2145,8 @@ share/help/de/gnome-help/disk-capacity.page
share/help/de/gnome-help/disk-check.page
share/help/de/gnome-help/disk-format.page
share/help/de/gnome-help/disk-partitions.page
+share/help/de/gnome-help/disk-repair.page
+share/help/de/gnome-help/disk-resize.page
share/help/de/gnome-help/disk.page
share/help/de/gnome-help/display-blank.page
share/help/de/gnome-help/display-brightness.page
@@ -1664,7 +2170,6 @@ share/help/de/gnome-help/figures/battery-missing-symbolic.svg
share/help/de/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/de/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/de/gnome-help/figures/bluetooth-menu.png
-share/help/de/gnome-help/figures/camera-photo-symbolic.svg
share/help/de/gnome-help/figures/color-average.png
share/help/de/gnome-help/figures/color-camera.png
share/help/de/gnome-help/figures/color-display.png
@@ -1672,15 +2177,30 @@ share/help/de/gnome-help/figures/color-printer.png
share/help/de/gnome-help/figures/color-profile-default.png
share/help/de/gnome-help/figures/color-space.png
share/help/de/gnome-help/figures/display-dual-monitors.webm
-share/help/de/gnome-help/figures/documents-icon.png
share/help/de/gnome-help/figures/emblem-system-symbolic.svg
share/help/de/gnome-help/figures/emblem-system.png
share/help/de/gnome-help/figures/gnome.png
share/help/de/gnome-help/figures/go-down.png
share/help/de/gnome-help/figures/input-keyboard-symbolic.png
share/help/de/gnome-help/figures/input-methods-switcher.png
+share/help/de/gnome-help/figures/keyboard-key-calculator.svg
+share/help/de/gnome-help/figures/keyboard-key-computer.svg
+share/help/de/gnome-help/figures/keyboard-key-eject.svg
+share/help/de/gnome-help/figures/keyboard-key-folder.svg
+share/help/de/gnome-help/figures/keyboard-key-home.svg
+share/help/de/gnome-help/figures/keyboard-key-mail.svg
+share/help/de/gnome-help/figures/keyboard-key-media.svg
share/help/de/gnome-help/figures/keyboard-key-menu.svg
-share/help/de/gnome-help/figures/nautilus-3-10.png
+share/help/de/gnome-help/figures/keyboard-key-mute.svg
+share/help/de/gnome-help/figures/keyboard-key-next.svg
+share/help/de/gnome-help/figures/keyboard-key-pause.svg
+share/help/de/gnome-help/figures/keyboard-key-play.svg
+share/help/de/gnome-help/figures/keyboard-key-previous.svg
+share/help/de/gnome-help/figures/keyboard-key-search.svg
+share/help/de/gnome-help/figures/keyboard-key-stop.svg
+share/help/de/gnome-help/figures/keyboard-key-voldown.svg
+share/help/de/gnome-help/figures/keyboard-key-volup.svg
+share/help/de/gnome-help/figures/keyboard-key-world.svg
share/help/de/gnome-help/figures/nautilus-icons.png
share/help/de/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/de/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -1714,35 +2234,26 @@ share/help/de/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/de/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/de/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/de/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/de/gnome-help/figures/notification-buttons.png
share/help/de/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/de/gnome-help/figures/printing-select.png
share/help/de/gnome-help/figures/shell-activities-classic.png
share/help/de/gnome-help/figures/shell-activities.png
share/help/de/gnome-help/figures/shell-appmenu-classic.png
share/help/de/gnome-help/figures/shell-appmenu-shell.png
-share/help/de/gnome-help/figures/shell-apps-open.png
share/help/de/gnome-help/figures/shell-appts-classic.png
share/help/de/gnome-help/figures/shell-appts.png
share/help/de/gnome-help/figures/shell-dash.png
share/help/de/gnome-help/figures/shell-exit-classic.png
share/help/de/gnome-help/figures/shell-exit.png
-share/help/de/gnome-help/figures/shell-files.png
-share/help/de/gnome-help/figures/shell-introduction.png
-share/help/de/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/de/gnome-help/figures/shell-lock.png
-share/help/de/gnome-help/figures/shell-notification.png
share/help/de/gnome-help/figures/shell-top-bar-classic.png
share/help/de/gnome-help/figures/shell-top-bar.png
share/help/de/gnome-help/figures/shell-window-list-classic.png
-share/help/de/gnome-help/figures/shell-windows.png
share/help/de/gnome-help/figures/shell-workspaces.png
-share/help/de/gnome-help/figures/shell.png
share/help/de/gnome-help/figures/system-run-symbolic.svg
share/help/de/gnome-help/figures/top-bar-icons-classic.png
share/help/de/gnome-help/figures/top-bar-icons.png
share/help/de/gnome-help/figures/universal-access-menu.png
-share/help/de/gnome-help/figures/view-fullscreen-16.png
share/help/de/gnome-help/figures/view-more-symbolic.svg
share/help/de/gnome-help/figures/yelp-icon-big.png
share/help/de/gnome-help/files-autorun.page
@@ -1853,6 +2364,8 @@ share/help/de/gnome-help/net-wireless-troubleshooting.page
share/help/de/gnome-help/net-wireless-wepwpa.page
share/help/de/gnome-help/net-wireless.page
share/help/de/gnome-help/net.page
+share/help/de/gnome-help/power-autobrightness.page
+share/help/de/gnome-help/power-autosuspend.page
share/help/de/gnome-help/power-batteryestimate.page
share/help/de/gnome-help/power-batterylife.page
share/help/de/gnome-help/power-batteryoptimal.page
@@ -1864,10 +2377,12 @@ share/help/de/gnome-help/power-hotcomputer.page
share/help/de/gnome-help/power-lowpower.page
share/help/de/gnome-help/power-nowireless.page
share/help/de/gnome-help/power-othercountry.page
+share/help/de/gnome-help/power-status.page
share/help/de/gnome-help/power-suspend.page
share/help/de/gnome-help/power-suspendfail.page
share/help/de/gnome-help/power-whydim.page
share/help/de/gnome-help/power-willnotturnon.page
+share/help/de/gnome-help/power-wireless.page
share/help/de/gnome-help/power.page
share/help/de/gnome-help/prefs-display.page
share/help/de/gnome-help/prefs-language.page
@@ -1951,6 +2466,58 @@ share/help/de/gnome-help/wacom-mode.page
share/help/de/gnome-help/wacom-multi-monitor.page
share/help/de/gnome-help/wacom-stylus.page
share/help/de/gnome-help/wacom.page
+share/help/de/system-admin-guide/appearance.page
+share/help/de/system-admin-guide/dconf-custom-defaults.page
+share/help/de/system-admin-guide/dconf-keyfiles.page
+share/help/de/system-admin-guide/dconf-lockdown.page
+share/help/de/system-admin-guide/dconf-nfs-home.page
+share/help/de/system-admin-guide/dconf-profiles.page
+share/help/de/system-admin-guide/dconf-snippets.xml
+share/help/de/system-admin-guide/dconf.page
+share/help/de/system-admin-guide/desktop-background.page
+share/help/de/system-admin-guide/desktop-favorite-applications.page
+share/help/de/system-admin-guide/desktop-lockscreen.page
+share/help/de/system-admin-guide/desktop-shield.page
+share/help/de/system-admin-guide/extensions-enable.page
+share/help/de/system-admin-guide/extensions-lockdown.page
+share/help/de/system-admin-guide/extensions.page
+share/help/de/system-admin-guide/fonts-user.page
+share/help/de/system-admin-guide/fonts.page
+share/help/de/system-admin-guide/index.page
+share/help/de/system-admin-guide/keyboard-layout.page
+share/help/de/system-admin-guide/legal.xml
+share/help/de/system-admin-guide/lockdown-command-line.page
+share/help/de/system-admin-guide/lockdown-file-saving.page
+share/help/de/system-admin-guide/lockdown-online-accounts.page
+share/help/de/system-admin-guide/lockdown-printing.page
+share/help/de/system-admin-guide/lockdown-repartitioning.page
+share/help/de/system-admin-guide/login-automatic.page
+share/help/de/system-admin-guide/login-banner.page
+share/help/de/system-admin-guide/login-enterprise.page
+share/help/de/system-admin-guide/login-fingerprint.page
+share/help/de/system-admin-guide/login-logo.page
+share/help/de/system-admin-guide/login-userlist-disable.page
+share/help/de/system-admin-guide/login.page
+share/help/de/system-admin-guide/logout-automatic.page
+share/help/de/system-admin-guide/mime-types-application-user.page
+share/help/de/system-admin-guide/mime-types-application.page
+share/help/de/system-admin-guide/mime-types-custom-user.page
+share/help/de/system-admin-guide/mime-types-custom.page
+share/help/de/system-admin-guide/mime-types.page
+share/help/de/system-admin-guide/network-printer-config.page
+share/help/de/system-admin-guide/network-server-list.page
+share/help/de/system-admin-guide/network-vpn.page
+share/help/de/system-admin-guide/network.page
+share/help/de/system-admin-guide/overrides.page
+share/help/de/system-admin-guide/power-dim-screen.page
+share/help/de/system-admin-guide/processes.page
+share/help/de/system-admin-guide/session-custom.page
+share/help/de/system-admin-guide/session-debug.page
+share/help/de/system-admin-guide/session-user.page
+share/help/de/system-admin-guide/setup.page
+share/help/de/system-admin-guide/software.page
+share/help/de/system-admin-guide/sundry.page
+share/help/de/system-admin-guide/user-settings.page
share/help/el/gnome-help/a11y-bouncekeys.page
share/help/el/gnome-help/a11y-braille.page
share/help/el/gnome-help/a11y-contrast.page
@@ -2024,6 +2591,8 @@ share/help/el/gnome-help/disk-capacity.page
share/help/el/gnome-help/disk-check.page
share/help/el/gnome-help/disk-format.page
share/help/el/gnome-help/disk-partitions.page
+share/help/el/gnome-help/disk-repair.page
+share/help/el/gnome-help/disk-resize.page
share/help/el/gnome-help/disk.page
share/help/el/gnome-help/display-blank.page
share/help/el/gnome-help/display-brightness.page
@@ -2047,7 +2616,6 @@ share/help/el/gnome-help/figures/battery-missing-symbolic.svg
share/help/el/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/el/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/el/gnome-help/figures/bluetooth-menu.png
-share/help/el/gnome-help/figures/camera-photo-symbolic.svg
share/help/el/gnome-help/figures/color-average.png
share/help/el/gnome-help/figures/color-camera.png
share/help/el/gnome-help/figures/color-display.png
@@ -2055,15 +2623,30 @@ share/help/el/gnome-help/figures/color-printer.png
share/help/el/gnome-help/figures/color-profile-default.png
share/help/el/gnome-help/figures/color-space.png
share/help/el/gnome-help/figures/display-dual-monitors.webm
-share/help/el/gnome-help/figures/documents-icon.png
share/help/el/gnome-help/figures/emblem-system-symbolic.svg
share/help/el/gnome-help/figures/emblem-system.png
share/help/el/gnome-help/figures/gnome.png
share/help/el/gnome-help/figures/go-down.png
share/help/el/gnome-help/figures/input-keyboard-symbolic.png
share/help/el/gnome-help/figures/input-methods-switcher.png
+share/help/el/gnome-help/figures/keyboard-key-calculator.svg
+share/help/el/gnome-help/figures/keyboard-key-computer.svg
+share/help/el/gnome-help/figures/keyboard-key-eject.svg
+share/help/el/gnome-help/figures/keyboard-key-folder.svg
+share/help/el/gnome-help/figures/keyboard-key-home.svg
+share/help/el/gnome-help/figures/keyboard-key-mail.svg
+share/help/el/gnome-help/figures/keyboard-key-media.svg
share/help/el/gnome-help/figures/keyboard-key-menu.svg
-share/help/el/gnome-help/figures/nautilus-3-10.png
+share/help/el/gnome-help/figures/keyboard-key-mute.svg
+share/help/el/gnome-help/figures/keyboard-key-next.svg
+share/help/el/gnome-help/figures/keyboard-key-pause.svg
+share/help/el/gnome-help/figures/keyboard-key-play.svg
+share/help/el/gnome-help/figures/keyboard-key-previous.svg
+share/help/el/gnome-help/figures/keyboard-key-search.svg
+share/help/el/gnome-help/figures/keyboard-key-stop.svg
+share/help/el/gnome-help/figures/keyboard-key-voldown.svg
+share/help/el/gnome-help/figures/keyboard-key-volup.svg
+share/help/el/gnome-help/figures/keyboard-key-world.svg
share/help/el/gnome-help/figures/nautilus-icons.png
share/help/el/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/el/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -2097,35 +2680,26 @@ share/help/el/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/el/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/el/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/el/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/el/gnome-help/figures/notification-buttons.png
share/help/el/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/el/gnome-help/figures/printing-select.png
share/help/el/gnome-help/figures/shell-activities-classic.png
share/help/el/gnome-help/figures/shell-activities.png
share/help/el/gnome-help/figures/shell-appmenu-classic.png
share/help/el/gnome-help/figures/shell-appmenu-shell.png
-share/help/el/gnome-help/figures/shell-apps-open.png
share/help/el/gnome-help/figures/shell-appts-classic.png
share/help/el/gnome-help/figures/shell-appts.png
share/help/el/gnome-help/figures/shell-dash.png
share/help/el/gnome-help/figures/shell-exit-classic.png
share/help/el/gnome-help/figures/shell-exit.png
-share/help/el/gnome-help/figures/shell-files.png
-share/help/el/gnome-help/figures/shell-introduction.png
-share/help/el/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/el/gnome-help/figures/shell-lock.png
-share/help/el/gnome-help/figures/shell-notification.png
share/help/el/gnome-help/figures/shell-top-bar-classic.png
share/help/el/gnome-help/figures/shell-top-bar.png
share/help/el/gnome-help/figures/shell-window-list-classic.png
-share/help/el/gnome-help/figures/shell-windows.png
share/help/el/gnome-help/figures/shell-workspaces.png
-share/help/el/gnome-help/figures/shell.png
share/help/el/gnome-help/figures/system-run-symbolic.svg
share/help/el/gnome-help/figures/top-bar-icons-classic.png
share/help/el/gnome-help/figures/top-bar-icons.png
share/help/el/gnome-help/figures/universal-access-menu.png
-share/help/el/gnome-help/figures/view-fullscreen-16.png
share/help/el/gnome-help/figures/view-more-symbolic.svg
share/help/el/gnome-help/figures/yelp-icon-big.png
share/help/el/gnome-help/files-autorun.page
@@ -2236,6 +2810,8 @@ share/help/el/gnome-help/net-wireless-troubleshooting.page
share/help/el/gnome-help/net-wireless-wepwpa.page
share/help/el/gnome-help/net-wireless.page
share/help/el/gnome-help/net.page
+share/help/el/gnome-help/power-autobrightness.page
+share/help/el/gnome-help/power-autosuspend.page
share/help/el/gnome-help/power-batteryestimate.page
share/help/el/gnome-help/power-batterylife.page
share/help/el/gnome-help/power-batteryoptimal.page
@@ -2247,10 +2823,12 @@ share/help/el/gnome-help/power-hotcomputer.page
share/help/el/gnome-help/power-lowpower.page
share/help/el/gnome-help/power-nowireless.page
share/help/el/gnome-help/power-othercountry.page
+share/help/el/gnome-help/power-status.page
share/help/el/gnome-help/power-suspend.page
share/help/el/gnome-help/power-suspendfail.page
share/help/el/gnome-help/power-whydim.page
share/help/el/gnome-help/power-willnotturnon.page
+share/help/el/gnome-help/power-wireless.page
share/help/el/gnome-help/power.page
share/help/el/gnome-help/prefs-display.page
share/help/el/gnome-help/prefs-language.page
@@ -2407,6 +2985,8 @@ share/help/es/gnome-help/disk-capacity.page
share/help/es/gnome-help/disk-check.page
share/help/es/gnome-help/disk-format.page
share/help/es/gnome-help/disk-partitions.page
+share/help/es/gnome-help/disk-repair.page
+share/help/es/gnome-help/disk-resize.page
share/help/es/gnome-help/disk.page
share/help/es/gnome-help/display-blank.page
share/help/es/gnome-help/display-brightness.page
@@ -2430,7 +3010,6 @@ share/help/es/gnome-help/figures/battery-missing-symbolic.svg
share/help/es/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/es/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/es/gnome-help/figures/bluetooth-menu.png
-share/help/es/gnome-help/figures/camera-photo-symbolic.svg
share/help/es/gnome-help/figures/color-average.png
share/help/es/gnome-help/figures/color-camera.png
share/help/es/gnome-help/figures/color-display.png
@@ -2438,15 +3017,30 @@ share/help/es/gnome-help/figures/color-printer.png
share/help/es/gnome-help/figures/color-profile-default.png
share/help/es/gnome-help/figures/color-space.png
share/help/es/gnome-help/figures/display-dual-monitors.webm
-share/help/es/gnome-help/figures/documents-icon.png
share/help/es/gnome-help/figures/emblem-system-symbolic.svg
share/help/es/gnome-help/figures/emblem-system.png
share/help/es/gnome-help/figures/gnome.png
share/help/es/gnome-help/figures/go-down.png
share/help/es/gnome-help/figures/input-keyboard-symbolic.png
share/help/es/gnome-help/figures/input-methods-switcher.png
+share/help/es/gnome-help/figures/keyboard-key-calculator.svg
+share/help/es/gnome-help/figures/keyboard-key-computer.svg
+share/help/es/gnome-help/figures/keyboard-key-eject.svg
+share/help/es/gnome-help/figures/keyboard-key-folder.svg
+share/help/es/gnome-help/figures/keyboard-key-home.svg
+share/help/es/gnome-help/figures/keyboard-key-mail.svg
+share/help/es/gnome-help/figures/keyboard-key-media.svg
share/help/es/gnome-help/figures/keyboard-key-menu.svg
-share/help/es/gnome-help/figures/nautilus-3-10.png
+share/help/es/gnome-help/figures/keyboard-key-mute.svg
+share/help/es/gnome-help/figures/keyboard-key-next.svg
+share/help/es/gnome-help/figures/keyboard-key-pause.svg
+share/help/es/gnome-help/figures/keyboard-key-play.svg
+share/help/es/gnome-help/figures/keyboard-key-previous.svg
+share/help/es/gnome-help/figures/keyboard-key-search.svg
+share/help/es/gnome-help/figures/keyboard-key-stop.svg
+share/help/es/gnome-help/figures/keyboard-key-voldown.svg
+share/help/es/gnome-help/figures/keyboard-key-volup.svg
+share/help/es/gnome-help/figures/keyboard-key-world.svg
share/help/es/gnome-help/figures/nautilus-icons.png
share/help/es/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/es/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -2480,35 +3074,26 @@ share/help/es/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/es/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/es/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/es/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/es/gnome-help/figures/notification-buttons.png
share/help/es/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/es/gnome-help/figures/printing-select.png
share/help/es/gnome-help/figures/shell-activities-classic.png
share/help/es/gnome-help/figures/shell-activities.png
share/help/es/gnome-help/figures/shell-appmenu-classic.png
share/help/es/gnome-help/figures/shell-appmenu-shell.png
-share/help/es/gnome-help/figures/shell-apps-open.png
share/help/es/gnome-help/figures/shell-appts-classic.png
share/help/es/gnome-help/figures/shell-appts.png
share/help/es/gnome-help/figures/shell-dash.png
share/help/es/gnome-help/figures/shell-exit-classic.png
share/help/es/gnome-help/figures/shell-exit.png
-share/help/es/gnome-help/figures/shell-files.png
-share/help/es/gnome-help/figures/shell-introduction.png
-share/help/es/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/es/gnome-help/figures/shell-lock.png
-share/help/es/gnome-help/figures/shell-notification.png
share/help/es/gnome-help/figures/shell-top-bar-classic.png
share/help/es/gnome-help/figures/shell-top-bar.png
share/help/es/gnome-help/figures/shell-window-list-classic.png
-share/help/es/gnome-help/figures/shell-windows.png
share/help/es/gnome-help/figures/shell-workspaces.png
-share/help/es/gnome-help/figures/shell.png
share/help/es/gnome-help/figures/system-run-symbolic.svg
share/help/es/gnome-help/figures/top-bar-icons-classic.png
share/help/es/gnome-help/figures/top-bar-icons.png
share/help/es/gnome-help/figures/universal-access-menu.png
-share/help/es/gnome-help/figures/view-fullscreen-16.png
share/help/es/gnome-help/figures/view-more-symbolic.svg
share/help/es/gnome-help/figures/yelp-icon-big.png
share/help/es/gnome-help/files-autorun.page
@@ -2619,6 +3204,8 @@ share/help/es/gnome-help/net-wireless-troubleshooting.page
share/help/es/gnome-help/net-wireless-wepwpa.page
share/help/es/gnome-help/net-wireless.page
share/help/es/gnome-help/net.page
+share/help/es/gnome-help/power-autobrightness.page
+share/help/es/gnome-help/power-autosuspend.page
share/help/es/gnome-help/power-batteryestimate.page
share/help/es/gnome-help/power-batterylife.page
share/help/es/gnome-help/power-batteryoptimal.page
@@ -2630,10 +3217,12 @@ share/help/es/gnome-help/power-hotcomputer.page
share/help/es/gnome-help/power-lowpower.page
share/help/es/gnome-help/power-nowireless.page
share/help/es/gnome-help/power-othercountry.page
+share/help/es/gnome-help/power-status.page
share/help/es/gnome-help/power-suspend.page
share/help/es/gnome-help/power-suspendfail.page
share/help/es/gnome-help/power-whydim.page
share/help/es/gnome-help/power-willnotturnon.page
+share/help/es/gnome-help/power-wireless.page
share/help/es/gnome-help/power.page
share/help/es/gnome-help/prefs-display.page
share/help/es/gnome-help/prefs-language.page
@@ -2717,6 +3306,58 @@ share/help/es/gnome-help/wacom-mode.page
share/help/es/gnome-help/wacom-multi-monitor.page
share/help/es/gnome-help/wacom-stylus.page
share/help/es/gnome-help/wacom.page
+share/help/es/system-admin-guide/appearance.page
+share/help/es/system-admin-guide/dconf-custom-defaults.page
+share/help/es/system-admin-guide/dconf-keyfiles.page
+share/help/es/system-admin-guide/dconf-lockdown.page
+share/help/es/system-admin-guide/dconf-nfs-home.page
+share/help/es/system-admin-guide/dconf-profiles.page
+share/help/es/system-admin-guide/dconf-snippets.xml
+share/help/es/system-admin-guide/dconf.page
+share/help/es/system-admin-guide/desktop-background.page
+share/help/es/system-admin-guide/desktop-favorite-applications.page
+share/help/es/system-admin-guide/desktop-lockscreen.page
+share/help/es/system-admin-guide/desktop-shield.page
+share/help/es/system-admin-guide/extensions-enable.page
+share/help/es/system-admin-guide/extensions-lockdown.page
+share/help/es/system-admin-guide/extensions.page
+share/help/es/system-admin-guide/fonts-user.page
+share/help/es/system-admin-guide/fonts.page
+share/help/es/system-admin-guide/index.page
+share/help/es/system-admin-guide/keyboard-layout.page
+share/help/es/system-admin-guide/legal.xml
+share/help/es/system-admin-guide/lockdown-command-line.page
+share/help/es/system-admin-guide/lockdown-file-saving.page
+share/help/es/system-admin-guide/lockdown-online-accounts.page
+share/help/es/system-admin-guide/lockdown-printing.page
+share/help/es/system-admin-guide/lockdown-repartitioning.page
+share/help/es/system-admin-guide/login-automatic.page
+share/help/es/system-admin-guide/login-banner.page
+share/help/es/system-admin-guide/login-enterprise.page
+share/help/es/system-admin-guide/login-fingerprint.page
+share/help/es/system-admin-guide/login-logo.page
+share/help/es/system-admin-guide/login-userlist-disable.page
+share/help/es/system-admin-guide/login.page
+share/help/es/system-admin-guide/logout-automatic.page
+share/help/es/system-admin-guide/mime-types-application-user.page
+share/help/es/system-admin-guide/mime-types-application.page
+share/help/es/system-admin-guide/mime-types-custom-user.page
+share/help/es/system-admin-guide/mime-types-custom.page
+share/help/es/system-admin-guide/mime-types.page
+share/help/es/system-admin-guide/network-printer-config.page
+share/help/es/system-admin-guide/network-server-list.page
+share/help/es/system-admin-guide/network-vpn.page
+share/help/es/system-admin-guide/network.page
+share/help/es/system-admin-guide/overrides.page
+share/help/es/system-admin-guide/power-dim-screen.page
+share/help/es/system-admin-guide/processes.page
+share/help/es/system-admin-guide/session-custom.page
+share/help/es/system-admin-guide/session-debug.page
+share/help/es/system-admin-guide/session-user.page
+share/help/es/system-admin-guide/setup.page
+share/help/es/system-admin-guide/software.page
+share/help/es/system-admin-guide/sundry.page
+share/help/es/system-admin-guide/user-settings.page
share/help/fi/gnome-help/a11y-bouncekeys.page
share/help/fi/gnome-help/a11y-braille.page
share/help/fi/gnome-help/a11y-contrast.page
@@ -2790,6 +3431,8 @@ share/help/fi/gnome-help/disk-capacity.page
share/help/fi/gnome-help/disk-check.page
share/help/fi/gnome-help/disk-format.page
share/help/fi/gnome-help/disk-partitions.page
+share/help/fi/gnome-help/disk-repair.page
+share/help/fi/gnome-help/disk-resize.page
share/help/fi/gnome-help/disk.page
share/help/fi/gnome-help/display-blank.page
share/help/fi/gnome-help/display-brightness.page
@@ -2813,7 +3456,6 @@ share/help/fi/gnome-help/figures/battery-missing-symbolic.svg
share/help/fi/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/fi/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/fi/gnome-help/figures/bluetooth-menu.png
-share/help/fi/gnome-help/figures/camera-photo-symbolic.svg
share/help/fi/gnome-help/figures/color-average.png
share/help/fi/gnome-help/figures/color-camera.png
share/help/fi/gnome-help/figures/color-display.png
@@ -2821,15 +3463,30 @@ share/help/fi/gnome-help/figures/color-printer.png
share/help/fi/gnome-help/figures/color-profile-default.png
share/help/fi/gnome-help/figures/color-space.png
share/help/fi/gnome-help/figures/display-dual-monitors.webm
-share/help/fi/gnome-help/figures/documents-icon.png
share/help/fi/gnome-help/figures/emblem-system-symbolic.svg
share/help/fi/gnome-help/figures/emblem-system.png
share/help/fi/gnome-help/figures/gnome.png
share/help/fi/gnome-help/figures/go-down.png
share/help/fi/gnome-help/figures/input-keyboard-symbolic.png
share/help/fi/gnome-help/figures/input-methods-switcher.png
+share/help/fi/gnome-help/figures/keyboard-key-calculator.svg
+share/help/fi/gnome-help/figures/keyboard-key-computer.svg
+share/help/fi/gnome-help/figures/keyboard-key-eject.svg
+share/help/fi/gnome-help/figures/keyboard-key-folder.svg
+share/help/fi/gnome-help/figures/keyboard-key-home.svg
+share/help/fi/gnome-help/figures/keyboard-key-mail.svg
+share/help/fi/gnome-help/figures/keyboard-key-media.svg
share/help/fi/gnome-help/figures/keyboard-key-menu.svg
-share/help/fi/gnome-help/figures/nautilus-3-10.png
+share/help/fi/gnome-help/figures/keyboard-key-mute.svg
+share/help/fi/gnome-help/figures/keyboard-key-next.svg
+share/help/fi/gnome-help/figures/keyboard-key-pause.svg
+share/help/fi/gnome-help/figures/keyboard-key-play.svg
+share/help/fi/gnome-help/figures/keyboard-key-previous.svg
+share/help/fi/gnome-help/figures/keyboard-key-search.svg
+share/help/fi/gnome-help/figures/keyboard-key-stop.svg
+share/help/fi/gnome-help/figures/keyboard-key-voldown.svg
+share/help/fi/gnome-help/figures/keyboard-key-volup.svg
+share/help/fi/gnome-help/figures/keyboard-key-world.svg
share/help/fi/gnome-help/figures/nautilus-icons.png
share/help/fi/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/fi/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -2863,35 +3520,26 @@ share/help/fi/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/fi/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/fi/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/fi/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/fi/gnome-help/figures/notification-buttons.png
share/help/fi/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/fi/gnome-help/figures/printing-select.png
share/help/fi/gnome-help/figures/shell-activities-classic.png
share/help/fi/gnome-help/figures/shell-activities.png
share/help/fi/gnome-help/figures/shell-appmenu-classic.png
share/help/fi/gnome-help/figures/shell-appmenu-shell.png
-share/help/fi/gnome-help/figures/shell-apps-open.png
share/help/fi/gnome-help/figures/shell-appts-classic.png
share/help/fi/gnome-help/figures/shell-appts.png
share/help/fi/gnome-help/figures/shell-dash.png
share/help/fi/gnome-help/figures/shell-exit-classic.png
share/help/fi/gnome-help/figures/shell-exit.png
-share/help/fi/gnome-help/figures/shell-files.png
-share/help/fi/gnome-help/figures/shell-introduction.png
-share/help/fi/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/fi/gnome-help/figures/shell-lock.png
-share/help/fi/gnome-help/figures/shell-notification.png
share/help/fi/gnome-help/figures/shell-top-bar-classic.png
share/help/fi/gnome-help/figures/shell-top-bar.png
share/help/fi/gnome-help/figures/shell-window-list-classic.png
-share/help/fi/gnome-help/figures/shell-windows.png
share/help/fi/gnome-help/figures/shell-workspaces.png
-share/help/fi/gnome-help/figures/shell.png
share/help/fi/gnome-help/figures/system-run-symbolic.svg
share/help/fi/gnome-help/figures/top-bar-icons-classic.png
share/help/fi/gnome-help/figures/top-bar-icons.png
share/help/fi/gnome-help/figures/universal-access-menu.png
-share/help/fi/gnome-help/figures/view-fullscreen-16.png
share/help/fi/gnome-help/figures/view-more-symbolic.svg
share/help/fi/gnome-help/figures/yelp-icon-big.png
share/help/fi/gnome-help/files-autorun.page
@@ -3002,6 +3650,8 @@ share/help/fi/gnome-help/net-wireless-troubleshooting.page
share/help/fi/gnome-help/net-wireless-wepwpa.page
share/help/fi/gnome-help/net-wireless.page
share/help/fi/gnome-help/net.page
+share/help/fi/gnome-help/power-autobrightness.page
+share/help/fi/gnome-help/power-autosuspend.page
share/help/fi/gnome-help/power-batteryestimate.page
share/help/fi/gnome-help/power-batterylife.page
share/help/fi/gnome-help/power-batteryoptimal.page
@@ -3013,10 +3663,12 @@ share/help/fi/gnome-help/power-hotcomputer.page
share/help/fi/gnome-help/power-lowpower.page
share/help/fi/gnome-help/power-nowireless.page
share/help/fi/gnome-help/power-othercountry.page
+share/help/fi/gnome-help/power-status.page
share/help/fi/gnome-help/power-suspend.page
share/help/fi/gnome-help/power-suspendfail.page
share/help/fi/gnome-help/power-whydim.page
share/help/fi/gnome-help/power-willnotturnon.page
+share/help/fi/gnome-help/power-wireless.page
share/help/fi/gnome-help/power.page
share/help/fi/gnome-help/prefs-display.page
share/help/fi/gnome-help/prefs-language.page
@@ -3173,6 +3825,8 @@ share/help/fr/gnome-help/disk-capacity.page
share/help/fr/gnome-help/disk-check.page
share/help/fr/gnome-help/disk-format.page
share/help/fr/gnome-help/disk-partitions.page
+share/help/fr/gnome-help/disk-repair.page
+share/help/fr/gnome-help/disk-resize.page
share/help/fr/gnome-help/disk.page
share/help/fr/gnome-help/display-blank.page
share/help/fr/gnome-help/display-brightness.page
@@ -3196,7 +3850,6 @@ share/help/fr/gnome-help/figures/battery-missing-symbolic.svg
share/help/fr/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/fr/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/fr/gnome-help/figures/bluetooth-menu.png
-share/help/fr/gnome-help/figures/camera-photo-symbolic.svg
share/help/fr/gnome-help/figures/color-average.png
share/help/fr/gnome-help/figures/color-camera.png
share/help/fr/gnome-help/figures/color-display.png
@@ -3204,15 +3857,30 @@ share/help/fr/gnome-help/figures/color-printer.png
share/help/fr/gnome-help/figures/color-profile-default.png
share/help/fr/gnome-help/figures/color-space.png
share/help/fr/gnome-help/figures/display-dual-monitors.webm
-share/help/fr/gnome-help/figures/documents-icon.png
share/help/fr/gnome-help/figures/emblem-system-symbolic.svg
share/help/fr/gnome-help/figures/emblem-system.png
share/help/fr/gnome-help/figures/gnome.png
share/help/fr/gnome-help/figures/go-down.png
share/help/fr/gnome-help/figures/input-keyboard-symbolic.png
share/help/fr/gnome-help/figures/input-methods-switcher.png
+share/help/fr/gnome-help/figures/keyboard-key-calculator.svg
+share/help/fr/gnome-help/figures/keyboard-key-computer.svg
+share/help/fr/gnome-help/figures/keyboard-key-eject.svg
+share/help/fr/gnome-help/figures/keyboard-key-folder.svg
+share/help/fr/gnome-help/figures/keyboard-key-home.svg
+share/help/fr/gnome-help/figures/keyboard-key-mail.svg
+share/help/fr/gnome-help/figures/keyboard-key-media.svg
share/help/fr/gnome-help/figures/keyboard-key-menu.svg
-share/help/fr/gnome-help/figures/nautilus-3-10.png
+share/help/fr/gnome-help/figures/keyboard-key-mute.svg
+share/help/fr/gnome-help/figures/keyboard-key-next.svg
+share/help/fr/gnome-help/figures/keyboard-key-pause.svg
+share/help/fr/gnome-help/figures/keyboard-key-play.svg
+share/help/fr/gnome-help/figures/keyboard-key-previous.svg
+share/help/fr/gnome-help/figures/keyboard-key-search.svg
+share/help/fr/gnome-help/figures/keyboard-key-stop.svg
+share/help/fr/gnome-help/figures/keyboard-key-voldown.svg
+share/help/fr/gnome-help/figures/keyboard-key-volup.svg
+share/help/fr/gnome-help/figures/keyboard-key-world.svg
share/help/fr/gnome-help/figures/nautilus-icons.png
share/help/fr/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/fr/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -3246,35 +3914,26 @@ share/help/fr/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/fr/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/fr/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/fr/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/fr/gnome-help/figures/notification-buttons.png
share/help/fr/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/fr/gnome-help/figures/printing-select.png
share/help/fr/gnome-help/figures/shell-activities-classic.png
share/help/fr/gnome-help/figures/shell-activities.png
share/help/fr/gnome-help/figures/shell-appmenu-classic.png
share/help/fr/gnome-help/figures/shell-appmenu-shell.png
-share/help/fr/gnome-help/figures/shell-apps-open.png
share/help/fr/gnome-help/figures/shell-appts-classic.png
share/help/fr/gnome-help/figures/shell-appts.png
share/help/fr/gnome-help/figures/shell-dash.png
share/help/fr/gnome-help/figures/shell-exit-classic.png
share/help/fr/gnome-help/figures/shell-exit.png
-share/help/fr/gnome-help/figures/shell-files.png
-share/help/fr/gnome-help/figures/shell-introduction.png
-share/help/fr/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/fr/gnome-help/figures/shell-lock.png
-share/help/fr/gnome-help/figures/shell-notification.png
share/help/fr/gnome-help/figures/shell-top-bar-classic.png
share/help/fr/gnome-help/figures/shell-top-bar.png
share/help/fr/gnome-help/figures/shell-window-list-classic.png
-share/help/fr/gnome-help/figures/shell-windows.png
share/help/fr/gnome-help/figures/shell-workspaces.png
-share/help/fr/gnome-help/figures/shell.png
share/help/fr/gnome-help/figures/system-run-symbolic.svg
share/help/fr/gnome-help/figures/top-bar-icons-classic.png
share/help/fr/gnome-help/figures/top-bar-icons.png
share/help/fr/gnome-help/figures/universal-access-menu.png
-share/help/fr/gnome-help/figures/view-fullscreen-16.png
share/help/fr/gnome-help/figures/view-more-symbolic.svg
share/help/fr/gnome-help/figures/yelp-icon-big.png
share/help/fr/gnome-help/files-autorun.page
@@ -3385,6 +4044,8 @@ share/help/fr/gnome-help/net-wireless-troubleshooting.page
share/help/fr/gnome-help/net-wireless-wepwpa.page
share/help/fr/gnome-help/net-wireless.page
share/help/fr/gnome-help/net.page
+share/help/fr/gnome-help/power-autobrightness.page
+share/help/fr/gnome-help/power-autosuspend.page
share/help/fr/gnome-help/power-batteryestimate.page
share/help/fr/gnome-help/power-batterylife.page
share/help/fr/gnome-help/power-batteryoptimal.page
@@ -3396,10 +4057,12 @@ share/help/fr/gnome-help/power-hotcomputer.page
share/help/fr/gnome-help/power-lowpower.page
share/help/fr/gnome-help/power-nowireless.page
share/help/fr/gnome-help/power-othercountry.page
+share/help/fr/gnome-help/power-status.page
share/help/fr/gnome-help/power-suspend.page
share/help/fr/gnome-help/power-suspendfail.page
share/help/fr/gnome-help/power-whydim.page
share/help/fr/gnome-help/power-willnotturnon.page
+share/help/fr/gnome-help/power-wireless.page
share/help/fr/gnome-help/power.page
share/help/fr/gnome-help/prefs-display.page
share/help/fr/gnome-help/prefs-language.page
@@ -3556,6 +4219,8 @@ share/help/gl/gnome-help/disk-capacity.page
share/help/gl/gnome-help/disk-check.page
share/help/gl/gnome-help/disk-format.page
share/help/gl/gnome-help/disk-partitions.page
+share/help/gl/gnome-help/disk-repair.page
+share/help/gl/gnome-help/disk-resize.page
share/help/gl/gnome-help/disk.page
share/help/gl/gnome-help/display-blank.page
share/help/gl/gnome-help/display-brightness.page
@@ -3579,7 +4244,6 @@ share/help/gl/gnome-help/figures/battery-missing-symbolic.svg
share/help/gl/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/gl/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/gl/gnome-help/figures/bluetooth-menu.png
-share/help/gl/gnome-help/figures/camera-photo-symbolic.svg
share/help/gl/gnome-help/figures/color-average.png
share/help/gl/gnome-help/figures/color-camera.png
share/help/gl/gnome-help/figures/color-display.png
@@ -3587,15 +4251,30 @@ share/help/gl/gnome-help/figures/color-printer.png
share/help/gl/gnome-help/figures/color-profile-default.png
share/help/gl/gnome-help/figures/color-space.png
share/help/gl/gnome-help/figures/display-dual-monitors.webm
-share/help/gl/gnome-help/figures/documents-icon.png
share/help/gl/gnome-help/figures/emblem-system-symbolic.svg
share/help/gl/gnome-help/figures/emblem-system.png
share/help/gl/gnome-help/figures/gnome.png
share/help/gl/gnome-help/figures/go-down.png
share/help/gl/gnome-help/figures/input-keyboard-symbolic.png
share/help/gl/gnome-help/figures/input-methods-switcher.png
+share/help/gl/gnome-help/figures/keyboard-key-calculator.svg
+share/help/gl/gnome-help/figures/keyboard-key-computer.svg
+share/help/gl/gnome-help/figures/keyboard-key-eject.svg
+share/help/gl/gnome-help/figures/keyboard-key-folder.svg
+share/help/gl/gnome-help/figures/keyboard-key-home.svg
+share/help/gl/gnome-help/figures/keyboard-key-mail.svg
+share/help/gl/gnome-help/figures/keyboard-key-media.svg
share/help/gl/gnome-help/figures/keyboard-key-menu.svg
-share/help/gl/gnome-help/figures/nautilus-3-10.png
+share/help/gl/gnome-help/figures/keyboard-key-mute.svg
+share/help/gl/gnome-help/figures/keyboard-key-next.svg
+share/help/gl/gnome-help/figures/keyboard-key-pause.svg
+share/help/gl/gnome-help/figures/keyboard-key-play.svg
+share/help/gl/gnome-help/figures/keyboard-key-previous.svg
+share/help/gl/gnome-help/figures/keyboard-key-search.svg
+share/help/gl/gnome-help/figures/keyboard-key-stop.svg
+share/help/gl/gnome-help/figures/keyboard-key-voldown.svg
+share/help/gl/gnome-help/figures/keyboard-key-volup.svg
+share/help/gl/gnome-help/figures/keyboard-key-world.svg
share/help/gl/gnome-help/figures/nautilus-icons.png
share/help/gl/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/gl/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -3629,35 +4308,26 @@ share/help/gl/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/gl/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/gl/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/gl/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/gl/gnome-help/figures/notification-buttons.png
share/help/gl/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/gl/gnome-help/figures/printing-select.png
share/help/gl/gnome-help/figures/shell-activities-classic.png
share/help/gl/gnome-help/figures/shell-activities.png
share/help/gl/gnome-help/figures/shell-appmenu-classic.png
share/help/gl/gnome-help/figures/shell-appmenu-shell.png
-share/help/gl/gnome-help/figures/shell-apps-open.png
share/help/gl/gnome-help/figures/shell-appts-classic.png
share/help/gl/gnome-help/figures/shell-appts.png
share/help/gl/gnome-help/figures/shell-dash.png
share/help/gl/gnome-help/figures/shell-exit-classic.png
share/help/gl/gnome-help/figures/shell-exit.png
-share/help/gl/gnome-help/figures/shell-files.png
-share/help/gl/gnome-help/figures/shell-introduction.png
-share/help/gl/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/gl/gnome-help/figures/shell-lock.png
-share/help/gl/gnome-help/figures/shell-notification.png
share/help/gl/gnome-help/figures/shell-top-bar-classic.png
share/help/gl/gnome-help/figures/shell-top-bar.png
share/help/gl/gnome-help/figures/shell-window-list-classic.png
-share/help/gl/gnome-help/figures/shell-windows.png
share/help/gl/gnome-help/figures/shell-workspaces.png
-share/help/gl/gnome-help/figures/shell.png
share/help/gl/gnome-help/figures/system-run-symbolic.svg
share/help/gl/gnome-help/figures/top-bar-icons-classic.png
share/help/gl/gnome-help/figures/top-bar-icons.png
share/help/gl/gnome-help/figures/universal-access-menu.png
-share/help/gl/gnome-help/figures/view-fullscreen-16.png
share/help/gl/gnome-help/figures/view-more-symbolic.svg
share/help/gl/gnome-help/figures/yelp-icon-big.png
share/help/gl/gnome-help/files-autorun.page
@@ -3768,6 +4438,8 @@ share/help/gl/gnome-help/net-wireless-troubleshooting.page
share/help/gl/gnome-help/net-wireless-wepwpa.page
share/help/gl/gnome-help/net-wireless.page
share/help/gl/gnome-help/net.page
+share/help/gl/gnome-help/power-autobrightness.page
+share/help/gl/gnome-help/power-autosuspend.page
share/help/gl/gnome-help/power-batteryestimate.page
share/help/gl/gnome-help/power-batterylife.page
share/help/gl/gnome-help/power-batteryoptimal.page
@@ -3779,10 +4451,12 @@ share/help/gl/gnome-help/power-hotcomputer.page
share/help/gl/gnome-help/power-lowpower.page
share/help/gl/gnome-help/power-nowireless.page
share/help/gl/gnome-help/power-othercountry.page
+share/help/gl/gnome-help/power-status.page
share/help/gl/gnome-help/power-suspend.page
share/help/gl/gnome-help/power-suspendfail.page
share/help/gl/gnome-help/power-whydim.page
share/help/gl/gnome-help/power-willnotturnon.page
+share/help/gl/gnome-help/power-wireless.page
share/help/gl/gnome-help/power.page
share/help/gl/gnome-help/prefs-display.page
share/help/gl/gnome-help/prefs-language.page
@@ -3866,6 +4540,58 @@ share/help/gl/gnome-help/wacom-mode.page
share/help/gl/gnome-help/wacom-multi-monitor.page
share/help/gl/gnome-help/wacom-stylus.page
share/help/gl/gnome-help/wacom.page
+share/help/gl/system-admin-guide/appearance.page
+share/help/gl/system-admin-guide/dconf-custom-defaults.page
+share/help/gl/system-admin-guide/dconf-keyfiles.page
+share/help/gl/system-admin-guide/dconf-lockdown.page
+share/help/gl/system-admin-guide/dconf-nfs-home.page
+share/help/gl/system-admin-guide/dconf-profiles.page
+share/help/gl/system-admin-guide/dconf-snippets.xml
+share/help/gl/system-admin-guide/dconf.page
+share/help/gl/system-admin-guide/desktop-background.page
+share/help/gl/system-admin-guide/desktop-favorite-applications.page
+share/help/gl/system-admin-guide/desktop-lockscreen.page
+share/help/gl/system-admin-guide/desktop-shield.page
+share/help/gl/system-admin-guide/extensions-enable.page
+share/help/gl/system-admin-guide/extensions-lockdown.page
+share/help/gl/system-admin-guide/extensions.page
+share/help/gl/system-admin-guide/fonts-user.page
+share/help/gl/system-admin-guide/fonts.page
+share/help/gl/system-admin-guide/index.page
+share/help/gl/system-admin-guide/keyboard-layout.page
+share/help/gl/system-admin-guide/legal.xml
+share/help/gl/system-admin-guide/lockdown-command-line.page
+share/help/gl/system-admin-guide/lockdown-file-saving.page
+share/help/gl/system-admin-guide/lockdown-online-accounts.page
+share/help/gl/system-admin-guide/lockdown-printing.page
+share/help/gl/system-admin-guide/lockdown-repartitioning.page
+share/help/gl/system-admin-guide/login-automatic.page
+share/help/gl/system-admin-guide/login-banner.page
+share/help/gl/system-admin-guide/login-enterprise.page
+share/help/gl/system-admin-guide/login-fingerprint.page
+share/help/gl/system-admin-guide/login-logo.page
+share/help/gl/system-admin-guide/login-userlist-disable.page
+share/help/gl/system-admin-guide/login.page
+share/help/gl/system-admin-guide/logout-automatic.page
+share/help/gl/system-admin-guide/mime-types-application-user.page
+share/help/gl/system-admin-guide/mime-types-application.page
+share/help/gl/system-admin-guide/mime-types-custom-user.page
+share/help/gl/system-admin-guide/mime-types-custom.page
+share/help/gl/system-admin-guide/mime-types.page
+share/help/gl/system-admin-guide/network-printer-config.page
+share/help/gl/system-admin-guide/network-server-list.page
+share/help/gl/system-admin-guide/network-vpn.page
+share/help/gl/system-admin-guide/network.page
+share/help/gl/system-admin-guide/overrides.page
+share/help/gl/system-admin-guide/power-dim-screen.page
+share/help/gl/system-admin-guide/processes.page
+share/help/gl/system-admin-guide/session-custom.page
+share/help/gl/system-admin-guide/session-debug.page
+share/help/gl/system-admin-guide/session-user.page
+share/help/gl/system-admin-guide/setup.page
+share/help/gl/system-admin-guide/software.page
+share/help/gl/system-admin-guide/sundry.page
+share/help/gl/system-admin-guide/user-settings.page
share/help/gu/gnome-help/a11y-bouncekeys.page
share/help/gu/gnome-help/a11y-braille.page
share/help/gu/gnome-help/a11y-contrast.page
@@ -3939,6 +4665,8 @@ share/help/gu/gnome-help/disk-capacity.page
share/help/gu/gnome-help/disk-check.page
share/help/gu/gnome-help/disk-format.page
share/help/gu/gnome-help/disk-partitions.page
+share/help/gu/gnome-help/disk-repair.page
+share/help/gu/gnome-help/disk-resize.page
share/help/gu/gnome-help/disk.page
share/help/gu/gnome-help/display-blank.page
share/help/gu/gnome-help/display-brightness.page
@@ -3962,7 +4690,6 @@ share/help/gu/gnome-help/figures/battery-missing-symbolic.svg
share/help/gu/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/gu/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/gu/gnome-help/figures/bluetooth-menu.png
-share/help/gu/gnome-help/figures/camera-photo-symbolic.svg
share/help/gu/gnome-help/figures/color-average.png
share/help/gu/gnome-help/figures/color-camera.png
share/help/gu/gnome-help/figures/color-display.png
@@ -3970,15 +4697,30 @@ share/help/gu/gnome-help/figures/color-printer.png
share/help/gu/gnome-help/figures/color-profile-default.png
share/help/gu/gnome-help/figures/color-space.png
share/help/gu/gnome-help/figures/display-dual-monitors.webm
-share/help/gu/gnome-help/figures/documents-icon.png
share/help/gu/gnome-help/figures/emblem-system-symbolic.svg
share/help/gu/gnome-help/figures/emblem-system.png
share/help/gu/gnome-help/figures/gnome.png
share/help/gu/gnome-help/figures/go-down.png
share/help/gu/gnome-help/figures/input-keyboard-symbolic.png
share/help/gu/gnome-help/figures/input-methods-switcher.png
+share/help/gu/gnome-help/figures/keyboard-key-calculator.svg
+share/help/gu/gnome-help/figures/keyboard-key-computer.svg
+share/help/gu/gnome-help/figures/keyboard-key-eject.svg
+share/help/gu/gnome-help/figures/keyboard-key-folder.svg
+share/help/gu/gnome-help/figures/keyboard-key-home.svg
+share/help/gu/gnome-help/figures/keyboard-key-mail.svg
+share/help/gu/gnome-help/figures/keyboard-key-media.svg
share/help/gu/gnome-help/figures/keyboard-key-menu.svg
-share/help/gu/gnome-help/figures/nautilus-3-10.png
+share/help/gu/gnome-help/figures/keyboard-key-mute.svg
+share/help/gu/gnome-help/figures/keyboard-key-next.svg
+share/help/gu/gnome-help/figures/keyboard-key-pause.svg
+share/help/gu/gnome-help/figures/keyboard-key-play.svg
+share/help/gu/gnome-help/figures/keyboard-key-previous.svg
+share/help/gu/gnome-help/figures/keyboard-key-search.svg
+share/help/gu/gnome-help/figures/keyboard-key-stop.svg
+share/help/gu/gnome-help/figures/keyboard-key-voldown.svg
+share/help/gu/gnome-help/figures/keyboard-key-volup.svg
+share/help/gu/gnome-help/figures/keyboard-key-world.svg
share/help/gu/gnome-help/figures/nautilus-icons.png
share/help/gu/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/gu/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -4012,35 +4754,26 @@ share/help/gu/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/gu/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/gu/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/gu/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/gu/gnome-help/figures/notification-buttons.png
share/help/gu/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/gu/gnome-help/figures/printing-select.png
share/help/gu/gnome-help/figures/shell-activities-classic.png
share/help/gu/gnome-help/figures/shell-activities.png
share/help/gu/gnome-help/figures/shell-appmenu-classic.png
share/help/gu/gnome-help/figures/shell-appmenu-shell.png
-share/help/gu/gnome-help/figures/shell-apps-open.png
share/help/gu/gnome-help/figures/shell-appts-classic.png
share/help/gu/gnome-help/figures/shell-appts.png
share/help/gu/gnome-help/figures/shell-dash.png
share/help/gu/gnome-help/figures/shell-exit-classic.png
share/help/gu/gnome-help/figures/shell-exit.png
-share/help/gu/gnome-help/figures/shell-files.png
-share/help/gu/gnome-help/figures/shell-introduction.png
-share/help/gu/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/gu/gnome-help/figures/shell-lock.png
-share/help/gu/gnome-help/figures/shell-notification.png
share/help/gu/gnome-help/figures/shell-top-bar-classic.png
share/help/gu/gnome-help/figures/shell-top-bar.png
share/help/gu/gnome-help/figures/shell-window-list-classic.png
-share/help/gu/gnome-help/figures/shell-windows.png
share/help/gu/gnome-help/figures/shell-workspaces.png
-share/help/gu/gnome-help/figures/shell.png
share/help/gu/gnome-help/figures/system-run-symbolic.svg
share/help/gu/gnome-help/figures/top-bar-icons-classic.png
share/help/gu/gnome-help/figures/top-bar-icons.png
share/help/gu/gnome-help/figures/universal-access-menu.png
-share/help/gu/gnome-help/figures/view-fullscreen-16.png
share/help/gu/gnome-help/figures/view-more-symbolic.svg
share/help/gu/gnome-help/figures/yelp-icon-big.png
share/help/gu/gnome-help/files-autorun.page
@@ -4151,6 +4884,8 @@ share/help/gu/gnome-help/net-wireless-troubleshooting.page
share/help/gu/gnome-help/net-wireless-wepwpa.page
share/help/gu/gnome-help/net-wireless.page
share/help/gu/gnome-help/net.page
+share/help/gu/gnome-help/power-autobrightness.page
+share/help/gu/gnome-help/power-autosuspend.page
share/help/gu/gnome-help/power-batteryestimate.page
share/help/gu/gnome-help/power-batterylife.page
share/help/gu/gnome-help/power-batteryoptimal.page
@@ -4162,10 +4897,12 @@ share/help/gu/gnome-help/power-hotcomputer.page
share/help/gu/gnome-help/power-lowpower.page
share/help/gu/gnome-help/power-nowireless.page
share/help/gu/gnome-help/power-othercountry.page
+share/help/gu/gnome-help/power-status.page
share/help/gu/gnome-help/power-suspend.page
share/help/gu/gnome-help/power-suspendfail.page
share/help/gu/gnome-help/power-whydim.page
share/help/gu/gnome-help/power-willnotturnon.page
+share/help/gu/gnome-help/power-wireless.page
share/help/gu/gnome-help/power.page
share/help/gu/gnome-help/prefs-display.page
share/help/gu/gnome-help/prefs-language.page
@@ -4249,6 +4986,400 @@ share/help/gu/gnome-help/wacom-mode.page
share/help/gu/gnome-help/wacom-multi-monitor.page
share/help/gu/gnome-help/wacom-stylus.page
share/help/gu/gnome-help/wacom.page
+share/help/he/gnome-help/a11y-bouncekeys.page
+share/help/he/gnome-help/a11y-braille.page
+share/help/he/gnome-help/a11y-contrast.page
+share/help/he/gnome-help/a11y-dwellclick.page
+share/help/he/gnome-help/a11y-font-size.page
+share/help/he/gnome-help/a11y-icon.page
+share/help/he/gnome-help/a11y-mag.page
+share/help/he/gnome-help/a11y-right-click.page
+share/help/he/gnome-help/a11y-screen-reader.page
+share/help/he/gnome-help/a11y-slowkeys.page
+share/help/he/gnome-help/a11y-stickykeys.page
+share/help/he/gnome-help/a11y-visualalert.page
+share/help/he/gnome-help/a11y.page
+share/help/he/gnome-help/about-this-guide.page
+share/help/he/gnome-help/accounts-add.page
+share/help/he/gnome-help/accounts-disable-service.page
+share/help/he/gnome-help/accounts-provider-not-available.page
+share/help/he/gnome-help/accounts-remove.page
+share/help/he/gnome-help/accounts-which-application.page
+share/help/he/gnome-help/accounts-whyadd.page
+share/help/he/gnome-help/accounts.page
+share/help/he/gnome-help/backup-check.page
+share/help/he/gnome-help/backup-frequency.page
+share/help/he/gnome-help/backup-how.page
+share/help/he/gnome-help/backup-restore.page
+share/help/he/gnome-help/backup-thinkabout.page
+share/help/he/gnome-help/backup-what.page
+share/help/he/gnome-help/backup-where.page
+share/help/he/gnome-help/backup-why.page
+share/help/he/gnome-help/bluetooth-connect-device.page
+share/help/he/gnome-help/bluetooth-problem-connecting.page
+share/help/he/gnome-help/bluetooth-remove-connection.page
+share/help/he/gnome-help/bluetooth-send-file.page
+share/help/he/gnome-help/bluetooth-turn-on-off.page
+share/help/he/gnome-help/bluetooth-visibility.page
+share/help/he/gnome-help/bluetooth.page
+share/help/he/gnome-help/clock-calendar.page
+share/help/he/gnome-help/clock-set.page
+share/help/he/gnome-help/clock-timezone.page
+share/help/he/gnome-help/clock-world.page
+share/help/he/gnome-help/clock.page
+share/help/he/gnome-help/color-assignprofiles.page
+share/help/he/gnome-help/color-calibrate-camera.page
+share/help/he/gnome-help/color-calibrate-printer.page
+share/help/he/gnome-help/color-calibrate-scanner.page
+share/help/he/gnome-help/color-calibrate-screen.page
+share/help/he/gnome-help/color-calibrationcharacterization.page
+share/help/he/gnome-help/color-calibrationdevices.page
+share/help/he/gnome-help/color-calibrationtargets.page
+share/help/he/gnome-help/color-canshareprofiles.page
+share/help/he/gnome-help/color-gettingprofiles.page
+share/help/he/gnome-help/color-howtoimport.page
+share/help/he/gnome-help/color-missingvcgt.page
+share/help/he/gnome-help/color-notifications.page
+share/help/he/gnome-help/color-notspecifiededid.page
+share/help/he/gnome-help/color-testing.page
+share/help/he/gnome-help/color-whatisprofile.page
+share/help/he/gnome-help/color-whatisspace.page
+share/help/he/gnome-help/color-why-calibrate.page
+share/help/he/gnome-help/color-whyimportant.page
+share/help/he/gnome-help/color.page
+share/help/he/gnome-help/contacts-add-remove.page
+share/help/he/gnome-help/contacts-connect.page
+share/help/he/gnome-help/contacts-edit-details.page
+share/help/he/gnome-help/contacts-link-unlink.page
+share/help/he/gnome-help/contacts-search.page
+share/help/he/gnome-help/contacts-setup.page
+share/help/he/gnome-help/contacts.page
+share/help/he/gnome-help/disk-benchmark.page
+share/help/he/gnome-help/disk-capacity.page
+share/help/he/gnome-help/disk-check.page
+share/help/he/gnome-help/disk-format.page
+share/help/he/gnome-help/disk-partitions.page
+share/help/he/gnome-help/disk-repair.page
+share/help/he/gnome-help/disk-resize.page
+share/help/he/gnome-help/disk.page
+share/help/he/gnome-help/display-blank.page
+share/help/he/gnome-help/display-brightness.page
+share/help/he/gnome-help/display-dual-monitors.page
+share/help/he/gnome-help/figures/audio-volume-high-symbolic.svg
+share/help/he/gnome-help/figures/audio-volume-low-symbolic.svg
+share/help/he/gnome-help/figures/audio-volume-medium-symbolic.svg
+share/help/he/gnome-help/figures/audio-volume-muted-symbolic.svg
+share/help/he/gnome-help/figures/battery-caution-charging-symbolic.svg
+share/help/he/gnome-help/figures/battery-caution-symbolic.svg
+share/help/he/gnome-help/figures/battery-empty-charging-symbolic.svg
+share/help/he/gnome-help/figures/battery-empty-symbolic.svg
+share/help/he/gnome-help/figures/battery-full-charged-symbolic.svg
+share/help/he/gnome-help/figures/battery-full-charging-symbolic.svg
+share/help/he/gnome-help/figures/battery-full-symbolic.svg
+share/help/he/gnome-help/figures/battery-good-charging-symbolic.svg
+share/help/he/gnome-help/figures/battery-good-symbolic.svg
+share/help/he/gnome-help/figures/battery-low-charging-symbolic.svg
+share/help/he/gnome-help/figures/battery-low-symbolic.svg
+share/help/he/gnome-help/figures/battery-missing-symbolic.svg
+share/help/he/gnome-help/figures/bluetooth-active-symbolic.svg
+share/help/he/gnome-help/figures/bluetooth-disabled-symbolic.svg
+share/help/he/gnome-help/figures/bluetooth-menu.png
+share/help/he/gnome-help/figures/color-average.png
+share/help/he/gnome-help/figures/color-camera.png
+share/help/he/gnome-help/figures/color-display.png
+share/help/he/gnome-help/figures/color-printer.png
+share/help/he/gnome-help/figures/color-profile-default.png
+share/help/he/gnome-help/figures/color-space.png
+share/help/he/gnome-help/figures/display-dual-monitors.webm
+share/help/he/gnome-help/figures/emblem-system-symbolic.svg
+share/help/he/gnome-help/figures/emblem-system.png
+share/help/he/gnome-help/figures/gnome.png
+share/help/he/gnome-help/figures/go-down.png
+share/help/he/gnome-help/figures/input-keyboard-symbolic.png
+share/help/he/gnome-help/figures/input-methods-switcher.png
+share/help/he/gnome-help/figures/keyboard-key-calculator.svg
+share/help/he/gnome-help/figures/keyboard-key-computer.svg
+share/help/he/gnome-help/figures/keyboard-key-eject.svg
+share/help/he/gnome-help/figures/keyboard-key-folder.svg
+share/help/he/gnome-help/figures/keyboard-key-home.svg
+share/help/he/gnome-help/figures/keyboard-key-mail.svg
+share/help/he/gnome-help/figures/keyboard-key-media.svg
+share/help/he/gnome-help/figures/keyboard-key-menu.svg
+share/help/he/gnome-help/figures/keyboard-key-mute.svg
+share/help/he/gnome-help/figures/keyboard-key-next.svg
+share/help/he/gnome-help/figures/keyboard-key-pause.svg
+share/help/he/gnome-help/figures/keyboard-key-play.svg
+share/help/he/gnome-help/figures/keyboard-key-previous.svg
+share/help/he/gnome-help/figures/keyboard-key-search.svg
+share/help/he/gnome-help/figures/keyboard-key-stop.svg
+share/help/he/gnome-help/figures/keyboard-key-voldown.svg
+share/help/he/gnome-help/figures/keyboard-key-volup.svg
+share/help/he/gnome-help/figures/keyboard-key-world.svg
+share/help/he/gnome-help/figures/nautilus-icons.png
+share/help/he/gnome-help/figures/network-cellular-3g-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-4g-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-acquiring-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-connected-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-edge-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-gprs-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-signal-excellent-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-signal-good-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-signal-none-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-signal-ok-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-signal-weak-symbolic.svg
+share/help/he/gnome-help/figures/network-cellular-umts-symbolic.svg
+share/help/he/gnome-help/figures/network-error-symbolic.svg
+share/help/he/gnome-help/figures/network-idle-symbolic.svg
+share/help/he/gnome-help/figures/network-no-route-symbolic.svg
+share/help/he/gnome-help/figures/network-offline-symbolic.svg
+share/help/he/gnome-help/figures/network-receive-symbolic.svg
+share/help/he/gnome-help/figures/network-transmit-receive-symbolic.svg
+share/help/he/gnome-help/figures/network-transmit-symbolic.svg
+share/help/he/gnome-help/figures/network-vpn-acquiring-symbolic.svg
+share/help/he/gnome-help/figures/network-vpn-symbolic.svg
+share/help/he/gnome-help/figures/network-wired-acquiring-symbolic.svg
+share/help/he/gnome-help/figures/network-wired-disconnected-symbolic.svg
+share/help/he/gnome-help/figures/network-wired-symbolic.svg
+share/help/he/gnome-help/figures/network-wireless-acquiring-symbolic.svg
+share/help/he/gnome-help/figures/network-wireless-connected-symbolic.svg
+share/help/he/gnome-help/figures/network-wireless-encrypted-symbolic.svg
+share/help/he/gnome-help/figures/network-wireless-signal-excellent-symbolic.svg
+share/help/he/gnome-help/figures/network-wireless-signal-good-symbolic.svg
+share/help/he/gnome-help/figures/network-wireless-signal-none-symbolic.svg
+share/help/he/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
+share/help/he/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
+share/help/he/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
+share/help/he/gnome-help/figures/printing-select.png
+share/help/he/gnome-help/figures/shell-activities-classic.png
+share/help/he/gnome-help/figures/shell-activities.png
+share/help/he/gnome-help/figures/shell-appmenu-classic.png
+share/help/he/gnome-help/figures/shell-appmenu-shell.png
+share/help/he/gnome-help/figures/shell-appts-classic.png
+share/help/he/gnome-help/figures/shell-appts.png
+share/help/he/gnome-help/figures/shell-dash.png
+share/help/he/gnome-help/figures/shell-exit-classic.png
+share/help/he/gnome-help/figures/shell-exit.png
+share/help/he/gnome-help/figures/shell-lock.png
+share/help/he/gnome-help/figures/shell-top-bar-classic.png
+share/help/he/gnome-help/figures/shell-top-bar.png
+share/help/he/gnome-help/figures/shell-window-list-classic.png
+share/help/he/gnome-help/figures/shell-workspaces.png
+share/help/he/gnome-help/figures/system-run-symbolic.svg
+share/help/he/gnome-help/figures/top-bar-icons-classic.png
+share/help/he/gnome-help/figures/top-bar-icons.png
+share/help/he/gnome-help/figures/universal-access-menu.png
+share/help/he/gnome-help/figures/view-more-symbolic.svg
+share/help/he/gnome-help/figures/yelp-icon-big.png
+share/help/he/gnome-help/files-autorun.page
+share/help/he/gnome-help/files-browse.page
+share/help/he/gnome-help/files-copy.page
+share/help/he/gnome-help/files-delete.page
+share/help/he/gnome-help/files-disc-write.page
+share/help/he/gnome-help/files-hidden.page
+share/help/he/gnome-help/files-lost.page
+share/help/he/gnome-help/files-open.page
+share/help/he/gnome-help/files-preview.page
+share/help/he/gnome-help/files-recover.page
+share/help/he/gnome-help/files-removedrive.page
+share/help/he/gnome-help/files-rename.page
+share/help/he/gnome-help/files-search.page
+share/help/he/gnome-help/files-select.page
+share/help/he/gnome-help/files-share.page
+share/help/he/gnome-help/files-sort.page
+share/help/he/gnome-help/files-templates.page
+share/help/he/gnome-help/files-tilde.page
+share/help/he/gnome-help/files.page
+share/help/he/gnome-help/get-involved.page
+share/help/he/gnome-help/gnome-classic.page
+share/help/he/gnome-help/gnome-version.page
+share/help/he/gnome-help/hardware-auth.page
+share/help/he/gnome-help/hardware-cardreader.page
+share/help/he/gnome-help/hardware-driver.page
+share/help/he/gnome-help/hardware-problems-graphics.page
+share/help/he/gnome-help/hardware.page
+share/help/he/gnome-help/help-irc.page
+share/help/he/gnome-help/help-mailing-list.page
+share/help/he/gnome-help/index.page
+share/help/he/gnome-help/keyboard-cursor-blink.page
+share/help/he/gnome-help/keyboard-key-menu.page
+share/help/he/gnome-help/keyboard-key-super.page
+share/help/he/gnome-help/keyboard-layouts.page
+share/help/he/gnome-help/keyboard-nav.page
+share/help/he/gnome-help/keyboard-osk.page
+share/help/he/gnome-help/keyboard-repeat-keys.page
+share/help/he/gnome-help/keyboard-shortcuts-set.page
+share/help/he/gnome-help/keyboard.page
+share/help/he/gnome-help/legal.xml
+share/help/he/gnome-help/look-background.page
+share/help/he/gnome-help/look-display-fuzzy.page
+share/help/he/gnome-help/look-resolution.page
+share/help/he/gnome-help/media.page
+share/help/he/gnome-help/more-help.page
+share/help/he/gnome-help/mouse-doubleclick.page
+share/help/he/gnome-help/mouse-lefthanded.page
+share/help/he/gnome-help/mouse-middleclick.page
+share/help/he/gnome-help/mouse-mousekeys.page
+share/help/he/gnome-help/mouse-problem-notmoving.page
+share/help/he/gnome-help/mouse-sensitivity.page
+share/help/he/gnome-help/mouse-touchpad-click.page
+share/help/he/gnome-help/mouse-wakeup.page
+share/help/he/gnome-help/mouse.page
+share/help/he/gnome-help/music-cantplay-drm.page
+share/help/he/gnome-help/music-player-ipodtransfer.page
+share/help/he/gnome-help/music-player-newipod.page
+share/help/he/gnome-help/nautilus-behavior.page
+share/help/he/gnome-help/nautilus-bookmarks-edit.page
+share/help/he/gnome-help/nautilus-connect.page
+share/help/he/gnome-help/nautilus-display.page
+share/help/he/gnome-help/nautilus-file-properties-basic.page
+share/help/he/gnome-help/nautilus-file-properties-permissions.page
+share/help/he/gnome-help/nautilus-list.page
+share/help/he/gnome-help/nautilus-prefs.page
+share/help/he/gnome-help/nautilus-preview.page
+share/help/he/gnome-help/nautilus-views.page
+share/help/he/gnome-help/net-antivirus.page
+share/help/he/gnome-help/net-browser.page
+share/help/he/gnome-help/net-default-browser.page
+share/help/he/gnome-help/net-default-email.page
+share/help/he/gnome-help/net-email-virus.page
+share/help/he/gnome-help/net-email.page
+share/help/he/gnome-help/net-findip.page
+share/help/he/gnome-help/net-firewall-on-off.page
+share/help/he/gnome-help/net-firewall-ports.page
+share/help/he/gnome-help/net-fixed-ip-address.page
+share/help/he/gnome-help/net-general.page
+share/help/he/gnome-help/net-install-flash.page
+share/help/he/gnome-help/net-macaddress.page
+share/help/he/gnome-help/net-manual.page
+share/help/he/gnome-help/net-mobile.page
+share/help/he/gnome-help/net-othersconnect.page
+share/help/he/gnome-help/net-othersedit.page
+share/help/he/gnome-help/net-problem.page
+share/help/he/gnome-help/net-proxy.page
+share/help/he/gnome-help/net-security-tips.page
+share/help/he/gnome-help/net-security.page
+share/help/he/gnome-help/net-slow.page
+share/help/he/gnome-help/net-vpn-connect.page
+share/help/he/gnome-help/net-what-is-ip-address.page
+share/help/he/gnome-help/net-wired-connect.page
+share/help/he/gnome-help/net-wired.page
+share/help/he/gnome-help/net-wireless-adhoc.page
+share/help/he/gnome-help/net-wireless-airplane.page
+share/help/he/gnome-help/net-wireless-connect.page
+share/help/he/gnome-help/net-wireless-disconnecting.page
+share/help/he/gnome-help/net-wireless-find.page
+share/help/he/gnome-help/net-wireless-hidden.page
+share/help/he/gnome-help/net-wireless-noconnection.page
+share/help/he/gnome-help/net-wireless-troubleshooting-device-drivers.page
+share/help/he/gnome-help/net-wireless-troubleshooting-hardware-check.page
+share/help/he/gnome-help/net-wireless-troubleshooting-hardware-info.page
+share/help/he/gnome-help/net-wireless-troubleshooting-initial-check.page
+share/help/he/gnome-help/net-wireless-troubleshooting.page
+share/help/he/gnome-help/net-wireless-wepwpa.page
+share/help/he/gnome-help/net-wireless.page
+share/help/he/gnome-help/net.page
+share/help/he/gnome-help/power-autobrightness.page
+share/help/he/gnome-help/power-autosuspend.page
+share/help/he/gnome-help/power-batteryestimate.page
+share/help/he/gnome-help/power-batterylife.page
+share/help/he/gnome-help/power-batteryoptimal.page
+share/help/he/gnome-help/power-batteryslow.page
+share/help/he/gnome-help/power-batterywindows.page
+share/help/he/gnome-help/power-closelid.page
+share/help/he/gnome-help/power-constantfan.page
+share/help/he/gnome-help/power-hotcomputer.page
+share/help/he/gnome-help/power-lowpower.page
+share/help/he/gnome-help/power-nowireless.page
+share/help/he/gnome-help/power-othercountry.page
+share/help/he/gnome-help/power-status.page
+share/help/he/gnome-help/power-suspend.page
+share/help/he/gnome-help/power-suspendfail.page
+share/help/he/gnome-help/power-whydim.page
+share/help/he/gnome-help/power-willnotturnon.page
+share/help/he/gnome-help/power-wireless.page
+share/help/he/gnome-help/power.page
+share/help/he/gnome-help/prefs-display.page
+share/help/he/gnome-help/prefs-language.page
+share/help/he/gnome-help/prefs-sharing.page
+share/help/he/gnome-help/prefs.page
+share/help/he/gnome-help/printing-2sided.page
+share/help/he/gnome-help/printing-booklet-duplex.page
+share/help/he/gnome-help/printing-booklet-singlesided.page
+share/help/he/gnome-help/printing-booklet.page
+share/help/he/gnome-help/printing-cancel-job.page
+share/help/he/gnome-help/printing-differentsize.page
+share/help/he/gnome-help/printing-envelopes.page
+share/help/he/gnome-help/printing-inklevel.page
+share/help/he/gnome-help/printing-name-location.page
+share/help/he/gnome-help/printing-order.page
+share/help/he/gnome-help/printing-paperjam.page
+share/help/he/gnome-help/printing-select.page
+share/help/he/gnome-help/printing-setup-default-printer.page
+share/help/he/gnome-help/printing-setup.page
+share/help/he/gnome-help/printing-streaks.page
+share/help/he/gnome-help/printing-to-file.page
+share/help/he/gnome-help/printing.page
+share/help/he/gnome-help/privacy-history-recent-off.page
+share/help/he/gnome-help/privacy-location.page
+share/help/he/gnome-help/privacy-purge.page
+share/help/he/gnome-help/privacy-screen-lock.page
+share/help/he/gnome-help/privacy.page
+share/help/he/gnome-help/screen-shot-record.page
+share/help/he/gnome-help/session-fingerprint.page
+share/help/he/gnome-help/session-formats.page
+share/help/he/gnome-help/session-language.page
+share/help/he/gnome-help/session-screenlocks.page
+share/help/he/gnome-help/sharing-bluetooth.page
+share/help/he/gnome-help/sharing-desktop.page
+share/help/he/gnome-help/sharing-displayname.page
+share/help/he/gnome-help/sharing-media.page
+share/help/he/gnome-help/sharing-personal.page
+share/help/he/gnome-help/sharing.page
+share/help/he/gnome-help/shell-apps-favorites.page
+share/help/he/gnome-help/shell-apps-open.page
+share/help/he/gnome-help/shell-exit.page
+share/help/he/gnome-help/shell-introduction.page
+share/help/he/gnome-help/shell-keyboard-shortcuts.page
+share/help/he/gnome-help/shell-lockscreen.page
+share/help/he/gnome-help/shell-notifications.page
+share/help/he/gnome-help/shell-overview.page
+share/help/he/gnome-help/shell-windows-lost.page
+share/help/he/gnome-help/shell-windows-maximize.page
+share/help/he/gnome-help/shell-windows-states.page
+share/help/he/gnome-help/shell-windows-switching.page
+share/help/he/gnome-help/shell-windows-tiled.page
+share/help/he/gnome-help/shell-windows.page
+share/help/he/gnome-help/shell-workspaces-movewindow.page
+share/help/he/gnome-help/shell-workspaces-switch.page
+share/help/he/gnome-help/shell-workspaces.page
+share/help/he/gnome-help/sound-alert.page
+share/help/he/gnome-help/sound-broken.page
+share/help/he/gnome-help/sound-crackle.page
+share/help/he/gnome-help/sound-nosound.page
+share/help/he/gnome-help/sound-usemic.page
+share/help/he/gnome-help/sound-usespeakers.page
+share/help/he/gnome-help/sound-volume.page
+share/help/he/gnome-help/status-icons.page
+share/help/he/gnome-help/tips-specialchars.page
+share/help/he/gnome-help/tips.page
+share/help/he/gnome-help/translate.page
+share/help/he/gnome-help/user-accounts.page
+share/help/he/gnome-help/user-add.page
+share/help/he/gnome-help/user-admin-change.page
+share/help/he/gnome-help/user-admin-explain.page
+share/help/he/gnome-help/user-admin-problems.page
+share/help/he/gnome-help/user-autologin.page
+share/help/he/gnome-help/user-changepassword.page
+share/help/he/gnome-help/user-changepicture.page
+share/help/he/gnome-help/user-delete.page
+share/help/he/gnome-help/user-goodpassword.page
+share/help/he/gnome-help/video-dvd.page
+share/help/he/gnome-help/video-sending.page
+share/help/he/gnome-help/wacom-left-handed.page
+share/help/he/gnome-help/wacom-mode.page
+share/help/he/gnome-help/wacom-multi-monitor.page
+share/help/he/gnome-help/wacom-stylus.page
+share/help/he/gnome-help/wacom.page
share/help/hi/gnome-help/a11y-bouncekeys.page
share/help/hi/gnome-help/a11y-braille.page
share/help/hi/gnome-help/a11y-contrast.page
@@ -4322,6 +5453,8 @@ share/help/hi/gnome-help/disk-capacity.page
share/help/hi/gnome-help/disk-check.page
share/help/hi/gnome-help/disk-format.page
share/help/hi/gnome-help/disk-partitions.page
+share/help/hi/gnome-help/disk-repair.page
+share/help/hi/gnome-help/disk-resize.page
share/help/hi/gnome-help/disk.page
share/help/hi/gnome-help/display-blank.page
share/help/hi/gnome-help/display-brightness.page
@@ -4345,7 +5478,6 @@ share/help/hi/gnome-help/figures/battery-missing-symbolic.svg
share/help/hi/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/hi/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/hi/gnome-help/figures/bluetooth-menu.png
-share/help/hi/gnome-help/figures/camera-photo-symbolic.svg
share/help/hi/gnome-help/figures/color-average.png
share/help/hi/gnome-help/figures/color-camera.png
share/help/hi/gnome-help/figures/color-display.png
@@ -4353,15 +5485,30 @@ share/help/hi/gnome-help/figures/color-printer.png
share/help/hi/gnome-help/figures/color-profile-default.png
share/help/hi/gnome-help/figures/color-space.png
share/help/hi/gnome-help/figures/display-dual-monitors.webm
-share/help/hi/gnome-help/figures/documents-icon.png
share/help/hi/gnome-help/figures/emblem-system-symbolic.svg
share/help/hi/gnome-help/figures/emblem-system.png
share/help/hi/gnome-help/figures/gnome.png
share/help/hi/gnome-help/figures/go-down.png
share/help/hi/gnome-help/figures/input-keyboard-symbolic.png
share/help/hi/gnome-help/figures/input-methods-switcher.png
+share/help/hi/gnome-help/figures/keyboard-key-calculator.svg
+share/help/hi/gnome-help/figures/keyboard-key-computer.svg
+share/help/hi/gnome-help/figures/keyboard-key-eject.svg
+share/help/hi/gnome-help/figures/keyboard-key-folder.svg
+share/help/hi/gnome-help/figures/keyboard-key-home.svg
+share/help/hi/gnome-help/figures/keyboard-key-mail.svg
+share/help/hi/gnome-help/figures/keyboard-key-media.svg
share/help/hi/gnome-help/figures/keyboard-key-menu.svg
-share/help/hi/gnome-help/figures/nautilus-3-10.png
+share/help/hi/gnome-help/figures/keyboard-key-mute.svg
+share/help/hi/gnome-help/figures/keyboard-key-next.svg
+share/help/hi/gnome-help/figures/keyboard-key-pause.svg
+share/help/hi/gnome-help/figures/keyboard-key-play.svg
+share/help/hi/gnome-help/figures/keyboard-key-previous.svg
+share/help/hi/gnome-help/figures/keyboard-key-search.svg
+share/help/hi/gnome-help/figures/keyboard-key-stop.svg
+share/help/hi/gnome-help/figures/keyboard-key-voldown.svg
+share/help/hi/gnome-help/figures/keyboard-key-volup.svg
+share/help/hi/gnome-help/figures/keyboard-key-world.svg
share/help/hi/gnome-help/figures/nautilus-icons.png
share/help/hi/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/hi/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -4395,35 +5542,26 @@ share/help/hi/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/hi/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/hi/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/hi/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/hi/gnome-help/figures/notification-buttons.png
share/help/hi/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/hi/gnome-help/figures/printing-select.png
share/help/hi/gnome-help/figures/shell-activities-classic.png
share/help/hi/gnome-help/figures/shell-activities.png
share/help/hi/gnome-help/figures/shell-appmenu-classic.png
share/help/hi/gnome-help/figures/shell-appmenu-shell.png
-share/help/hi/gnome-help/figures/shell-apps-open.png
share/help/hi/gnome-help/figures/shell-appts-classic.png
share/help/hi/gnome-help/figures/shell-appts.png
share/help/hi/gnome-help/figures/shell-dash.png
share/help/hi/gnome-help/figures/shell-exit-classic.png
share/help/hi/gnome-help/figures/shell-exit.png
-share/help/hi/gnome-help/figures/shell-files.png
-share/help/hi/gnome-help/figures/shell-introduction.png
-share/help/hi/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/hi/gnome-help/figures/shell-lock.png
-share/help/hi/gnome-help/figures/shell-notification.png
share/help/hi/gnome-help/figures/shell-top-bar-classic.png
share/help/hi/gnome-help/figures/shell-top-bar.png
share/help/hi/gnome-help/figures/shell-window-list-classic.png
-share/help/hi/gnome-help/figures/shell-windows.png
share/help/hi/gnome-help/figures/shell-workspaces.png
-share/help/hi/gnome-help/figures/shell.png
share/help/hi/gnome-help/figures/system-run-symbolic.svg
share/help/hi/gnome-help/figures/top-bar-icons-classic.png
share/help/hi/gnome-help/figures/top-bar-icons.png
share/help/hi/gnome-help/figures/universal-access-menu.png
-share/help/hi/gnome-help/figures/view-fullscreen-16.png
share/help/hi/gnome-help/figures/view-more-symbolic.svg
share/help/hi/gnome-help/figures/yelp-icon-big.png
share/help/hi/gnome-help/files-autorun.page
@@ -4534,6 +5672,8 @@ share/help/hi/gnome-help/net-wireless-troubleshooting.page
share/help/hi/gnome-help/net-wireless-wepwpa.page
share/help/hi/gnome-help/net-wireless.page
share/help/hi/gnome-help/net.page
+share/help/hi/gnome-help/power-autobrightness.page
+share/help/hi/gnome-help/power-autosuspend.page
share/help/hi/gnome-help/power-batteryestimate.page
share/help/hi/gnome-help/power-batterylife.page
share/help/hi/gnome-help/power-batteryoptimal.page
@@ -4545,10 +5685,12 @@ share/help/hi/gnome-help/power-hotcomputer.page
share/help/hi/gnome-help/power-lowpower.page
share/help/hi/gnome-help/power-nowireless.page
share/help/hi/gnome-help/power-othercountry.page
+share/help/hi/gnome-help/power-status.page
share/help/hi/gnome-help/power-suspend.page
share/help/hi/gnome-help/power-suspendfail.page
share/help/hi/gnome-help/power-whydim.page
share/help/hi/gnome-help/power-willnotturnon.page
+share/help/hi/gnome-help/power-wireless.page
share/help/hi/gnome-help/power.page
share/help/hi/gnome-help/prefs-display.page
share/help/hi/gnome-help/prefs-language.page
@@ -4632,6 +5774,400 @@ share/help/hi/gnome-help/wacom-mode.page
share/help/hi/gnome-help/wacom-multi-monitor.page
share/help/hi/gnome-help/wacom-stylus.page
share/help/hi/gnome-help/wacom.page
+share/help/hr/gnome-help/a11y-bouncekeys.page
+share/help/hr/gnome-help/a11y-braille.page
+share/help/hr/gnome-help/a11y-contrast.page
+share/help/hr/gnome-help/a11y-dwellclick.page
+share/help/hr/gnome-help/a11y-font-size.page
+share/help/hr/gnome-help/a11y-icon.page
+share/help/hr/gnome-help/a11y-mag.page
+share/help/hr/gnome-help/a11y-right-click.page
+share/help/hr/gnome-help/a11y-screen-reader.page
+share/help/hr/gnome-help/a11y-slowkeys.page
+share/help/hr/gnome-help/a11y-stickykeys.page
+share/help/hr/gnome-help/a11y-visualalert.page
+share/help/hr/gnome-help/a11y.page
+share/help/hr/gnome-help/about-this-guide.page
+share/help/hr/gnome-help/accounts-add.page
+share/help/hr/gnome-help/accounts-disable-service.page
+share/help/hr/gnome-help/accounts-provider-not-available.page
+share/help/hr/gnome-help/accounts-remove.page
+share/help/hr/gnome-help/accounts-which-application.page
+share/help/hr/gnome-help/accounts-whyadd.page
+share/help/hr/gnome-help/accounts.page
+share/help/hr/gnome-help/backup-check.page
+share/help/hr/gnome-help/backup-frequency.page
+share/help/hr/gnome-help/backup-how.page
+share/help/hr/gnome-help/backup-restore.page
+share/help/hr/gnome-help/backup-thinkabout.page
+share/help/hr/gnome-help/backup-what.page
+share/help/hr/gnome-help/backup-where.page
+share/help/hr/gnome-help/backup-why.page
+share/help/hr/gnome-help/bluetooth-connect-device.page
+share/help/hr/gnome-help/bluetooth-problem-connecting.page
+share/help/hr/gnome-help/bluetooth-remove-connection.page
+share/help/hr/gnome-help/bluetooth-send-file.page
+share/help/hr/gnome-help/bluetooth-turn-on-off.page
+share/help/hr/gnome-help/bluetooth-visibility.page
+share/help/hr/gnome-help/bluetooth.page
+share/help/hr/gnome-help/clock-calendar.page
+share/help/hr/gnome-help/clock-set.page
+share/help/hr/gnome-help/clock-timezone.page
+share/help/hr/gnome-help/clock-world.page
+share/help/hr/gnome-help/clock.page
+share/help/hr/gnome-help/color-assignprofiles.page
+share/help/hr/gnome-help/color-calibrate-camera.page
+share/help/hr/gnome-help/color-calibrate-printer.page
+share/help/hr/gnome-help/color-calibrate-scanner.page
+share/help/hr/gnome-help/color-calibrate-screen.page
+share/help/hr/gnome-help/color-calibrationcharacterization.page
+share/help/hr/gnome-help/color-calibrationdevices.page
+share/help/hr/gnome-help/color-calibrationtargets.page
+share/help/hr/gnome-help/color-canshareprofiles.page
+share/help/hr/gnome-help/color-gettingprofiles.page
+share/help/hr/gnome-help/color-howtoimport.page
+share/help/hr/gnome-help/color-missingvcgt.page
+share/help/hr/gnome-help/color-notifications.page
+share/help/hr/gnome-help/color-notspecifiededid.page
+share/help/hr/gnome-help/color-testing.page
+share/help/hr/gnome-help/color-whatisprofile.page
+share/help/hr/gnome-help/color-whatisspace.page
+share/help/hr/gnome-help/color-why-calibrate.page
+share/help/hr/gnome-help/color-whyimportant.page
+share/help/hr/gnome-help/color.page
+share/help/hr/gnome-help/contacts-add-remove.page
+share/help/hr/gnome-help/contacts-connect.page
+share/help/hr/gnome-help/contacts-edit-details.page
+share/help/hr/gnome-help/contacts-link-unlink.page
+share/help/hr/gnome-help/contacts-search.page
+share/help/hr/gnome-help/contacts-setup.page
+share/help/hr/gnome-help/contacts.page
+share/help/hr/gnome-help/disk-benchmark.page
+share/help/hr/gnome-help/disk-capacity.page
+share/help/hr/gnome-help/disk-check.page
+share/help/hr/gnome-help/disk-format.page
+share/help/hr/gnome-help/disk-partitions.page
+share/help/hr/gnome-help/disk-repair.page
+share/help/hr/gnome-help/disk-resize.page
+share/help/hr/gnome-help/disk.page
+share/help/hr/gnome-help/display-blank.page
+share/help/hr/gnome-help/display-brightness.page
+share/help/hr/gnome-help/display-dual-monitors.page
+share/help/hr/gnome-help/figures/audio-volume-high-symbolic.svg
+share/help/hr/gnome-help/figures/audio-volume-low-symbolic.svg
+share/help/hr/gnome-help/figures/audio-volume-medium-symbolic.svg
+share/help/hr/gnome-help/figures/audio-volume-muted-symbolic.svg
+share/help/hr/gnome-help/figures/battery-caution-charging-symbolic.svg
+share/help/hr/gnome-help/figures/battery-caution-symbolic.svg
+share/help/hr/gnome-help/figures/battery-empty-charging-symbolic.svg
+share/help/hr/gnome-help/figures/battery-empty-symbolic.svg
+share/help/hr/gnome-help/figures/battery-full-charged-symbolic.svg
+share/help/hr/gnome-help/figures/battery-full-charging-symbolic.svg
+share/help/hr/gnome-help/figures/battery-full-symbolic.svg
+share/help/hr/gnome-help/figures/battery-good-charging-symbolic.svg
+share/help/hr/gnome-help/figures/battery-good-symbolic.svg
+share/help/hr/gnome-help/figures/battery-low-charging-symbolic.svg
+share/help/hr/gnome-help/figures/battery-low-symbolic.svg
+share/help/hr/gnome-help/figures/battery-missing-symbolic.svg
+share/help/hr/gnome-help/figures/bluetooth-active-symbolic.svg
+share/help/hr/gnome-help/figures/bluetooth-disabled-symbolic.svg
+share/help/hr/gnome-help/figures/bluetooth-menu.png
+share/help/hr/gnome-help/figures/color-average.png
+share/help/hr/gnome-help/figures/color-camera.png
+share/help/hr/gnome-help/figures/color-display.png
+share/help/hr/gnome-help/figures/color-printer.png
+share/help/hr/gnome-help/figures/color-profile-default.png
+share/help/hr/gnome-help/figures/color-space.png
+share/help/hr/gnome-help/figures/display-dual-monitors.webm
+share/help/hr/gnome-help/figures/emblem-system-symbolic.svg
+share/help/hr/gnome-help/figures/emblem-system.png
+share/help/hr/gnome-help/figures/gnome.png
+share/help/hr/gnome-help/figures/go-down.png
+share/help/hr/gnome-help/figures/input-keyboard-symbolic.png
+share/help/hr/gnome-help/figures/input-methods-switcher.png
+share/help/hr/gnome-help/figures/keyboard-key-calculator.svg
+share/help/hr/gnome-help/figures/keyboard-key-computer.svg
+share/help/hr/gnome-help/figures/keyboard-key-eject.svg
+share/help/hr/gnome-help/figures/keyboard-key-folder.svg
+share/help/hr/gnome-help/figures/keyboard-key-home.svg
+share/help/hr/gnome-help/figures/keyboard-key-mail.svg
+share/help/hr/gnome-help/figures/keyboard-key-media.svg
+share/help/hr/gnome-help/figures/keyboard-key-menu.svg
+share/help/hr/gnome-help/figures/keyboard-key-mute.svg
+share/help/hr/gnome-help/figures/keyboard-key-next.svg
+share/help/hr/gnome-help/figures/keyboard-key-pause.svg
+share/help/hr/gnome-help/figures/keyboard-key-play.svg
+share/help/hr/gnome-help/figures/keyboard-key-previous.svg
+share/help/hr/gnome-help/figures/keyboard-key-search.svg
+share/help/hr/gnome-help/figures/keyboard-key-stop.svg
+share/help/hr/gnome-help/figures/keyboard-key-voldown.svg
+share/help/hr/gnome-help/figures/keyboard-key-volup.svg
+share/help/hr/gnome-help/figures/keyboard-key-world.svg
+share/help/hr/gnome-help/figures/nautilus-icons.png
+share/help/hr/gnome-help/figures/network-cellular-3g-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-4g-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-acquiring-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-connected-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-edge-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-gprs-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-signal-excellent-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-signal-good-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-signal-none-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-signal-ok-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-signal-weak-symbolic.svg
+share/help/hr/gnome-help/figures/network-cellular-umts-symbolic.svg
+share/help/hr/gnome-help/figures/network-error-symbolic.svg
+share/help/hr/gnome-help/figures/network-idle-symbolic.svg
+share/help/hr/gnome-help/figures/network-no-route-symbolic.svg
+share/help/hr/gnome-help/figures/network-offline-symbolic.svg
+share/help/hr/gnome-help/figures/network-receive-symbolic.svg
+share/help/hr/gnome-help/figures/network-transmit-receive-symbolic.svg
+share/help/hr/gnome-help/figures/network-transmit-symbolic.svg
+share/help/hr/gnome-help/figures/network-vpn-acquiring-symbolic.svg
+share/help/hr/gnome-help/figures/network-vpn-symbolic.svg
+share/help/hr/gnome-help/figures/network-wired-acquiring-symbolic.svg
+share/help/hr/gnome-help/figures/network-wired-disconnected-symbolic.svg
+share/help/hr/gnome-help/figures/network-wired-symbolic.svg
+share/help/hr/gnome-help/figures/network-wireless-acquiring-symbolic.svg
+share/help/hr/gnome-help/figures/network-wireless-connected-symbolic.svg
+share/help/hr/gnome-help/figures/network-wireless-encrypted-symbolic.svg
+share/help/hr/gnome-help/figures/network-wireless-signal-excellent-symbolic.svg
+share/help/hr/gnome-help/figures/network-wireless-signal-good-symbolic.svg
+share/help/hr/gnome-help/figures/network-wireless-signal-none-symbolic.svg
+share/help/hr/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
+share/help/hr/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
+share/help/hr/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
+share/help/hr/gnome-help/figures/printing-select.png
+share/help/hr/gnome-help/figures/shell-activities-classic.png
+share/help/hr/gnome-help/figures/shell-activities.png
+share/help/hr/gnome-help/figures/shell-appmenu-classic.png
+share/help/hr/gnome-help/figures/shell-appmenu-shell.png
+share/help/hr/gnome-help/figures/shell-appts-classic.png
+share/help/hr/gnome-help/figures/shell-appts.png
+share/help/hr/gnome-help/figures/shell-dash.png
+share/help/hr/gnome-help/figures/shell-exit-classic.png
+share/help/hr/gnome-help/figures/shell-exit.png
+share/help/hr/gnome-help/figures/shell-lock.png
+share/help/hr/gnome-help/figures/shell-top-bar-classic.png
+share/help/hr/gnome-help/figures/shell-top-bar.png
+share/help/hr/gnome-help/figures/shell-window-list-classic.png
+share/help/hr/gnome-help/figures/shell-workspaces.png
+share/help/hr/gnome-help/figures/system-run-symbolic.svg
+share/help/hr/gnome-help/figures/top-bar-icons-classic.png
+share/help/hr/gnome-help/figures/top-bar-icons.png
+share/help/hr/gnome-help/figures/universal-access-menu.png
+share/help/hr/gnome-help/figures/view-more-symbolic.svg
+share/help/hr/gnome-help/figures/yelp-icon-big.png
+share/help/hr/gnome-help/files-autorun.page
+share/help/hr/gnome-help/files-browse.page
+share/help/hr/gnome-help/files-copy.page
+share/help/hr/gnome-help/files-delete.page
+share/help/hr/gnome-help/files-disc-write.page
+share/help/hr/gnome-help/files-hidden.page
+share/help/hr/gnome-help/files-lost.page
+share/help/hr/gnome-help/files-open.page
+share/help/hr/gnome-help/files-preview.page
+share/help/hr/gnome-help/files-recover.page
+share/help/hr/gnome-help/files-removedrive.page
+share/help/hr/gnome-help/files-rename.page
+share/help/hr/gnome-help/files-search.page
+share/help/hr/gnome-help/files-select.page
+share/help/hr/gnome-help/files-share.page
+share/help/hr/gnome-help/files-sort.page
+share/help/hr/gnome-help/files-templates.page
+share/help/hr/gnome-help/files-tilde.page
+share/help/hr/gnome-help/files.page
+share/help/hr/gnome-help/get-involved.page
+share/help/hr/gnome-help/gnome-classic.page
+share/help/hr/gnome-help/gnome-version.page
+share/help/hr/gnome-help/hardware-auth.page
+share/help/hr/gnome-help/hardware-cardreader.page
+share/help/hr/gnome-help/hardware-driver.page
+share/help/hr/gnome-help/hardware-problems-graphics.page
+share/help/hr/gnome-help/hardware.page
+share/help/hr/gnome-help/help-irc.page
+share/help/hr/gnome-help/help-mailing-list.page
+share/help/hr/gnome-help/index.page
+share/help/hr/gnome-help/keyboard-cursor-blink.page
+share/help/hr/gnome-help/keyboard-key-menu.page
+share/help/hr/gnome-help/keyboard-key-super.page
+share/help/hr/gnome-help/keyboard-layouts.page
+share/help/hr/gnome-help/keyboard-nav.page
+share/help/hr/gnome-help/keyboard-osk.page
+share/help/hr/gnome-help/keyboard-repeat-keys.page
+share/help/hr/gnome-help/keyboard-shortcuts-set.page
+share/help/hr/gnome-help/keyboard.page
+share/help/hr/gnome-help/legal.xml
+share/help/hr/gnome-help/look-background.page
+share/help/hr/gnome-help/look-display-fuzzy.page
+share/help/hr/gnome-help/look-resolution.page
+share/help/hr/gnome-help/media.page
+share/help/hr/gnome-help/more-help.page
+share/help/hr/gnome-help/mouse-doubleclick.page
+share/help/hr/gnome-help/mouse-lefthanded.page
+share/help/hr/gnome-help/mouse-middleclick.page
+share/help/hr/gnome-help/mouse-mousekeys.page
+share/help/hr/gnome-help/mouse-problem-notmoving.page
+share/help/hr/gnome-help/mouse-sensitivity.page
+share/help/hr/gnome-help/mouse-touchpad-click.page
+share/help/hr/gnome-help/mouse-wakeup.page
+share/help/hr/gnome-help/mouse.page
+share/help/hr/gnome-help/music-cantplay-drm.page
+share/help/hr/gnome-help/music-player-ipodtransfer.page
+share/help/hr/gnome-help/music-player-newipod.page
+share/help/hr/gnome-help/nautilus-behavior.page
+share/help/hr/gnome-help/nautilus-bookmarks-edit.page
+share/help/hr/gnome-help/nautilus-connect.page
+share/help/hr/gnome-help/nautilus-display.page
+share/help/hr/gnome-help/nautilus-file-properties-basic.page
+share/help/hr/gnome-help/nautilus-file-properties-permissions.page
+share/help/hr/gnome-help/nautilus-list.page
+share/help/hr/gnome-help/nautilus-prefs.page
+share/help/hr/gnome-help/nautilus-preview.page
+share/help/hr/gnome-help/nautilus-views.page
+share/help/hr/gnome-help/net-antivirus.page
+share/help/hr/gnome-help/net-browser.page
+share/help/hr/gnome-help/net-default-browser.page
+share/help/hr/gnome-help/net-default-email.page
+share/help/hr/gnome-help/net-email-virus.page
+share/help/hr/gnome-help/net-email.page
+share/help/hr/gnome-help/net-findip.page
+share/help/hr/gnome-help/net-firewall-on-off.page
+share/help/hr/gnome-help/net-firewall-ports.page
+share/help/hr/gnome-help/net-fixed-ip-address.page
+share/help/hr/gnome-help/net-general.page
+share/help/hr/gnome-help/net-install-flash.page
+share/help/hr/gnome-help/net-macaddress.page
+share/help/hr/gnome-help/net-manual.page
+share/help/hr/gnome-help/net-mobile.page
+share/help/hr/gnome-help/net-othersconnect.page
+share/help/hr/gnome-help/net-othersedit.page
+share/help/hr/gnome-help/net-problem.page
+share/help/hr/gnome-help/net-proxy.page
+share/help/hr/gnome-help/net-security-tips.page
+share/help/hr/gnome-help/net-security.page
+share/help/hr/gnome-help/net-slow.page
+share/help/hr/gnome-help/net-vpn-connect.page
+share/help/hr/gnome-help/net-what-is-ip-address.page
+share/help/hr/gnome-help/net-wired-connect.page
+share/help/hr/gnome-help/net-wired.page
+share/help/hr/gnome-help/net-wireless-adhoc.page
+share/help/hr/gnome-help/net-wireless-airplane.page
+share/help/hr/gnome-help/net-wireless-connect.page
+share/help/hr/gnome-help/net-wireless-disconnecting.page
+share/help/hr/gnome-help/net-wireless-find.page
+share/help/hr/gnome-help/net-wireless-hidden.page
+share/help/hr/gnome-help/net-wireless-noconnection.page
+share/help/hr/gnome-help/net-wireless-troubleshooting-device-drivers.page
+share/help/hr/gnome-help/net-wireless-troubleshooting-hardware-check.page
+share/help/hr/gnome-help/net-wireless-troubleshooting-hardware-info.page
+share/help/hr/gnome-help/net-wireless-troubleshooting-initial-check.page
+share/help/hr/gnome-help/net-wireless-troubleshooting.page
+share/help/hr/gnome-help/net-wireless-wepwpa.page
+share/help/hr/gnome-help/net-wireless.page
+share/help/hr/gnome-help/net.page
+share/help/hr/gnome-help/power-autobrightness.page
+share/help/hr/gnome-help/power-autosuspend.page
+share/help/hr/gnome-help/power-batteryestimate.page
+share/help/hr/gnome-help/power-batterylife.page
+share/help/hr/gnome-help/power-batteryoptimal.page
+share/help/hr/gnome-help/power-batteryslow.page
+share/help/hr/gnome-help/power-batterywindows.page
+share/help/hr/gnome-help/power-closelid.page
+share/help/hr/gnome-help/power-constantfan.page
+share/help/hr/gnome-help/power-hotcomputer.page
+share/help/hr/gnome-help/power-lowpower.page
+share/help/hr/gnome-help/power-nowireless.page
+share/help/hr/gnome-help/power-othercountry.page
+share/help/hr/gnome-help/power-status.page
+share/help/hr/gnome-help/power-suspend.page
+share/help/hr/gnome-help/power-suspendfail.page
+share/help/hr/gnome-help/power-whydim.page
+share/help/hr/gnome-help/power-willnotturnon.page
+share/help/hr/gnome-help/power-wireless.page
+share/help/hr/gnome-help/power.page
+share/help/hr/gnome-help/prefs-display.page
+share/help/hr/gnome-help/prefs-language.page
+share/help/hr/gnome-help/prefs-sharing.page
+share/help/hr/gnome-help/prefs.page
+share/help/hr/gnome-help/printing-2sided.page
+share/help/hr/gnome-help/printing-booklet-duplex.page
+share/help/hr/gnome-help/printing-booklet-singlesided.page
+share/help/hr/gnome-help/printing-booklet.page
+share/help/hr/gnome-help/printing-cancel-job.page
+share/help/hr/gnome-help/printing-differentsize.page
+share/help/hr/gnome-help/printing-envelopes.page
+share/help/hr/gnome-help/printing-inklevel.page
+share/help/hr/gnome-help/printing-name-location.page
+share/help/hr/gnome-help/printing-order.page
+share/help/hr/gnome-help/printing-paperjam.page
+share/help/hr/gnome-help/printing-select.page
+share/help/hr/gnome-help/printing-setup-default-printer.page
+share/help/hr/gnome-help/printing-setup.page
+share/help/hr/gnome-help/printing-streaks.page
+share/help/hr/gnome-help/printing-to-file.page
+share/help/hr/gnome-help/printing.page
+share/help/hr/gnome-help/privacy-history-recent-off.page
+share/help/hr/gnome-help/privacy-location.page
+share/help/hr/gnome-help/privacy-purge.page
+share/help/hr/gnome-help/privacy-screen-lock.page
+share/help/hr/gnome-help/privacy.page
+share/help/hr/gnome-help/screen-shot-record.page
+share/help/hr/gnome-help/session-fingerprint.page
+share/help/hr/gnome-help/session-formats.page
+share/help/hr/gnome-help/session-language.page
+share/help/hr/gnome-help/session-screenlocks.page
+share/help/hr/gnome-help/sharing-bluetooth.page
+share/help/hr/gnome-help/sharing-desktop.page
+share/help/hr/gnome-help/sharing-displayname.page
+share/help/hr/gnome-help/sharing-media.page
+share/help/hr/gnome-help/sharing-personal.page
+share/help/hr/gnome-help/sharing.page
+share/help/hr/gnome-help/shell-apps-favorites.page
+share/help/hr/gnome-help/shell-apps-open.page
+share/help/hr/gnome-help/shell-exit.page
+share/help/hr/gnome-help/shell-introduction.page
+share/help/hr/gnome-help/shell-keyboard-shortcuts.page
+share/help/hr/gnome-help/shell-lockscreen.page
+share/help/hr/gnome-help/shell-notifications.page
+share/help/hr/gnome-help/shell-overview.page
+share/help/hr/gnome-help/shell-windows-lost.page
+share/help/hr/gnome-help/shell-windows-maximize.page
+share/help/hr/gnome-help/shell-windows-states.page
+share/help/hr/gnome-help/shell-windows-switching.page
+share/help/hr/gnome-help/shell-windows-tiled.page
+share/help/hr/gnome-help/shell-windows.page
+share/help/hr/gnome-help/shell-workspaces-movewindow.page
+share/help/hr/gnome-help/shell-workspaces-switch.page
+share/help/hr/gnome-help/shell-workspaces.page
+share/help/hr/gnome-help/sound-alert.page
+share/help/hr/gnome-help/sound-broken.page
+share/help/hr/gnome-help/sound-crackle.page
+share/help/hr/gnome-help/sound-nosound.page
+share/help/hr/gnome-help/sound-usemic.page
+share/help/hr/gnome-help/sound-usespeakers.page
+share/help/hr/gnome-help/sound-volume.page
+share/help/hr/gnome-help/status-icons.page
+share/help/hr/gnome-help/tips-specialchars.page
+share/help/hr/gnome-help/tips.page
+share/help/hr/gnome-help/translate.page
+share/help/hr/gnome-help/user-accounts.page
+share/help/hr/gnome-help/user-add.page
+share/help/hr/gnome-help/user-admin-change.page
+share/help/hr/gnome-help/user-admin-explain.page
+share/help/hr/gnome-help/user-admin-problems.page
+share/help/hr/gnome-help/user-autologin.page
+share/help/hr/gnome-help/user-changepassword.page
+share/help/hr/gnome-help/user-changepicture.page
+share/help/hr/gnome-help/user-delete.page
+share/help/hr/gnome-help/user-goodpassword.page
+share/help/hr/gnome-help/video-dvd.page
+share/help/hr/gnome-help/video-sending.page
+share/help/hr/gnome-help/wacom-left-handed.page
+share/help/hr/gnome-help/wacom-mode.page
+share/help/hr/gnome-help/wacom-multi-monitor.page
+share/help/hr/gnome-help/wacom-stylus.page
+share/help/hr/gnome-help/wacom.page
share/help/hu/gnome-help/a11y-bouncekeys.page
share/help/hu/gnome-help/a11y-braille.page
share/help/hu/gnome-help/a11y-contrast.page
@@ -4705,6 +6241,8 @@ share/help/hu/gnome-help/disk-capacity.page
share/help/hu/gnome-help/disk-check.page
share/help/hu/gnome-help/disk-format.page
share/help/hu/gnome-help/disk-partitions.page
+share/help/hu/gnome-help/disk-repair.page
+share/help/hu/gnome-help/disk-resize.page
share/help/hu/gnome-help/disk.page
share/help/hu/gnome-help/display-blank.page
share/help/hu/gnome-help/display-brightness.page
@@ -4728,7 +6266,6 @@ share/help/hu/gnome-help/figures/battery-missing-symbolic.svg
share/help/hu/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/hu/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/hu/gnome-help/figures/bluetooth-menu.png
-share/help/hu/gnome-help/figures/camera-photo-symbolic.svg
share/help/hu/gnome-help/figures/color-average.png
share/help/hu/gnome-help/figures/color-camera.png
share/help/hu/gnome-help/figures/color-display.png
@@ -4736,15 +6273,30 @@ share/help/hu/gnome-help/figures/color-printer.png
share/help/hu/gnome-help/figures/color-profile-default.png
share/help/hu/gnome-help/figures/color-space.png
share/help/hu/gnome-help/figures/display-dual-monitors.webm
-share/help/hu/gnome-help/figures/documents-icon.png
share/help/hu/gnome-help/figures/emblem-system-symbolic.svg
share/help/hu/gnome-help/figures/emblem-system.png
share/help/hu/gnome-help/figures/gnome.png
share/help/hu/gnome-help/figures/go-down.png
share/help/hu/gnome-help/figures/input-keyboard-symbolic.png
share/help/hu/gnome-help/figures/input-methods-switcher.png
+share/help/hu/gnome-help/figures/keyboard-key-calculator.svg
+share/help/hu/gnome-help/figures/keyboard-key-computer.svg
+share/help/hu/gnome-help/figures/keyboard-key-eject.svg
+share/help/hu/gnome-help/figures/keyboard-key-folder.svg
+share/help/hu/gnome-help/figures/keyboard-key-home.svg
+share/help/hu/gnome-help/figures/keyboard-key-mail.svg
+share/help/hu/gnome-help/figures/keyboard-key-media.svg
share/help/hu/gnome-help/figures/keyboard-key-menu.svg
-share/help/hu/gnome-help/figures/nautilus-3-10.png
+share/help/hu/gnome-help/figures/keyboard-key-mute.svg
+share/help/hu/gnome-help/figures/keyboard-key-next.svg
+share/help/hu/gnome-help/figures/keyboard-key-pause.svg
+share/help/hu/gnome-help/figures/keyboard-key-play.svg
+share/help/hu/gnome-help/figures/keyboard-key-previous.svg
+share/help/hu/gnome-help/figures/keyboard-key-search.svg
+share/help/hu/gnome-help/figures/keyboard-key-stop.svg
+share/help/hu/gnome-help/figures/keyboard-key-voldown.svg
+share/help/hu/gnome-help/figures/keyboard-key-volup.svg
+share/help/hu/gnome-help/figures/keyboard-key-world.svg
share/help/hu/gnome-help/figures/nautilus-icons.png
share/help/hu/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/hu/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -4778,35 +6330,26 @@ share/help/hu/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/hu/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/hu/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/hu/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/hu/gnome-help/figures/notification-buttons.png
share/help/hu/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/hu/gnome-help/figures/printing-select.png
share/help/hu/gnome-help/figures/shell-activities-classic.png
share/help/hu/gnome-help/figures/shell-activities.png
share/help/hu/gnome-help/figures/shell-appmenu-classic.png
share/help/hu/gnome-help/figures/shell-appmenu-shell.png
-share/help/hu/gnome-help/figures/shell-apps-open.png
share/help/hu/gnome-help/figures/shell-appts-classic.png
share/help/hu/gnome-help/figures/shell-appts.png
share/help/hu/gnome-help/figures/shell-dash.png
share/help/hu/gnome-help/figures/shell-exit-classic.png
share/help/hu/gnome-help/figures/shell-exit.png
-share/help/hu/gnome-help/figures/shell-files.png
-share/help/hu/gnome-help/figures/shell-introduction.png
-share/help/hu/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/hu/gnome-help/figures/shell-lock.png
-share/help/hu/gnome-help/figures/shell-notification.png
share/help/hu/gnome-help/figures/shell-top-bar-classic.png
share/help/hu/gnome-help/figures/shell-top-bar.png
share/help/hu/gnome-help/figures/shell-window-list-classic.png
-share/help/hu/gnome-help/figures/shell-windows.png
share/help/hu/gnome-help/figures/shell-workspaces.png
-share/help/hu/gnome-help/figures/shell.png
share/help/hu/gnome-help/figures/system-run-symbolic.svg
share/help/hu/gnome-help/figures/top-bar-icons-classic.png
share/help/hu/gnome-help/figures/top-bar-icons.png
share/help/hu/gnome-help/figures/universal-access-menu.png
-share/help/hu/gnome-help/figures/view-fullscreen-16.png
share/help/hu/gnome-help/figures/view-more-symbolic.svg
share/help/hu/gnome-help/figures/yelp-icon-big.png
share/help/hu/gnome-help/files-autorun.page
@@ -4917,6 +6460,8 @@ share/help/hu/gnome-help/net-wireless-troubleshooting.page
share/help/hu/gnome-help/net-wireless-wepwpa.page
share/help/hu/gnome-help/net-wireless.page
share/help/hu/gnome-help/net.page
+share/help/hu/gnome-help/power-autobrightness.page
+share/help/hu/gnome-help/power-autosuspend.page
share/help/hu/gnome-help/power-batteryestimate.page
share/help/hu/gnome-help/power-batterylife.page
share/help/hu/gnome-help/power-batteryoptimal.page
@@ -4928,10 +6473,12 @@ share/help/hu/gnome-help/power-hotcomputer.page
share/help/hu/gnome-help/power-lowpower.page
share/help/hu/gnome-help/power-nowireless.page
share/help/hu/gnome-help/power-othercountry.page
+share/help/hu/gnome-help/power-status.page
share/help/hu/gnome-help/power-suspend.page
share/help/hu/gnome-help/power-suspendfail.page
share/help/hu/gnome-help/power-whydim.page
share/help/hu/gnome-help/power-willnotturnon.page
+share/help/hu/gnome-help/power-wireless.page
share/help/hu/gnome-help/power.page
share/help/hu/gnome-help/prefs-display.page
share/help/hu/gnome-help/prefs-language.page
@@ -5015,6 +6562,58 @@ share/help/hu/gnome-help/wacom-mode.page
share/help/hu/gnome-help/wacom-multi-monitor.page
share/help/hu/gnome-help/wacom-stylus.page
share/help/hu/gnome-help/wacom.page
+share/help/hu/system-admin-guide/appearance.page
+share/help/hu/system-admin-guide/dconf-custom-defaults.page
+share/help/hu/system-admin-guide/dconf-keyfiles.page
+share/help/hu/system-admin-guide/dconf-lockdown.page
+share/help/hu/system-admin-guide/dconf-nfs-home.page
+share/help/hu/system-admin-guide/dconf-profiles.page
+share/help/hu/system-admin-guide/dconf-snippets.xml
+share/help/hu/system-admin-guide/dconf.page
+share/help/hu/system-admin-guide/desktop-background.page
+share/help/hu/system-admin-guide/desktop-favorite-applications.page
+share/help/hu/system-admin-guide/desktop-lockscreen.page
+share/help/hu/system-admin-guide/desktop-shield.page
+share/help/hu/system-admin-guide/extensions-enable.page
+share/help/hu/system-admin-guide/extensions-lockdown.page
+share/help/hu/system-admin-guide/extensions.page
+share/help/hu/system-admin-guide/fonts-user.page
+share/help/hu/system-admin-guide/fonts.page
+share/help/hu/system-admin-guide/index.page
+share/help/hu/system-admin-guide/keyboard-layout.page
+share/help/hu/system-admin-guide/legal.xml
+share/help/hu/system-admin-guide/lockdown-command-line.page
+share/help/hu/system-admin-guide/lockdown-file-saving.page
+share/help/hu/system-admin-guide/lockdown-online-accounts.page
+share/help/hu/system-admin-guide/lockdown-printing.page
+share/help/hu/system-admin-guide/lockdown-repartitioning.page
+share/help/hu/system-admin-guide/login-automatic.page
+share/help/hu/system-admin-guide/login-banner.page
+share/help/hu/system-admin-guide/login-enterprise.page
+share/help/hu/system-admin-guide/login-fingerprint.page
+share/help/hu/system-admin-guide/login-logo.page
+share/help/hu/system-admin-guide/login-userlist-disable.page
+share/help/hu/system-admin-guide/login.page
+share/help/hu/system-admin-guide/logout-automatic.page
+share/help/hu/system-admin-guide/mime-types-application-user.page
+share/help/hu/system-admin-guide/mime-types-application.page
+share/help/hu/system-admin-guide/mime-types-custom-user.page
+share/help/hu/system-admin-guide/mime-types-custom.page
+share/help/hu/system-admin-guide/mime-types.page
+share/help/hu/system-admin-guide/network-printer-config.page
+share/help/hu/system-admin-guide/network-server-list.page
+share/help/hu/system-admin-guide/network-vpn.page
+share/help/hu/system-admin-guide/network.page
+share/help/hu/system-admin-guide/overrides.page
+share/help/hu/system-admin-guide/power-dim-screen.page
+share/help/hu/system-admin-guide/processes.page
+share/help/hu/system-admin-guide/session-custom.page
+share/help/hu/system-admin-guide/session-debug.page
+share/help/hu/system-admin-guide/session-user.page
+share/help/hu/system-admin-guide/setup.page
+share/help/hu/system-admin-guide/software.page
+share/help/hu/system-admin-guide/sundry.page
+share/help/hu/system-admin-guide/user-settings.page
share/help/id/gnome-help/a11y-bouncekeys.page
share/help/id/gnome-help/a11y-braille.page
share/help/id/gnome-help/a11y-contrast.page
@@ -5088,6 +6687,8 @@ share/help/id/gnome-help/disk-capacity.page
share/help/id/gnome-help/disk-check.page
share/help/id/gnome-help/disk-format.page
share/help/id/gnome-help/disk-partitions.page
+share/help/id/gnome-help/disk-repair.page
+share/help/id/gnome-help/disk-resize.page
share/help/id/gnome-help/disk.page
share/help/id/gnome-help/display-blank.page
share/help/id/gnome-help/display-brightness.page
@@ -5111,7 +6712,6 @@ share/help/id/gnome-help/figures/battery-missing-symbolic.svg
share/help/id/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/id/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/id/gnome-help/figures/bluetooth-menu.png
-share/help/id/gnome-help/figures/camera-photo-symbolic.svg
share/help/id/gnome-help/figures/color-average.png
share/help/id/gnome-help/figures/color-camera.png
share/help/id/gnome-help/figures/color-display.png
@@ -5119,15 +6719,30 @@ share/help/id/gnome-help/figures/color-printer.png
share/help/id/gnome-help/figures/color-profile-default.png
share/help/id/gnome-help/figures/color-space.png
share/help/id/gnome-help/figures/display-dual-monitors.webm
-share/help/id/gnome-help/figures/documents-icon.png
share/help/id/gnome-help/figures/emblem-system-symbolic.svg
share/help/id/gnome-help/figures/emblem-system.png
share/help/id/gnome-help/figures/gnome.png
share/help/id/gnome-help/figures/go-down.png
share/help/id/gnome-help/figures/input-keyboard-symbolic.png
share/help/id/gnome-help/figures/input-methods-switcher.png
+share/help/id/gnome-help/figures/keyboard-key-calculator.svg
+share/help/id/gnome-help/figures/keyboard-key-computer.svg
+share/help/id/gnome-help/figures/keyboard-key-eject.svg
+share/help/id/gnome-help/figures/keyboard-key-folder.svg
+share/help/id/gnome-help/figures/keyboard-key-home.svg
+share/help/id/gnome-help/figures/keyboard-key-mail.svg
+share/help/id/gnome-help/figures/keyboard-key-media.svg
share/help/id/gnome-help/figures/keyboard-key-menu.svg
-share/help/id/gnome-help/figures/nautilus-3-10.png
+share/help/id/gnome-help/figures/keyboard-key-mute.svg
+share/help/id/gnome-help/figures/keyboard-key-next.svg
+share/help/id/gnome-help/figures/keyboard-key-pause.svg
+share/help/id/gnome-help/figures/keyboard-key-play.svg
+share/help/id/gnome-help/figures/keyboard-key-previous.svg
+share/help/id/gnome-help/figures/keyboard-key-search.svg
+share/help/id/gnome-help/figures/keyboard-key-stop.svg
+share/help/id/gnome-help/figures/keyboard-key-voldown.svg
+share/help/id/gnome-help/figures/keyboard-key-volup.svg
+share/help/id/gnome-help/figures/keyboard-key-world.svg
share/help/id/gnome-help/figures/nautilus-icons.png
share/help/id/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/id/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -5161,35 +6776,26 @@ share/help/id/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/id/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/id/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/id/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/id/gnome-help/figures/notification-buttons.png
share/help/id/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/id/gnome-help/figures/printing-select.png
share/help/id/gnome-help/figures/shell-activities-classic.png
share/help/id/gnome-help/figures/shell-activities.png
share/help/id/gnome-help/figures/shell-appmenu-classic.png
share/help/id/gnome-help/figures/shell-appmenu-shell.png
-share/help/id/gnome-help/figures/shell-apps-open.png
share/help/id/gnome-help/figures/shell-appts-classic.png
share/help/id/gnome-help/figures/shell-appts.png
share/help/id/gnome-help/figures/shell-dash.png
share/help/id/gnome-help/figures/shell-exit-classic.png
share/help/id/gnome-help/figures/shell-exit.png
-share/help/id/gnome-help/figures/shell-files.png
-share/help/id/gnome-help/figures/shell-introduction.png
-share/help/id/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/id/gnome-help/figures/shell-lock.png
-share/help/id/gnome-help/figures/shell-notification.png
share/help/id/gnome-help/figures/shell-top-bar-classic.png
share/help/id/gnome-help/figures/shell-top-bar.png
share/help/id/gnome-help/figures/shell-window-list-classic.png
-share/help/id/gnome-help/figures/shell-windows.png
share/help/id/gnome-help/figures/shell-workspaces.png
-share/help/id/gnome-help/figures/shell.png
share/help/id/gnome-help/figures/system-run-symbolic.svg
share/help/id/gnome-help/figures/top-bar-icons-classic.png
share/help/id/gnome-help/figures/top-bar-icons.png
share/help/id/gnome-help/figures/universal-access-menu.png
-share/help/id/gnome-help/figures/view-fullscreen-16.png
share/help/id/gnome-help/figures/view-more-symbolic.svg
share/help/id/gnome-help/figures/yelp-icon-big.png
share/help/id/gnome-help/files-autorun.page
@@ -5300,6 +6906,8 @@ share/help/id/gnome-help/net-wireless-troubleshooting.page
share/help/id/gnome-help/net-wireless-wepwpa.page
share/help/id/gnome-help/net-wireless.page
share/help/id/gnome-help/net.page
+share/help/id/gnome-help/power-autobrightness.page
+share/help/id/gnome-help/power-autosuspend.page
share/help/id/gnome-help/power-batteryestimate.page
share/help/id/gnome-help/power-batterylife.page
share/help/id/gnome-help/power-batteryoptimal.page
@@ -5311,10 +6919,12 @@ share/help/id/gnome-help/power-hotcomputer.page
share/help/id/gnome-help/power-lowpower.page
share/help/id/gnome-help/power-nowireless.page
share/help/id/gnome-help/power-othercountry.page
+share/help/id/gnome-help/power-status.page
share/help/id/gnome-help/power-suspend.page
share/help/id/gnome-help/power-suspendfail.page
share/help/id/gnome-help/power-whydim.page
share/help/id/gnome-help/power-willnotturnon.page
+share/help/id/gnome-help/power-wireless.page
share/help/id/gnome-help/power.page
share/help/id/gnome-help/prefs-display.page
share/help/id/gnome-help/prefs-language.page
@@ -5471,6 +7081,8 @@ share/help/it/gnome-help/disk-capacity.page
share/help/it/gnome-help/disk-check.page
share/help/it/gnome-help/disk-format.page
share/help/it/gnome-help/disk-partitions.page
+share/help/it/gnome-help/disk-repair.page
+share/help/it/gnome-help/disk-resize.page
share/help/it/gnome-help/disk.page
share/help/it/gnome-help/display-blank.page
share/help/it/gnome-help/display-brightness.page
@@ -5494,7 +7106,6 @@ share/help/it/gnome-help/figures/battery-missing-symbolic.svg
share/help/it/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/it/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/it/gnome-help/figures/bluetooth-menu.png
-share/help/it/gnome-help/figures/camera-photo-symbolic.svg
share/help/it/gnome-help/figures/color-average.png
share/help/it/gnome-help/figures/color-camera.png
share/help/it/gnome-help/figures/color-display.png
@@ -5502,15 +7113,30 @@ share/help/it/gnome-help/figures/color-printer.png
share/help/it/gnome-help/figures/color-profile-default.png
share/help/it/gnome-help/figures/color-space.png
share/help/it/gnome-help/figures/display-dual-monitors.webm
-share/help/it/gnome-help/figures/documents-icon.png
share/help/it/gnome-help/figures/emblem-system-symbolic.svg
share/help/it/gnome-help/figures/emblem-system.png
share/help/it/gnome-help/figures/gnome.png
share/help/it/gnome-help/figures/go-down.png
share/help/it/gnome-help/figures/input-keyboard-symbolic.png
share/help/it/gnome-help/figures/input-methods-switcher.png
+share/help/it/gnome-help/figures/keyboard-key-calculator.svg
+share/help/it/gnome-help/figures/keyboard-key-computer.svg
+share/help/it/gnome-help/figures/keyboard-key-eject.svg
+share/help/it/gnome-help/figures/keyboard-key-folder.svg
+share/help/it/gnome-help/figures/keyboard-key-home.svg
+share/help/it/gnome-help/figures/keyboard-key-mail.svg
+share/help/it/gnome-help/figures/keyboard-key-media.svg
share/help/it/gnome-help/figures/keyboard-key-menu.svg
-share/help/it/gnome-help/figures/nautilus-3-10.png
+share/help/it/gnome-help/figures/keyboard-key-mute.svg
+share/help/it/gnome-help/figures/keyboard-key-next.svg
+share/help/it/gnome-help/figures/keyboard-key-pause.svg
+share/help/it/gnome-help/figures/keyboard-key-play.svg
+share/help/it/gnome-help/figures/keyboard-key-previous.svg
+share/help/it/gnome-help/figures/keyboard-key-search.svg
+share/help/it/gnome-help/figures/keyboard-key-stop.svg
+share/help/it/gnome-help/figures/keyboard-key-voldown.svg
+share/help/it/gnome-help/figures/keyboard-key-volup.svg
+share/help/it/gnome-help/figures/keyboard-key-world.svg
share/help/it/gnome-help/figures/nautilus-icons.png
share/help/it/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/it/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -5544,35 +7170,26 @@ share/help/it/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/it/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/it/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/it/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/it/gnome-help/figures/notification-buttons.png
share/help/it/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/it/gnome-help/figures/printing-select.png
share/help/it/gnome-help/figures/shell-activities-classic.png
share/help/it/gnome-help/figures/shell-activities.png
share/help/it/gnome-help/figures/shell-appmenu-classic.png
share/help/it/gnome-help/figures/shell-appmenu-shell.png
-share/help/it/gnome-help/figures/shell-apps-open.png
share/help/it/gnome-help/figures/shell-appts-classic.png
share/help/it/gnome-help/figures/shell-appts.png
share/help/it/gnome-help/figures/shell-dash.png
share/help/it/gnome-help/figures/shell-exit-classic.png
share/help/it/gnome-help/figures/shell-exit.png
-share/help/it/gnome-help/figures/shell-files.png
-share/help/it/gnome-help/figures/shell-introduction.png
-share/help/it/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/it/gnome-help/figures/shell-lock.png
-share/help/it/gnome-help/figures/shell-notification.png
share/help/it/gnome-help/figures/shell-top-bar-classic.png
share/help/it/gnome-help/figures/shell-top-bar.png
share/help/it/gnome-help/figures/shell-window-list-classic.png
-share/help/it/gnome-help/figures/shell-windows.png
share/help/it/gnome-help/figures/shell-workspaces.png
-share/help/it/gnome-help/figures/shell.png
share/help/it/gnome-help/figures/system-run-symbolic.svg
share/help/it/gnome-help/figures/top-bar-icons-classic.png
share/help/it/gnome-help/figures/top-bar-icons.png
share/help/it/gnome-help/figures/universal-access-menu.png
-share/help/it/gnome-help/figures/view-fullscreen-16.png
share/help/it/gnome-help/figures/view-more-symbolic.svg
share/help/it/gnome-help/figures/yelp-icon-big.png
share/help/it/gnome-help/files-autorun.page
@@ -5683,6 +7300,8 @@ share/help/it/gnome-help/net-wireless-troubleshooting.page
share/help/it/gnome-help/net-wireless-wepwpa.page
share/help/it/gnome-help/net-wireless.page
share/help/it/gnome-help/net.page
+share/help/it/gnome-help/power-autobrightness.page
+share/help/it/gnome-help/power-autosuspend.page
share/help/it/gnome-help/power-batteryestimate.page
share/help/it/gnome-help/power-batterylife.page
share/help/it/gnome-help/power-batteryoptimal.page
@@ -5694,10 +7313,12 @@ share/help/it/gnome-help/power-hotcomputer.page
share/help/it/gnome-help/power-lowpower.page
share/help/it/gnome-help/power-nowireless.page
share/help/it/gnome-help/power-othercountry.page
+share/help/it/gnome-help/power-status.page
share/help/it/gnome-help/power-suspend.page
share/help/it/gnome-help/power-suspendfail.page
share/help/it/gnome-help/power-whydim.page
share/help/it/gnome-help/power-willnotturnon.page
+share/help/it/gnome-help/power-wireless.page
share/help/it/gnome-help/power.page
share/help/it/gnome-help/prefs-display.page
share/help/it/gnome-help/prefs-language.page
@@ -5854,6 +7475,8 @@ share/help/ja/gnome-help/disk-capacity.page
share/help/ja/gnome-help/disk-check.page
share/help/ja/gnome-help/disk-format.page
share/help/ja/gnome-help/disk-partitions.page
+share/help/ja/gnome-help/disk-repair.page
+share/help/ja/gnome-help/disk-resize.page
share/help/ja/gnome-help/disk.page
share/help/ja/gnome-help/display-blank.page
share/help/ja/gnome-help/display-brightness.page
@@ -5877,7 +7500,6 @@ share/help/ja/gnome-help/figures/battery-missing-symbolic.svg
share/help/ja/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/ja/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/ja/gnome-help/figures/bluetooth-menu.png
-share/help/ja/gnome-help/figures/camera-photo-symbolic.svg
share/help/ja/gnome-help/figures/color-average.png
share/help/ja/gnome-help/figures/color-camera.png
share/help/ja/gnome-help/figures/color-display.png
@@ -5885,15 +7507,30 @@ share/help/ja/gnome-help/figures/color-printer.png
share/help/ja/gnome-help/figures/color-profile-default.png
share/help/ja/gnome-help/figures/color-space.png
share/help/ja/gnome-help/figures/display-dual-monitors.webm
-share/help/ja/gnome-help/figures/documents-icon.png
share/help/ja/gnome-help/figures/emblem-system-symbolic.svg
share/help/ja/gnome-help/figures/emblem-system.png
share/help/ja/gnome-help/figures/gnome.png
share/help/ja/gnome-help/figures/go-down.png
share/help/ja/gnome-help/figures/input-keyboard-symbolic.png
share/help/ja/gnome-help/figures/input-methods-switcher.png
+share/help/ja/gnome-help/figures/keyboard-key-calculator.svg
+share/help/ja/gnome-help/figures/keyboard-key-computer.svg
+share/help/ja/gnome-help/figures/keyboard-key-eject.svg
+share/help/ja/gnome-help/figures/keyboard-key-folder.svg
+share/help/ja/gnome-help/figures/keyboard-key-home.svg
+share/help/ja/gnome-help/figures/keyboard-key-mail.svg
+share/help/ja/gnome-help/figures/keyboard-key-media.svg
share/help/ja/gnome-help/figures/keyboard-key-menu.svg
-share/help/ja/gnome-help/figures/nautilus-3-10.png
+share/help/ja/gnome-help/figures/keyboard-key-mute.svg
+share/help/ja/gnome-help/figures/keyboard-key-next.svg
+share/help/ja/gnome-help/figures/keyboard-key-pause.svg
+share/help/ja/gnome-help/figures/keyboard-key-play.svg
+share/help/ja/gnome-help/figures/keyboard-key-previous.svg
+share/help/ja/gnome-help/figures/keyboard-key-search.svg
+share/help/ja/gnome-help/figures/keyboard-key-stop.svg
+share/help/ja/gnome-help/figures/keyboard-key-voldown.svg
+share/help/ja/gnome-help/figures/keyboard-key-volup.svg
+share/help/ja/gnome-help/figures/keyboard-key-world.svg
share/help/ja/gnome-help/figures/nautilus-icons.png
share/help/ja/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/ja/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -5927,35 +7564,26 @@ share/help/ja/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/ja/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/ja/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/ja/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/ja/gnome-help/figures/notification-buttons.png
share/help/ja/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/ja/gnome-help/figures/printing-select.png
share/help/ja/gnome-help/figures/shell-activities-classic.png
share/help/ja/gnome-help/figures/shell-activities.png
share/help/ja/gnome-help/figures/shell-appmenu-classic.png
share/help/ja/gnome-help/figures/shell-appmenu-shell.png
-share/help/ja/gnome-help/figures/shell-apps-open.png
share/help/ja/gnome-help/figures/shell-appts-classic.png
share/help/ja/gnome-help/figures/shell-appts.png
share/help/ja/gnome-help/figures/shell-dash.png
share/help/ja/gnome-help/figures/shell-exit-classic.png
share/help/ja/gnome-help/figures/shell-exit.png
-share/help/ja/gnome-help/figures/shell-files.png
-share/help/ja/gnome-help/figures/shell-introduction.png
-share/help/ja/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/ja/gnome-help/figures/shell-lock.png
-share/help/ja/gnome-help/figures/shell-notification.png
share/help/ja/gnome-help/figures/shell-top-bar-classic.png
share/help/ja/gnome-help/figures/shell-top-bar.png
share/help/ja/gnome-help/figures/shell-window-list-classic.png
-share/help/ja/gnome-help/figures/shell-windows.png
share/help/ja/gnome-help/figures/shell-workspaces.png
-share/help/ja/gnome-help/figures/shell.png
share/help/ja/gnome-help/figures/system-run-symbolic.svg
share/help/ja/gnome-help/figures/top-bar-icons-classic.png
share/help/ja/gnome-help/figures/top-bar-icons.png
share/help/ja/gnome-help/figures/universal-access-menu.png
-share/help/ja/gnome-help/figures/view-fullscreen-16.png
share/help/ja/gnome-help/figures/view-more-symbolic.svg
share/help/ja/gnome-help/figures/yelp-icon-big.png
share/help/ja/gnome-help/files-autorun.page
@@ -6066,6 +7694,8 @@ share/help/ja/gnome-help/net-wireless-troubleshooting.page
share/help/ja/gnome-help/net-wireless-wepwpa.page
share/help/ja/gnome-help/net-wireless.page
share/help/ja/gnome-help/net.page
+share/help/ja/gnome-help/power-autobrightness.page
+share/help/ja/gnome-help/power-autosuspend.page
share/help/ja/gnome-help/power-batteryestimate.page
share/help/ja/gnome-help/power-batterylife.page
share/help/ja/gnome-help/power-batteryoptimal.page
@@ -6077,10 +7707,12 @@ share/help/ja/gnome-help/power-hotcomputer.page
share/help/ja/gnome-help/power-lowpower.page
share/help/ja/gnome-help/power-nowireless.page
share/help/ja/gnome-help/power-othercountry.page
+share/help/ja/gnome-help/power-status.page
share/help/ja/gnome-help/power-suspend.page
share/help/ja/gnome-help/power-suspendfail.page
share/help/ja/gnome-help/power-whydim.page
share/help/ja/gnome-help/power-willnotturnon.page
+share/help/ja/gnome-help/power-wireless.page
share/help/ja/gnome-help/power.page
share/help/ja/gnome-help/prefs-display.page
share/help/ja/gnome-help/prefs-language.page
@@ -6237,6 +7869,8 @@ share/help/kn/gnome-help/disk-capacity.page
share/help/kn/gnome-help/disk-check.page
share/help/kn/gnome-help/disk-format.page
share/help/kn/gnome-help/disk-partitions.page
+share/help/kn/gnome-help/disk-repair.page
+share/help/kn/gnome-help/disk-resize.page
share/help/kn/gnome-help/disk.page
share/help/kn/gnome-help/display-blank.page
share/help/kn/gnome-help/display-brightness.page
@@ -6260,7 +7894,6 @@ share/help/kn/gnome-help/figures/battery-missing-symbolic.svg
share/help/kn/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/kn/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/kn/gnome-help/figures/bluetooth-menu.png
-share/help/kn/gnome-help/figures/camera-photo-symbolic.svg
share/help/kn/gnome-help/figures/color-average.png
share/help/kn/gnome-help/figures/color-camera.png
share/help/kn/gnome-help/figures/color-display.png
@@ -6268,15 +7901,30 @@ share/help/kn/gnome-help/figures/color-printer.png
share/help/kn/gnome-help/figures/color-profile-default.png
share/help/kn/gnome-help/figures/color-space.png
share/help/kn/gnome-help/figures/display-dual-monitors.webm
-share/help/kn/gnome-help/figures/documents-icon.png
share/help/kn/gnome-help/figures/emblem-system-symbolic.svg
share/help/kn/gnome-help/figures/emblem-system.png
share/help/kn/gnome-help/figures/gnome.png
share/help/kn/gnome-help/figures/go-down.png
share/help/kn/gnome-help/figures/input-keyboard-symbolic.png
share/help/kn/gnome-help/figures/input-methods-switcher.png
+share/help/kn/gnome-help/figures/keyboard-key-calculator.svg
+share/help/kn/gnome-help/figures/keyboard-key-computer.svg
+share/help/kn/gnome-help/figures/keyboard-key-eject.svg
+share/help/kn/gnome-help/figures/keyboard-key-folder.svg
+share/help/kn/gnome-help/figures/keyboard-key-home.svg
+share/help/kn/gnome-help/figures/keyboard-key-mail.svg
+share/help/kn/gnome-help/figures/keyboard-key-media.svg
share/help/kn/gnome-help/figures/keyboard-key-menu.svg
-share/help/kn/gnome-help/figures/nautilus-3-10.png
+share/help/kn/gnome-help/figures/keyboard-key-mute.svg
+share/help/kn/gnome-help/figures/keyboard-key-next.svg
+share/help/kn/gnome-help/figures/keyboard-key-pause.svg
+share/help/kn/gnome-help/figures/keyboard-key-play.svg
+share/help/kn/gnome-help/figures/keyboard-key-previous.svg
+share/help/kn/gnome-help/figures/keyboard-key-search.svg
+share/help/kn/gnome-help/figures/keyboard-key-stop.svg
+share/help/kn/gnome-help/figures/keyboard-key-voldown.svg
+share/help/kn/gnome-help/figures/keyboard-key-volup.svg
+share/help/kn/gnome-help/figures/keyboard-key-world.svg
share/help/kn/gnome-help/figures/nautilus-icons.png
share/help/kn/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/kn/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -6310,35 +7958,26 @@ share/help/kn/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/kn/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/kn/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/kn/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/kn/gnome-help/figures/notification-buttons.png
share/help/kn/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/kn/gnome-help/figures/printing-select.png
share/help/kn/gnome-help/figures/shell-activities-classic.png
share/help/kn/gnome-help/figures/shell-activities.png
share/help/kn/gnome-help/figures/shell-appmenu-classic.png
share/help/kn/gnome-help/figures/shell-appmenu-shell.png
-share/help/kn/gnome-help/figures/shell-apps-open.png
share/help/kn/gnome-help/figures/shell-appts-classic.png
share/help/kn/gnome-help/figures/shell-appts.png
share/help/kn/gnome-help/figures/shell-dash.png
share/help/kn/gnome-help/figures/shell-exit-classic.png
share/help/kn/gnome-help/figures/shell-exit.png
-share/help/kn/gnome-help/figures/shell-files.png
-share/help/kn/gnome-help/figures/shell-introduction.png
-share/help/kn/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/kn/gnome-help/figures/shell-lock.png
-share/help/kn/gnome-help/figures/shell-notification.png
share/help/kn/gnome-help/figures/shell-top-bar-classic.png
share/help/kn/gnome-help/figures/shell-top-bar.png
share/help/kn/gnome-help/figures/shell-window-list-classic.png
-share/help/kn/gnome-help/figures/shell-windows.png
share/help/kn/gnome-help/figures/shell-workspaces.png
-share/help/kn/gnome-help/figures/shell.png
share/help/kn/gnome-help/figures/system-run-symbolic.svg
share/help/kn/gnome-help/figures/top-bar-icons-classic.png
share/help/kn/gnome-help/figures/top-bar-icons.png
share/help/kn/gnome-help/figures/universal-access-menu.png
-share/help/kn/gnome-help/figures/view-fullscreen-16.png
share/help/kn/gnome-help/figures/view-more-symbolic.svg
share/help/kn/gnome-help/figures/yelp-icon-big.png
share/help/kn/gnome-help/files-autorun.page
@@ -6449,6 +8088,8 @@ share/help/kn/gnome-help/net-wireless-troubleshooting.page
share/help/kn/gnome-help/net-wireless-wepwpa.page
share/help/kn/gnome-help/net-wireless.page
share/help/kn/gnome-help/net.page
+share/help/kn/gnome-help/power-autobrightness.page
+share/help/kn/gnome-help/power-autosuspend.page
share/help/kn/gnome-help/power-batteryestimate.page
share/help/kn/gnome-help/power-batterylife.page
share/help/kn/gnome-help/power-batteryoptimal.page
@@ -6460,10 +8101,12 @@ share/help/kn/gnome-help/power-hotcomputer.page
share/help/kn/gnome-help/power-lowpower.page
share/help/kn/gnome-help/power-nowireless.page
share/help/kn/gnome-help/power-othercountry.page
+share/help/kn/gnome-help/power-status.page
share/help/kn/gnome-help/power-suspend.page
share/help/kn/gnome-help/power-suspendfail.page
share/help/kn/gnome-help/power-whydim.page
share/help/kn/gnome-help/power-willnotturnon.page
+share/help/kn/gnome-help/power-wireless.page
share/help/kn/gnome-help/power.page
share/help/kn/gnome-help/prefs-display.page
share/help/kn/gnome-help/prefs-language.page
@@ -6547,6 +8190,58 @@ share/help/kn/gnome-help/wacom-mode.page
share/help/kn/gnome-help/wacom-multi-monitor.page
share/help/kn/gnome-help/wacom-stylus.page
share/help/kn/gnome-help/wacom.page
+share/help/ko/system-admin-guide/appearance.page
+share/help/ko/system-admin-guide/dconf-custom-defaults.page
+share/help/ko/system-admin-guide/dconf-keyfiles.page
+share/help/ko/system-admin-guide/dconf-lockdown.page
+share/help/ko/system-admin-guide/dconf-nfs-home.page
+share/help/ko/system-admin-guide/dconf-profiles.page
+share/help/ko/system-admin-guide/dconf-snippets.xml
+share/help/ko/system-admin-guide/dconf.page
+share/help/ko/system-admin-guide/desktop-background.page
+share/help/ko/system-admin-guide/desktop-favorite-applications.page
+share/help/ko/system-admin-guide/desktop-lockscreen.page
+share/help/ko/system-admin-guide/desktop-shield.page
+share/help/ko/system-admin-guide/extensions-enable.page
+share/help/ko/system-admin-guide/extensions-lockdown.page
+share/help/ko/system-admin-guide/extensions.page
+share/help/ko/system-admin-guide/fonts-user.page
+share/help/ko/system-admin-guide/fonts.page
+share/help/ko/system-admin-guide/index.page
+share/help/ko/system-admin-guide/keyboard-layout.page
+share/help/ko/system-admin-guide/legal.xml
+share/help/ko/system-admin-guide/lockdown-command-line.page
+share/help/ko/system-admin-guide/lockdown-file-saving.page
+share/help/ko/system-admin-guide/lockdown-online-accounts.page
+share/help/ko/system-admin-guide/lockdown-printing.page
+share/help/ko/system-admin-guide/lockdown-repartitioning.page
+share/help/ko/system-admin-guide/login-automatic.page
+share/help/ko/system-admin-guide/login-banner.page
+share/help/ko/system-admin-guide/login-enterprise.page
+share/help/ko/system-admin-guide/login-fingerprint.page
+share/help/ko/system-admin-guide/login-logo.page
+share/help/ko/system-admin-guide/login-userlist-disable.page
+share/help/ko/system-admin-guide/login.page
+share/help/ko/system-admin-guide/logout-automatic.page
+share/help/ko/system-admin-guide/mime-types-application-user.page
+share/help/ko/system-admin-guide/mime-types-application.page
+share/help/ko/system-admin-guide/mime-types-custom-user.page
+share/help/ko/system-admin-guide/mime-types-custom.page
+share/help/ko/system-admin-guide/mime-types.page
+share/help/ko/system-admin-guide/network-printer-config.page
+share/help/ko/system-admin-guide/network-server-list.page
+share/help/ko/system-admin-guide/network-vpn.page
+share/help/ko/system-admin-guide/network.page
+share/help/ko/system-admin-guide/overrides.page
+share/help/ko/system-admin-guide/power-dim-screen.page
+share/help/ko/system-admin-guide/processes.page
+share/help/ko/system-admin-guide/session-custom.page
+share/help/ko/system-admin-guide/session-debug.page
+share/help/ko/system-admin-guide/session-user.page
+share/help/ko/system-admin-guide/setup.page
+share/help/ko/system-admin-guide/software.page
+share/help/ko/system-admin-guide/sundry.page
+share/help/ko/system-admin-guide/user-settings.page
share/help/lv/gnome-help/a11y-bouncekeys.page
share/help/lv/gnome-help/a11y-braille.page
share/help/lv/gnome-help/a11y-contrast.page
@@ -6620,6 +8315,8 @@ share/help/lv/gnome-help/disk-capacity.page
share/help/lv/gnome-help/disk-check.page
share/help/lv/gnome-help/disk-format.page
share/help/lv/gnome-help/disk-partitions.page
+share/help/lv/gnome-help/disk-repair.page
+share/help/lv/gnome-help/disk-resize.page
share/help/lv/gnome-help/disk.page
share/help/lv/gnome-help/display-blank.page
share/help/lv/gnome-help/display-brightness.page
@@ -6643,7 +8340,6 @@ share/help/lv/gnome-help/figures/battery-missing-symbolic.svg
share/help/lv/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/lv/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/lv/gnome-help/figures/bluetooth-menu.png
-share/help/lv/gnome-help/figures/camera-photo-symbolic.svg
share/help/lv/gnome-help/figures/color-average.png
share/help/lv/gnome-help/figures/color-camera.png
share/help/lv/gnome-help/figures/color-display.png
@@ -6651,15 +8347,30 @@ share/help/lv/gnome-help/figures/color-printer.png
share/help/lv/gnome-help/figures/color-profile-default.png
share/help/lv/gnome-help/figures/color-space.png
share/help/lv/gnome-help/figures/display-dual-monitors.webm
-share/help/lv/gnome-help/figures/documents-icon.png
share/help/lv/gnome-help/figures/emblem-system-symbolic.svg
share/help/lv/gnome-help/figures/emblem-system.png
share/help/lv/gnome-help/figures/gnome.png
share/help/lv/gnome-help/figures/go-down.png
share/help/lv/gnome-help/figures/input-keyboard-symbolic.png
share/help/lv/gnome-help/figures/input-methods-switcher.png
+share/help/lv/gnome-help/figures/keyboard-key-calculator.svg
+share/help/lv/gnome-help/figures/keyboard-key-computer.svg
+share/help/lv/gnome-help/figures/keyboard-key-eject.svg
+share/help/lv/gnome-help/figures/keyboard-key-folder.svg
+share/help/lv/gnome-help/figures/keyboard-key-home.svg
+share/help/lv/gnome-help/figures/keyboard-key-mail.svg
+share/help/lv/gnome-help/figures/keyboard-key-media.svg
share/help/lv/gnome-help/figures/keyboard-key-menu.svg
-share/help/lv/gnome-help/figures/nautilus-3-10.png
+share/help/lv/gnome-help/figures/keyboard-key-mute.svg
+share/help/lv/gnome-help/figures/keyboard-key-next.svg
+share/help/lv/gnome-help/figures/keyboard-key-pause.svg
+share/help/lv/gnome-help/figures/keyboard-key-play.svg
+share/help/lv/gnome-help/figures/keyboard-key-previous.svg
+share/help/lv/gnome-help/figures/keyboard-key-search.svg
+share/help/lv/gnome-help/figures/keyboard-key-stop.svg
+share/help/lv/gnome-help/figures/keyboard-key-voldown.svg
+share/help/lv/gnome-help/figures/keyboard-key-volup.svg
+share/help/lv/gnome-help/figures/keyboard-key-world.svg
share/help/lv/gnome-help/figures/nautilus-icons.png
share/help/lv/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/lv/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -6693,35 +8404,26 @@ share/help/lv/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/lv/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/lv/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/lv/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/lv/gnome-help/figures/notification-buttons.png
share/help/lv/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/lv/gnome-help/figures/printing-select.png
share/help/lv/gnome-help/figures/shell-activities-classic.png
share/help/lv/gnome-help/figures/shell-activities.png
share/help/lv/gnome-help/figures/shell-appmenu-classic.png
share/help/lv/gnome-help/figures/shell-appmenu-shell.png
-share/help/lv/gnome-help/figures/shell-apps-open.png
share/help/lv/gnome-help/figures/shell-appts-classic.png
share/help/lv/gnome-help/figures/shell-appts.png
share/help/lv/gnome-help/figures/shell-dash.png
share/help/lv/gnome-help/figures/shell-exit-classic.png
share/help/lv/gnome-help/figures/shell-exit.png
-share/help/lv/gnome-help/figures/shell-files.png
-share/help/lv/gnome-help/figures/shell-introduction.png
-share/help/lv/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/lv/gnome-help/figures/shell-lock.png
-share/help/lv/gnome-help/figures/shell-notification.png
share/help/lv/gnome-help/figures/shell-top-bar-classic.png
share/help/lv/gnome-help/figures/shell-top-bar.png
share/help/lv/gnome-help/figures/shell-window-list-classic.png
-share/help/lv/gnome-help/figures/shell-windows.png
share/help/lv/gnome-help/figures/shell-workspaces.png
-share/help/lv/gnome-help/figures/shell.png
share/help/lv/gnome-help/figures/system-run-symbolic.svg
share/help/lv/gnome-help/figures/top-bar-icons-classic.png
share/help/lv/gnome-help/figures/top-bar-icons.png
share/help/lv/gnome-help/figures/universal-access-menu.png
-share/help/lv/gnome-help/figures/view-fullscreen-16.png
share/help/lv/gnome-help/figures/view-more-symbolic.svg
share/help/lv/gnome-help/figures/yelp-icon-big.png
share/help/lv/gnome-help/files-autorun.page
@@ -6832,6 +8534,8 @@ share/help/lv/gnome-help/net-wireless-troubleshooting.page
share/help/lv/gnome-help/net-wireless-wepwpa.page
share/help/lv/gnome-help/net-wireless.page
share/help/lv/gnome-help/net.page
+share/help/lv/gnome-help/power-autobrightness.page
+share/help/lv/gnome-help/power-autosuspend.page
share/help/lv/gnome-help/power-batteryestimate.page
share/help/lv/gnome-help/power-batterylife.page
share/help/lv/gnome-help/power-batteryoptimal.page
@@ -6843,10 +8547,12 @@ share/help/lv/gnome-help/power-hotcomputer.page
share/help/lv/gnome-help/power-lowpower.page
share/help/lv/gnome-help/power-nowireless.page
share/help/lv/gnome-help/power-othercountry.page
+share/help/lv/gnome-help/power-status.page
share/help/lv/gnome-help/power-suspend.page
share/help/lv/gnome-help/power-suspendfail.page
share/help/lv/gnome-help/power-whydim.page
share/help/lv/gnome-help/power-willnotturnon.page
+share/help/lv/gnome-help/power-wireless.page
share/help/lv/gnome-help/power.page
share/help/lv/gnome-help/prefs-display.page
share/help/lv/gnome-help/prefs-language.page
@@ -7003,6 +8709,8 @@ share/help/mr/gnome-help/disk-capacity.page
share/help/mr/gnome-help/disk-check.page
share/help/mr/gnome-help/disk-format.page
share/help/mr/gnome-help/disk-partitions.page
+share/help/mr/gnome-help/disk-repair.page
+share/help/mr/gnome-help/disk-resize.page
share/help/mr/gnome-help/disk.page
share/help/mr/gnome-help/display-blank.page
share/help/mr/gnome-help/display-brightness.page
@@ -7026,7 +8734,6 @@ share/help/mr/gnome-help/figures/battery-missing-symbolic.svg
share/help/mr/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/mr/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/mr/gnome-help/figures/bluetooth-menu.png
-share/help/mr/gnome-help/figures/camera-photo-symbolic.svg
share/help/mr/gnome-help/figures/color-average.png
share/help/mr/gnome-help/figures/color-camera.png
share/help/mr/gnome-help/figures/color-display.png
@@ -7034,15 +8741,30 @@ share/help/mr/gnome-help/figures/color-printer.png
share/help/mr/gnome-help/figures/color-profile-default.png
share/help/mr/gnome-help/figures/color-space.png
share/help/mr/gnome-help/figures/display-dual-monitors.webm
-share/help/mr/gnome-help/figures/documents-icon.png
share/help/mr/gnome-help/figures/emblem-system-symbolic.svg
share/help/mr/gnome-help/figures/emblem-system.png
share/help/mr/gnome-help/figures/gnome.png
share/help/mr/gnome-help/figures/go-down.png
share/help/mr/gnome-help/figures/input-keyboard-symbolic.png
share/help/mr/gnome-help/figures/input-methods-switcher.png
+share/help/mr/gnome-help/figures/keyboard-key-calculator.svg
+share/help/mr/gnome-help/figures/keyboard-key-computer.svg
+share/help/mr/gnome-help/figures/keyboard-key-eject.svg
+share/help/mr/gnome-help/figures/keyboard-key-folder.svg
+share/help/mr/gnome-help/figures/keyboard-key-home.svg
+share/help/mr/gnome-help/figures/keyboard-key-mail.svg
+share/help/mr/gnome-help/figures/keyboard-key-media.svg
share/help/mr/gnome-help/figures/keyboard-key-menu.svg
-share/help/mr/gnome-help/figures/nautilus-3-10.png
+share/help/mr/gnome-help/figures/keyboard-key-mute.svg
+share/help/mr/gnome-help/figures/keyboard-key-next.svg
+share/help/mr/gnome-help/figures/keyboard-key-pause.svg
+share/help/mr/gnome-help/figures/keyboard-key-play.svg
+share/help/mr/gnome-help/figures/keyboard-key-previous.svg
+share/help/mr/gnome-help/figures/keyboard-key-search.svg
+share/help/mr/gnome-help/figures/keyboard-key-stop.svg
+share/help/mr/gnome-help/figures/keyboard-key-voldown.svg
+share/help/mr/gnome-help/figures/keyboard-key-volup.svg
+share/help/mr/gnome-help/figures/keyboard-key-world.svg
share/help/mr/gnome-help/figures/nautilus-icons.png
share/help/mr/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/mr/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -7076,35 +8798,26 @@ share/help/mr/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/mr/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/mr/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/mr/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/mr/gnome-help/figures/notification-buttons.png
share/help/mr/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/mr/gnome-help/figures/printing-select.png
share/help/mr/gnome-help/figures/shell-activities-classic.png
share/help/mr/gnome-help/figures/shell-activities.png
share/help/mr/gnome-help/figures/shell-appmenu-classic.png
share/help/mr/gnome-help/figures/shell-appmenu-shell.png
-share/help/mr/gnome-help/figures/shell-apps-open.png
share/help/mr/gnome-help/figures/shell-appts-classic.png
share/help/mr/gnome-help/figures/shell-appts.png
share/help/mr/gnome-help/figures/shell-dash.png
share/help/mr/gnome-help/figures/shell-exit-classic.png
share/help/mr/gnome-help/figures/shell-exit.png
-share/help/mr/gnome-help/figures/shell-files.png
-share/help/mr/gnome-help/figures/shell-introduction.png
-share/help/mr/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/mr/gnome-help/figures/shell-lock.png
-share/help/mr/gnome-help/figures/shell-notification.png
share/help/mr/gnome-help/figures/shell-top-bar-classic.png
share/help/mr/gnome-help/figures/shell-top-bar.png
share/help/mr/gnome-help/figures/shell-window-list-classic.png
-share/help/mr/gnome-help/figures/shell-windows.png
share/help/mr/gnome-help/figures/shell-workspaces.png
-share/help/mr/gnome-help/figures/shell.png
share/help/mr/gnome-help/figures/system-run-symbolic.svg
share/help/mr/gnome-help/figures/top-bar-icons-classic.png
share/help/mr/gnome-help/figures/top-bar-icons.png
share/help/mr/gnome-help/figures/universal-access-menu.png
-share/help/mr/gnome-help/figures/view-fullscreen-16.png
share/help/mr/gnome-help/figures/view-more-symbolic.svg
share/help/mr/gnome-help/figures/yelp-icon-big.png
share/help/mr/gnome-help/files-autorun.page
@@ -7215,6 +8928,8 @@ share/help/mr/gnome-help/net-wireless-troubleshooting.page
share/help/mr/gnome-help/net-wireless-wepwpa.page
share/help/mr/gnome-help/net-wireless.page
share/help/mr/gnome-help/net.page
+share/help/mr/gnome-help/power-autobrightness.page
+share/help/mr/gnome-help/power-autosuspend.page
share/help/mr/gnome-help/power-batteryestimate.page
share/help/mr/gnome-help/power-batterylife.page
share/help/mr/gnome-help/power-batteryoptimal.page
@@ -7226,10 +8941,12 @@ share/help/mr/gnome-help/power-hotcomputer.page
share/help/mr/gnome-help/power-lowpower.page
share/help/mr/gnome-help/power-nowireless.page
share/help/mr/gnome-help/power-othercountry.page
+share/help/mr/gnome-help/power-status.page
share/help/mr/gnome-help/power-suspend.page
share/help/mr/gnome-help/power-suspendfail.page
share/help/mr/gnome-help/power-whydim.page
share/help/mr/gnome-help/power-willnotturnon.page
+share/help/mr/gnome-help/power-wireless.page
share/help/mr/gnome-help/power.page
share/help/mr/gnome-help/prefs-display.page
share/help/mr/gnome-help/prefs-language.page
@@ -7386,6 +9103,8 @@ share/help/nl/gnome-help/disk-capacity.page
share/help/nl/gnome-help/disk-check.page
share/help/nl/gnome-help/disk-format.page
share/help/nl/gnome-help/disk-partitions.page
+share/help/nl/gnome-help/disk-repair.page
+share/help/nl/gnome-help/disk-resize.page
share/help/nl/gnome-help/disk.page
share/help/nl/gnome-help/display-blank.page
share/help/nl/gnome-help/display-brightness.page
@@ -7409,7 +9128,6 @@ share/help/nl/gnome-help/figures/battery-missing-symbolic.svg
share/help/nl/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/nl/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/nl/gnome-help/figures/bluetooth-menu.png
-share/help/nl/gnome-help/figures/camera-photo-symbolic.svg
share/help/nl/gnome-help/figures/color-average.png
share/help/nl/gnome-help/figures/color-camera.png
share/help/nl/gnome-help/figures/color-display.png
@@ -7417,15 +9135,30 @@ share/help/nl/gnome-help/figures/color-printer.png
share/help/nl/gnome-help/figures/color-profile-default.png
share/help/nl/gnome-help/figures/color-space.png
share/help/nl/gnome-help/figures/display-dual-monitors.webm
-share/help/nl/gnome-help/figures/documents-icon.png
share/help/nl/gnome-help/figures/emblem-system-symbolic.svg
share/help/nl/gnome-help/figures/emblem-system.png
share/help/nl/gnome-help/figures/gnome.png
share/help/nl/gnome-help/figures/go-down.png
share/help/nl/gnome-help/figures/input-keyboard-symbolic.png
share/help/nl/gnome-help/figures/input-methods-switcher.png
+share/help/nl/gnome-help/figures/keyboard-key-calculator.svg
+share/help/nl/gnome-help/figures/keyboard-key-computer.svg
+share/help/nl/gnome-help/figures/keyboard-key-eject.svg
+share/help/nl/gnome-help/figures/keyboard-key-folder.svg
+share/help/nl/gnome-help/figures/keyboard-key-home.svg
+share/help/nl/gnome-help/figures/keyboard-key-mail.svg
+share/help/nl/gnome-help/figures/keyboard-key-media.svg
share/help/nl/gnome-help/figures/keyboard-key-menu.svg
-share/help/nl/gnome-help/figures/nautilus-3-10.png
+share/help/nl/gnome-help/figures/keyboard-key-mute.svg
+share/help/nl/gnome-help/figures/keyboard-key-next.svg
+share/help/nl/gnome-help/figures/keyboard-key-pause.svg
+share/help/nl/gnome-help/figures/keyboard-key-play.svg
+share/help/nl/gnome-help/figures/keyboard-key-previous.svg
+share/help/nl/gnome-help/figures/keyboard-key-search.svg
+share/help/nl/gnome-help/figures/keyboard-key-stop.svg
+share/help/nl/gnome-help/figures/keyboard-key-voldown.svg
+share/help/nl/gnome-help/figures/keyboard-key-volup.svg
+share/help/nl/gnome-help/figures/keyboard-key-world.svg
share/help/nl/gnome-help/figures/nautilus-icons.png
share/help/nl/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/nl/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -7459,35 +9192,26 @@ share/help/nl/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/nl/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/nl/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/nl/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/nl/gnome-help/figures/notification-buttons.png
share/help/nl/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/nl/gnome-help/figures/printing-select.png
share/help/nl/gnome-help/figures/shell-activities-classic.png
share/help/nl/gnome-help/figures/shell-activities.png
share/help/nl/gnome-help/figures/shell-appmenu-classic.png
share/help/nl/gnome-help/figures/shell-appmenu-shell.png
-share/help/nl/gnome-help/figures/shell-apps-open.png
share/help/nl/gnome-help/figures/shell-appts-classic.png
share/help/nl/gnome-help/figures/shell-appts.png
share/help/nl/gnome-help/figures/shell-dash.png
share/help/nl/gnome-help/figures/shell-exit-classic.png
share/help/nl/gnome-help/figures/shell-exit.png
-share/help/nl/gnome-help/figures/shell-files.png
-share/help/nl/gnome-help/figures/shell-introduction.png
-share/help/nl/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/nl/gnome-help/figures/shell-lock.png
-share/help/nl/gnome-help/figures/shell-notification.png
share/help/nl/gnome-help/figures/shell-top-bar-classic.png
share/help/nl/gnome-help/figures/shell-top-bar.png
share/help/nl/gnome-help/figures/shell-window-list-classic.png
-share/help/nl/gnome-help/figures/shell-windows.png
share/help/nl/gnome-help/figures/shell-workspaces.png
-share/help/nl/gnome-help/figures/shell.png
share/help/nl/gnome-help/figures/system-run-symbolic.svg
share/help/nl/gnome-help/figures/top-bar-icons-classic.png
share/help/nl/gnome-help/figures/top-bar-icons.png
share/help/nl/gnome-help/figures/universal-access-menu.png
-share/help/nl/gnome-help/figures/view-fullscreen-16.png
share/help/nl/gnome-help/figures/view-more-symbolic.svg
share/help/nl/gnome-help/figures/yelp-icon-big.png
share/help/nl/gnome-help/files-autorun.page
@@ -7598,6 +9322,8 @@ share/help/nl/gnome-help/net-wireless-troubleshooting.page
share/help/nl/gnome-help/net-wireless-wepwpa.page
share/help/nl/gnome-help/net-wireless.page
share/help/nl/gnome-help/net.page
+share/help/nl/gnome-help/power-autobrightness.page
+share/help/nl/gnome-help/power-autosuspend.page
share/help/nl/gnome-help/power-batteryestimate.page
share/help/nl/gnome-help/power-batterylife.page
share/help/nl/gnome-help/power-batteryoptimal.page
@@ -7609,10 +9335,12 @@ share/help/nl/gnome-help/power-hotcomputer.page
share/help/nl/gnome-help/power-lowpower.page
share/help/nl/gnome-help/power-nowireless.page
share/help/nl/gnome-help/power-othercountry.page
+share/help/nl/gnome-help/power-status.page
share/help/nl/gnome-help/power-suspend.page
share/help/nl/gnome-help/power-suspendfail.page
share/help/nl/gnome-help/power-whydim.page
share/help/nl/gnome-help/power-willnotturnon.page
+share/help/nl/gnome-help/power-wireless.page
share/help/nl/gnome-help/power.page
share/help/nl/gnome-help/prefs-display.page
share/help/nl/gnome-help/prefs-language.page
@@ -7769,6 +9497,8 @@ share/help/pa/gnome-help/disk-capacity.page
share/help/pa/gnome-help/disk-check.page
share/help/pa/gnome-help/disk-format.page
share/help/pa/gnome-help/disk-partitions.page
+share/help/pa/gnome-help/disk-repair.page
+share/help/pa/gnome-help/disk-resize.page
share/help/pa/gnome-help/disk.page
share/help/pa/gnome-help/display-blank.page
share/help/pa/gnome-help/display-brightness.page
@@ -7792,7 +9522,6 @@ share/help/pa/gnome-help/figures/battery-missing-symbolic.svg
share/help/pa/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/pa/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/pa/gnome-help/figures/bluetooth-menu.png
-share/help/pa/gnome-help/figures/camera-photo-symbolic.svg
share/help/pa/gnome-help/figures/color-average.png
share/help/pa/gnome-help/figures/color-camera.png
share/help/pa/gnome-help/figures/color-display.png
@@ -7800,15 +9529,30 @@ share/help/pa/gnome-help/figures/color-printer.png
share/help/pa/gnome-help/figures/color-profile-default.png
share/help/pa/gnome-help/figures/color-space.png
share/help/pa/gnome-help/figures/display-dual-monitors.webm
-share/help/pa/gnome-help/figures/documents-icon.png
share/help/pa/gnome-help/figures/emblem-system-symbolic.svg
share/help/pa/gnome-help/figures/emblem-system.png
share/help/pa/gnome-help/figures/gnome.png
share/help/pa/gnome-help/figures/go-down.png
share/help/pa/gnome-help/figures/input-keyboard-symbolic.png
share/help/pa/gnome-help/figures/input-methods-switcher.png
+share/help/pa/gnome-help/figures/keyboard-key-calculator.svg
+share/help/pa/gnome-help/figures/keyboard-key-computer.svg
+share/help/pa/gnome-help/figures/keyboard-key-eject.svg
+share/help/pa/gnome-help/figures/keyboard-key-folder.svg
+share/help/pa/gnome-help/figures/keyboard-key-home.svg
+share/help/pa/gnome-help/figures/keyboard-key-mail.svg
+share/help/pa/gnome-help/figures/keyboard-key-media.svg
share/help/pa/gnome-help/figures/keyboard-key-menu.svg
-share/help/pa/gnome-help/figures/nautilus-3-10.png
+share/help/pa/gnome-help/figures/keyboard-key-mute.svg
+share/help/pa/gnome-help/figures/keyboard-key-next.svg
+share/help/pa/gnome-help/figures/keyboard-key-pause.svg
+share/help/pa/gnome-help/figures/keyboard-key-play.svg
+share/help/pa/gnome-help/figures/keyboard-key-previous.svg
+share/help/pa/gnome-help/figures/keyboard-key-search.svg
+share/help/pa/gnome-help/figures/keyboard-key-stop.svg
+share/help/pa/gnome-help/figures/keyboard-key-voldown.svg
+share/help/pa/gnome-help/figures/keyboard-key-volup.svg
+share/help/pa/gnome-help/figures/keyboard-key-world.svg
share/help/pa/gnome-help/figures/nautilus-icons.png
share/help/pa/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/pa/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -7842,35 +9586,26 @@ share/help/pa/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/pa/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/pa/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/pa/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/pa/gnome-help/figures/notification-buttons.png
share/help/pa/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/pa/gnome-help/figures/printing-select.png
share/help/pa/gnome-help/figures/shell-activities-classic.png
share/help/pa/gnome-help/figures/shell-activities.png
share/help/pa/gnome-help/figures/shell-appmenu-classic.png
share/help/pa/gnome-help/figures/shell-appmenu-shell.png
-share/help/pa/gnome-help/figures/shell-apps-open.png
share/help/pa/gnome-help/figures/shell-appts-classic.png
share/help/pa/gnome-help/figures/shell-appts.png
share/help/pa/gnome-help/figures/shell-dash.png
share/help/pa/gnome-help/figures/shell-exit-classic.png
share/help/pa/gnome-help/figures/shell-exit.png
-share/help/pa/gnome-help/figures/shell-files.png
-share/help/pa/gnome-help/figures/shell-introduction.png
-share/help/pa/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/pa/gnome-help/figures/shell-lock.png
-share/help/pa/gnome-help/figures/shell-notification.png
share/help/pa/gnome-help/figures/shell-top-bar-classic.png
share/help/pa/gnome-help/figures/shell-top-bar.png
share/help/pa/gnome-help/figures/shell-window-list-classic.png
-share/help/pa/gnome-help/figures/shell-windows.png
share/help/pa/gnome-help/figures/shell-workspaces.png
-share/help/pa/gnome-help/figures/shell.png
share/help/pa/gnome-help/figures/system-run-symbolic.svg
share/help/pa/gnome-help/figures/top-bar-icons-classic.png
share/help/pa/gnome-help/figures/top-bar-icons.png
share/help/pa/gnome-help/figures/universal-access-menu.png
-share/help/pa/gnome-help/figures/view-fullscreen-16.png
share/help/pa/gnome-help/figures/view-more-symbolic.svg
share/help/pa/gnome-help/figures/yelp-icon-big.png
share/help/pa/gnome-help/files-autorun.page
@@ -7981,6 +9716,8 @@ share/help/pa/gnome-help/net-wireless-troubleshooting.page
share/help/pa/gnome-help/net-wireless-wepwpa.page
share/help/pa/gnome-help/net-wireless.page
share/help/pa/gnome-help/net.page
+share/help/pa/gnome-help/power-autobrightness.page
+share/help/pa/gnome-help/power-autosuspend.page
share/help/pa/gnome-help/power-batteryestimate.page
share/help/pa/gnome-help/power-batterylife.page
share/help/pa/gnome-help/power-batteryoptimal.page
@@ -7992,10 +9729,12 @@ share/help/pa/gnome-help/power-hotcomputer.page
share/help/pa/gnome-help/power-lowpower.page
share/help/pa/gnome-help/power-nowireless.page
share/help/pa/gnome-help/power-othercountry.page
+share/help/pa/gnome-help/power-status.page
share/help/pa/gnome-help/power-suspend.page
share/help/pa/gnome-help/power-suspendfail.page
share/help/pa/gnome-help/power-whydim.page
share/help/pa/gnome-help/power-willnotturnon.page
+share/help/pa/gnome-help/power-wireless.page
share/help/pa/gnome-help/power.page
share/help/pa/gnome-help/prefs-display.page
share/help/pa/gnome-help/prefs-language.page
@@ -8079,6 +9818,794 @@ share/help/pa/gnome-help/wacom-mode.page
share/help/pa/gnome-help/wacom-multi-monitor.page
share/help/pa/gnome-help/wacom-stylus.page
share/help/pa/gnome-help/wacom.page
+share/help/pl/gnome-help/a11y-bouncekeys.page
+share/help/pl/gnome-help/a11y-braille.page
+share/help/pl/gnome-help/a11y-contrast.page
+share/help/pl/gnome-help/a11y-dwellclick.page
+share/help/pl/gnome-help/a11y-font-size.page
+share/help/pl/gnome-help/a11y-icon.page
+share/help/pl/gnome-help/a11y-mag.page
+share/help/pl/gnome-help/a11y-right-click.page
+share/help/pl/gnome-help/a11y-screen-reader.page
+share/help/pl/gnome-help/a11y-slowkeys.page
+share/help/pl/gnome-help/a11y-stickykeys.page
+share/help/pl/gnome-help/a11y-visualalert.page
+share/help/pl/gnome-help/a11y.page
+share/help/pl/gnome-help/about-this-guide.page
+share/help/pl/gnome-help/accounts-add.page
+share/help/pl/gnome-help/accounts-disable-service.page
+share/help/pl/gnome-help/accounts-provider-not-available.page
+share/help/pl/gnome-help/accounts-remove.page
+share/help/pl/gnome-help/accounts-which-application.page
+share/help/pl/gnome-help/accounts-whyadd.page
+share/help/pl/gnome-help/accounts.page
+share/help/pl/gnome-help/backup-check.page
+share/help/pl/gnome-help/backup-frequency.page
+share/help/pl/gnome-help/backup-how.page
+share/help/pl/gnome-help/backup-restore.page
+share/help/pl/gnome-help/backup-thinkabout.page
+share/help/pl/gnome-help/backup-what.page
+share/help/pl/gnome-help/backup-where.page
+share/help/pl/gnome-help/backup-why.page
+share/help/pl/gnome-help/bluetooth-connect-device.page
+share/help/pl/gnome-help/bluetooth-problem-connecting.page
+share/help/pl/gnome-help/bluetooth-remove-connection.page
+share/help/pl/gnome-help/bluetooth-send-file.page
+share/help/pl/gnome-help/bluetooth-turn-on-off.page
+share/help/pl/gnome-help/bluetooth-visibility.page
+share/help/pl/gnome-help/bluetooth.page
+share/help/pl/gnome-help/clock-calendar.page
+share/help/pl/gnome-help/clock-set.page
+share/help/pl/gnome-help/clock-timezone.page
+share/help/pl/gnome-help/clock-world.page
+share/help/pl/gnome-help/clock.page
+share/help/pl/gnome-help/color-assignprofiles.page
+share/help/pl/gnome-help/color-calibrate-camera.page
+share/help/pl/gnome-help/color-calibrate-printer.page
+share/help/pl/gnome-help/color-calibrate-scanner.page
+share/help/pl/gnome-help/color-calibrate-screen.page
+share/help/pl/gnome-help/color-calibrationcharacterization.page
+share/help/pl/gnome-help/color-calibrationdevices.page
+share/help/pl/gnome-help/color-calibrationtargets.page
+share/help/pl/gnome-help/color-canshareprofiles.page
+share/help/pl/gnome-help/color-gettingprofiles.page
+share/help/pl/gnome-help/color-howtoimport.page
+share/help/pl/gnome-help/color-missingvcgt.page
+share/help/pl/gnome-help/color-notifications.page
+share/help/pl/gnome-help/color-notspecifiededid.page
+share/help/pl/gnome-help/color-testing.page
+share/help/pl/gnome-help/color-whatisprofile.page
+share/help/pl/gnome-help/color-whatisspace.page
+share/help/pl/gnome-help/color-why-calibrate.page
+share/help/pl/gnome-help/color-whyimportant.page
+share/help/pl/gnome-help/color.page
+share/help/pl/gnome-help/contacts-add-remove.page
+share/help/pl/gnome-help/contacts-connect.page
+share/help/pl/gnome-help/contacts-edit-details.page
+share/help/pl/gnome-help/contacts-link-unlink.page
+share/help/pl/gnome-help/contacts-search.page
+share/help/pl/gnome-help/contacts-setup.page
+share/help/pl/gnome-help/contacts.page
+share/help/pl/gnome-help/disk-benchmark.page
+share/help/pl/gnome-help/disk-capacity.page
+share/help/pl/gnome-help/disk-check.page
+share/help/pl/gnome-help/disk-format.page
+share/help/pl/gnome-help/disk-partitions.page
+share/help/pl/gnome-help/disk-repair.page
+share/help/pl/gnome-help/disk-resize.page
+share/help/pl/gnome-help/disk.page
+share/help/pl/gnome-help/display-blank.page
+share/help/pl/gnome-help/display-brightness.page
+share/help/pl/gnome-help/display-dual-monitors.page
+share/help/pl/gnome-help/figures/audio-volume-high-symbolic.svg
+share/help/pl/gnome-help/figures/audio-volume-low-symbolic.svg
+share/help/pl/gnome-help/figures/audio-volume-medium-symbolic.svg
+share/help/pl/gnome-help/figures/audio-volume-muted-symbolic.svg
+share/help/pl/gnome-help/figures/battery-caution-charging-symbolic.svg
+share/help/pl/gnome-help/figures/battery-caution-symbolic.svg
+share/help/pl/gnome-help/figures/battery-empty-charging-symbolic.svg
+share/help/pl/gnome-help/figures/battery-empty-symbolic.svg
+share/help/pl/gnome-help/figures/battery-full-charged-symbolic.svg
+share/help/pl/gnome-help/figures/battery-full-charging-symbolic.svg
+share/help/pl/gnome-help/figures/battery-full-symbolic.svg
+share/help/pl/gnome-help/figures/battery-good-charging-symbolic.svg
+share/help/pl/gnome-help/figures/battery-good-symbolic.svg
+share/help/pl/gnome-help/figures/battery-low-charging-symbolic.svg
+share/help/pl/gnome-help/figures/battery-low-symbolic.svg
+share/help/pl/gnome-help/figures/battery-missing-symbolic.svg
+share/help/pl/gnome-help/figures/bluetooth-active-symbolic.svg
+share/help/pl/gnome-help/figures/bluetooth-disabled-symbolic.svg
+share/help/pl/gnome-help/figures/bluetooth-menu.png
+share/help/pl/gnome-help/figures/color-average.png
+share/help/pl/gnome-help/figures/color-camera.png
+share/help/pl/gnome-help/figures/color-display.png
+share/help/pl/gnome-help/figures/color-printer.png
+share/help/pl/gnome-help/figures/color-profile-default.png
+share/help/pl/gnome-help/figures/color-space.png
+share/help/pl/gnome-help/figures/display-dual-monitors.webm
+share/help/pl/gnome-help/figures/emblem-system-symbolic.svg
+share/help/pl/gnome-help/figures/emblem-system.png
+share/help/pl/gnome-help/figures/gnome.png
+share/help/pl/gnome-help/figures/go-down.png
+share/help/pl/gnome-help/figures/input-keyboard-symbolic.png
+share/help/pl/gnome-help/figures/input-methods-switcher.png
+share/help/pl/gnome-help/figures/keyboard-key-calculator.svg
+share/help/pl/gnome-help/figures/keyboard-key-computer.svg
+share/help/pl/gnome-help/figures/keyboard-key-eject.svg
+share/help/pl/gnome-help/figures/keyboard-key-folder.svg
+share/help/pl/gnome-help/figures/keyboard-key-home.svg
+share/help/pl/gnome-help/figures/keyboard-key-mail.svg
+share/help/pl/gnome-help/figures/keyboard-key-media.svg
+share/help/pl/gnome-help/figures/keyboard-key-menu.svg
+share/help/pl/gnome-help/figures/keyboard-key-mute.svg
+share/help/pl/gnome-help/figures/keyboard-key-next.svg
+share/help/pl/gnome-help/figures/keyboard-key-pause.svg
+share/help/pl/gnome-help/figures/keyboard-key-play.svg
+share/help/pl/gnome-help/figures/keyboard-key-previous.svg
+share/help/pl/gnome-help/figures/keyboard-key-search.svg
+share/help/pl/gnome-help/figures/keyboard-key-stop.svg
+share/help/pl/gnome-help/figures/keyboard-key-voldown.svg
+share/help/pl/gnome-help/figures/keyboard-key-volup.svg
+share/help/pl/gnome-help/figures/keyboard-key-world.svg
+share/help/pl/gnome-help/figures/nautilus-icons.png
+share/help/pl/gnome-help/figures/network-cellular-3g-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-4g-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-acquiring-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-connected-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-edge-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-gprs-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-signal-excellent-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-signal-good-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-signal-none-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-signal-ok-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-signal-weak-symbolic.svg
+share/help/pl/gnome-help/figures/network-cellular-umts-symbolic.svg
+share/help/pl/gnome-help/figures/network-error-symbolic.svg
+share/help/pl/gnome-help/figures/network-idle-symbolic.svg
+share/help/pl/gnome-help/figures/network-no-route-symbolic.svg
+share/help/pl/gnome-help/figures/network-offline-symbolic.svg
+share/help/pl/gnome-help/figures/network-receive-symbolic.svg
+share/help/pl/gnome-help/figures/network-transmit-receive-symbolic.svg
+share/help/pl/gnome-help/figures/network-transmit-symbolic.svg
+share/help/pl/gnome-help/figures/network-vpn-acquiring-symbolic.svg
+share/help/pl/gnome-help/figures/network-vpn-symbolic.svg
+share/help/pl/gnome-help/figures/network-wired-acquiring-symbolic.svg
+share/help/pl/gnome-help/figures/network-wired-disconnected-symbolic.svg
+share/help/pl/gnome-help/figures/network-wired-symbolic.svg
+share/help/pl/gnome-help/figures/network-wireless-acquiring-symbolic.svg
+share/help/pl/gnome-help/figures/network-wireless-connected-symbolic.svg
+share/help/pl/gnome-help/figures/network-wireless-encrypted-symbolic.svg
+share/help/pl/gnome-help/figures/network-wireless-signal-excellent-symbolic.svg
+share/help/pl/gnome-help/figures/network-wireless-signal-good-symbolic.svg
+share/help/pl/gnome-help/figures/network-wireless-signal-none-symbolic.svg
+share/help/pl/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
+share/help/pl/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
+share/help/pl/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
+share/help/pl/gnome-help/figures/printing-select.png
+share/help/pl/gnome-help/figures/shell-activities-classic.png
+share/help/pl/gnome-help/figures/shell-activities.png
+share/help/pl/gnome-help/figures/shell-appmenu-classic.png
+share/help/pl/gnome-help/figures/shell-appmenu-shell.png
+share/help/pl/gnome-help/figures/shell-appts-classic.png
+share/help/pl/gnome-help/figures/shell-appts.png
+share/help/pl/gnome-help/figures/shell-dash.png
+share/help/pl/gnome-help/figures/shell-exit-classic.png
+share/help/pl/gnome-help/figures/shell-exit.png
+share/help/pl/gnome-help/figures/shell-lock.png
+share/help/pl/gnome-help/figures/shell-top-bar-classic.png
+share/help/pl/gnome-help/figures/shell-top-bar.png
+share/help/pl/gnome-help/figures/shell-window-list-classic.png
+share/help/pl/gnome-help/figures/shell-workspaces.png
+share/help/pl/gnome-help/figures/system-run-symbolic.svg
+share/help/pl/gnome-help/figures/top-bar-icons-classic.png
+share/help/pl/gnome-help/figures/top-bar-icons.png
+share/help/pl/gnome-help/figures/universal-access-menu.png
+share/help/pl/gnome-help/figures/view-more-symbolic.svg
+share/help/pl/gnome-help/figures/yelp-icon-big.png
+share/help/pl/gnome-help/files-autorun.page
+share/help/pl/gnome-help/files-browse.page
+share/help/pl/gnome-help/files-copy.page
+share/help/pl/gnome-help/files-delete.page
+share/help/pl/gnome-help/files-disc-write.page
+share/help/pl/gnome-help/files-hidden.page
+share/help/pl/gnome-help/files-lost.page
+share/help/pl/gnome-help/files-open.page
+share/help/pl/gnome-help/files-preview.page
+share/help/pl/gnome-help/files-recover.page
+share/help/pl/gnome-help/files-removedrive.page
+share/help/pl/gnome-help/files-rename.page
+share/help/pl/gnome-help/files-search.page
+share/help/pl/gnome-help/files-select.page
+share/help/pl/gnome-help/files-share.page
+share/help/pl/gnome-help/files-sort.page
+share/help/pl/gnome-help/files-templates.page
+share/help/pl/gnome-help/files-tilde.page
+share/help/pl/gnome-help/files.page
+share/help/pl/gnome-help/get-involved.page
+share/help/pl/gnome-help/gnome-classic.page
+share/help/pl/gnome-help/gnome-version.page
+share/help/pl/gnome-help/hardware-auth.page
+share/help/pl/gnome-help/hardware-cardreader.page
+share/help/pl/gnome-help/hardware-driver.page
+share/help/pl/gnome-help/hardware-problems-graphics.page
+share/help/pl/gnome-help/hardware.page
+share/help/pl/gnome-help/help-irc.page
+share/help/pl/gnome-help/help-mailing-list.page
+share/help/pl/gnome-help/index.page
+share/help/pl/gnome-help/keyboard-cursor-blink.page
+share/help/pl/gnome-help/keyboard-key-menu.page
+share/help/pl/gnome-help/keyboard-key-super.page
+share/help/pl/gnome-help/keyboard-layouts.page
+share/help/pl/gnome-help/keyboard-nav.page
+share/help/pl/gnome-help/keyboard-osk.page
+share/help/pl/gnome-help/keyboard-repeat-keys.page
+share/help/pl/gnome-help/keyboard-shortcuts-set.page
+share/help/pl/gnome-help/keyboard.page
+share/help/pl/gnome-help/legal.xml
+share/help/pl/gnome-help/look-background.page
+share/help/pl/gnome-help/look-display-fuzzy.page
+share/help/pl/gnome-help/look-resolution.page
+share/help/pl/gnome-help/media.page
+share/help/pl/gnome-help/more-help.page
+share/help/pl/gnome-help/mouse-doubleclick.page
+share/help/pl/gnome-help/mouse-lefthanded.page
+share/help/pl/gnome-help/mouse-middleclick.page
+share/help/pl/gnome-help/mouse-mousekeys.page
+share/help/pl/gnome-help/mouse-problem-notmoving.page
+share/help/pl/gnome-help/mouse-sensitivity.page
+share/help/pl/gnome-help/mouse-touchpad-click.page
+share/help/pl/gnome-help/mouse-wakeup.page
+share/help/pl/gnome-help/mouse.page
+share/help/pl/gnome-help/music-cantplay-drm.page
+share/help/pl/gnome-help/music-player-ipodtransfer.page
+share/help/pl/gnome-help/music-player-newipod.page
+share/help/pl/gnome-help/nautilus-behavior.page
+share/help/pl/gnome-help/nautilus-bookmarks-edit.page
+share/help/pl/gnome-help/nautilus-connect.page
+share/help/pl/gnome-help/nautilus-display.page
+share/help/pl/gnome-help/nautilus-file-properties-basic.page
+share/help/pl/gnome-help/nautilus-file-properties-permissions.page
+share/help/pl/gnome-help/nautilus-list.page
+share/help/pl/gnome-help/nautilus-prefs.page
+share/help/pl/gnome-help/nautilus-preview.page
+share/help/pl/gnome-help/nautilus-views.page
+share/help/pl/gnome-help/net-antivirus.page
+share/help/pl/gnome-help/net-browser.page
+share/help/pl/gnome-help/net-default-browser.page
+share/help/pl/gnome-help/net-default-email.page
+share/help/pl/gnome-help/net-email-virus.page
+share/help/pl/gnome-help/net-email.page
+share/help/pl/gnome-help/net-findip.page
+share/help/pl/gnome-help/net-firewall-on-off.page
+share/help/pl/gnome-help/net-firewall-ports.page
+share/help/pl/gnome-help/net-fixed-ip-address.page
+share/help/pl/gnome-help/net-general.page
+share/help/pl/gnome-help/net-install-flash.page
+share/help/pl/gnome-help/net-macaddress.page
+share/help/pl/gnome-help/net-manual.page
+share/help/pl/gnome-help/net-mobile.page
+share/help/pl/gnome-help/net-othersconnect.page
+share/help/pl/gnome-help/net-othersedit.page
+share/help/pl/gnome-help/net-problem.page
+share/help/pl/gnome-help/net-proxy.page
+share/help/pl/gnome-help/net-security-tips.page
+share/help/pl/gnome-help/net-security.page
+share/help/pl/gnome-help/net-slow.page
+share/help/pl/gnome-help/net-vpn-connect.page
+share/help/pl/gnome-help/net-what-is-ip-address.page
+share/help/pl/gnome-help/net-wired-connect.page
+share/help/pl/gnome-help/net-wired.page
+share/help/pl/gnome-help/net-wireless-adhoc.page
+share/help/pl/gnome-help/net-wireless-airplane.page
+share/help/pl/gnome-help/net-wireless-connect.page
+share/help/pl/gnome-help/net-wireless-disconnecting.page
+share/help/pl/gnome-help/net-wireless-find.page
+share/help/pl/gnome-help/net-wireless-hidden.page
+share/help/pl/gnome-help/net-wireless-noconnection.page
+share/help/pl/gnome-help/net-wireless-troubleshooting-device-drivers.page
+share/help/pl/gnome-help/net-wireless-troubleshooting-hardware-check.page
+share/help/pl/gnome-help/net-wireless-troubleshooting-hardware-info.page
+share/help/pl/gnome-help/net-wireless-troubleshooting-initial-check.page
+share/help/pl/gnome-help/net-wireless-troubleshooting.page
+share/help/pl/gnome-help/net-wireless-wepwpa.page
+share/help/pl/gnome-help/net-wireless.page
+share/help/pl/gnome-help/net.page
+share/help/pl/gnome-help/power-autobrightness.page
+share/help/pl/gnome-help/power-autosuspend.page
+share/help/pl/gnome-help/power-batteryestimate.page
+share/help/pl/gnome-help/power-batterylife.page
+share/help/pl/gnome-help/power-batteryoptimal.page
+share/help/pl/gnome-help/power-batteryslow.page
+share/help/pl/gnome-help/power-batterywindows.page
+share/help/pl/gnome-help/power-closelid.page
+share/help/pl/gnome-help/power-constantfan.page
+share/help/pl/gnome-help/power-hotcomputer.page
+share/help/pl/gnome-help/power-lowpower.page
+share/help/pl/gnome-help/power-nowireless.page
+share/help/pl/gnome-help/power-othercountry.page
+share/help/pl/gnome-help/power-status.page
+share/help/pl/gnome-help/power-suspend.page
+share/help/pl/gnome-help/power-suspendfail.page
+share/help/pl/gnome-help/power-whydim.page
+share/help/pl/gnome-help/power-willnotturnon.page
+share/help/pl/gnome-help/power-wireless.page
+share/help/pl/gnome-help/power.page
+share/help/pl/gnome-help/prefs-display.page
+share/help/pl/gnome-help/prefs-language.page
+share/help/pl/gnome-help/prefs-sharing.page
+share/help/pl/gnome-help/prefs.page
+share/help/pl/gnome-help/printing-2sided.page
+share/help/pl/gnome-help/printing-booklet-duplex.page
+share/help/pl/gnome-help/printing-booklet-singlesided.page
+share/help/pl/gnome-help/printing-booklet.page
+share/help/pl/gnome-help/printing-cancel-job.page
+share/help/pl/gnome-help/printing-differentsize.page
+share/help/pl/gnome-help/printing-envelopes.page
+share/help/pl/gnome-help/printing-inklevel.page
+share/help/pl/gnome-help/printing-name-location.page
+share/help/pl/gnome-help/printing-order.page
+share/help/pl/gnome-help/printing-paperjam.page
+share/help/pl/gnome-help/printing-select.page
+share/help/pl/gnome-help/printing-setup-default-printer.page
+share/help/pl/gnome-help/printing-setup.page
+share/help/pl/gnome-help/printing-streaks.page
+share/help/pl/gnome-help/printing-to-file.page
+share/help/pl/gnome-help/printing.page
+share/help/pl/gnome-help/privacy-history-recent-off.page
+share/help/pl/gnome-help/privacy-location.page
+share/help/pl/gnome-help/privacy-purge.page
+share/help/pl/gnome-help/privacy-screen-lock.page
+share/help/pl/gnome-help/privacy.page
+share/help/pl/gnome-help/screen-shot-record.page
+share/help/pl/gnome-help/session-fingerprint.page
+share/help/pl/gnome-help/session-formats.page
+share/help/pl/gnome-help/session-language.page
+share/help/pl/gnome-help/session-screenlocks.page
+share/help/pl/gnome-help/sharing-bluetooth.page
+share/help/pl/gnome-help/sharing-desktop.page
+share/help/pl/gnome-help/sharing-displayname.page
+share/help/pl/gnome-help/sharing-media.page
+share/help/pl/gnome-help/sharing-personal.page
+share/help/pl/gnome-help/sharing.page
+share/help/pl/gnome-help/shell-apps-favorites.page
+share/help/pl/gnome-help/shell-apps-open.page
+share/help/pl/gnome-help/shell-exit.page
+share/help/pl/gnome-help/shell-introduction.page
+share/help/pl/gnome-help/shell-keyboard-shortcuts.page
+share/help/pl/gnome-help/shell-lockscreen.page
+share/help/pl/gnome-help/shell-notifications.page
+share/help/pl/gnome-help/shell-overview.page
+share/help/pl/gnome-help/shell-windows-lost.page
+share/help/pl/gnome-help/shell-windows-maximize.page
+share/help/pl/gnome-help/shell-windows-states.page
+share/help/pl/gnome-help/shell-windows-switching.page
+share/help/pl/gnome-help/shell-windows-tiled.page
+share/help/pl/gnome-help/shell-windows.page
+share/help/pl/gnome-help/shell-workspaces-movewindow.page
+share/help/pl/gnome-help/shell-workspaces-switch.page
+share/help/pl/gnome-help/shell-workspaces.page
+share/help/pl/gnome-help/sound-alert.page
+share/help/pl/gnome-help/sound-broken.page
+share/help/pl/gnome-help/sound-crackle.page
+share/help/pl/gnome-help/sound-nosound.page
+share/help/pl/gnome-help/sound-usemic.page
+share/help/pl/gnome-help/sound-usespeakers.page
+share/help/pl/gnome-help/sound-volume.page
+share/help/pl/gnome-help/status-icons.page
+share/help/pl/gnome-help/tips-specialchars.page
+share/help/pl/gnome-help/tips.page
+share/help/pl/gnome-help/translate.page
+share/help/pl/gnome-help/user-accounts.page
+share/help/pl/gnome-help/user-add.page
+share/help/pl/gnome-help/user-admin-change.page
+share/help/pl/gnome-help/user-admin-explain.page
+share/help/pl/gnome-help/user-admin-problems.page
+share/help/pl/gnome-help/user-autologin.page
+share/help/pl/gnome-help/user-changepassword.page
+share/help/pl/gnome-help/user-changepicture.page
+share/help/pl/gnome-help/user-delete.page
+share/help/pl/gnome-help/user-goodpassword.page
+share/help/pl/gnome-help/video-dvd.page
+share/help/pl/gnome-help/video-sending.page
+share/help/pl/gnome-help/wacom-left-handed.page
+share/help/pl/gnome-help/wacom-mode.page
+share/help/pl/gnome-help/wacom-multi-monitor.page
+share/help/pl/gnome-help/wacom-stylus.page
+share/help/pl/gnome-help/wacom.page
+share/help/pt/gnome-help/a11y-bouncekeys.page
+share/help/pt/gnome-help/a11y-braille.page
+share/help/pt/gnome-help/a11y-contrast.page
+share/help/pt/gnome-help/a11y-dwellclick.page
+share/help/pt/gnome-help/a11y-font-size.page
+share/help/pt/gnome-help/a11y-icon.page
+share/help/pt/gnome-help/a11y-mag.page
+share/help/pt/gnome-help/a11y-right-click.page
+share/help/pt/gnome-help/a11y-screen-reader.page
+share/help/pt/gnome-help/a11y-slowkeys.page
+share/help/pt/gnome-help/a11y-stickykeys.page
+share/help/pt/gnome-help/a11y-visualalert.page
+share/help/pt/gnome-help/a11y.page
+share/help/pt/gnome-help/about-this-guide.page
+share/help/pt/gnome-help/accounts-add.page
+share/help/pt/gnome-help/accounts-disable-service.page
+share/help/pt/gnome-help/accounts-provider-not-available.page
+share/help/pt/gnome-help/accounts-remove.page
+share/help/pt/gnome-help/accounts-which-application.page
+share/help/pt/gnome-help/accounts-whyadd.page
+share/help/pt/gnome-help/accounts.page
+share/help/pt/gnome-help/backup-check.page
+share/help/pt/gnome-help/backup-frequency.page
+share/help/pt/gnome-help/backup-how.page
+share/help/pt/gnome-help/backup-restore.page
+share/help/pt/gnome-help/backup-thinkabout.page
+share/help/pt/gnome-help/backup-what.page
+share/help/pt/gnome-help/backup-where.page
+share/help/pt/gnome-help/backup-why.page
+share/help/pt/gnome-help/bluetooth-connect-device.page
+share/help/pt/gnome-help/bluetooth-problem-connecting.page
+share/help/pt/gnome-help/bluetooth-remove-connection.page
+share/help/pt/gnome-help/bluetooth-send-file.page
+share/help/pt/gnome-help/bluetooth-turn-on-off.page
+share/help/pt/gnome-help/bluetooth-visibility.page
+share/help/pt/gnome-help/bluetooth.page
+share/help/pt/gnome-help/clock-calendar.page
+share/help/pt/gnome-help/clock-set.page
+share/help/pt/gnome-help/clock-timezone.page
+share/help/pt/gnome-help/clock-world.page
+share/help/pt/gnome-help/clock.page
+share/help/pt/gnome-help/color-assignprofiles.page
+share/help/pt/gnome-help/color-calibrate-camera.page
+share/help/pt/gnome-help/color-calibrate-printer.page
+share/help/pt/gnome-help/color-calibrate-scanner.page
+share/help/pt/gnome-help/color-calibrate-screen.page
+share/help/pt/gnome-help/color-calibrationcharacterization.page
+share/help/pt/gnome-help/color-calibrationdevices.page
+share/help/pt/gnome-help/color-calibrationtargets.page
+share/help/pt/gnome-help/color-canshareprofiles.page
+share/help/pt/gnome-help/color-gettingprofiles.page
+share/help/pt/gnome-help/color-howtoimport.page
+share/help/pt/gnome-help/color-missingvcgt.page
+share/help/pt/gnome-help/color-notifications.page
+share/help/pt/gnome-help/color-notspecifiededid.page
+share/help/pt/gnome-help/color-testing.page
+share/help/pt/gnome-help/color-whatisprofile.page
+share/help/pt/gnome-help/color-whatisspace.page
+share/help/pt/gnome-help/color-why-calibrate.page
+share/help/pt/gnome-help/color-whyimportant.page
+share/help/pt/gnome-help/color.page
+share/help/pt/gnome-help/contacts-add-remove.page
+share/help/pt/gnome-help/contacts-connect.page
+share/help/pt/gnome-help/contacts-edit-details.page
+share/help/pt/gnome-help/contacts-link-unlink.page
+share/help/pt/gnome-help/contacts-search.page
+share/help/pt/gnome-help/contacts-setup.page
+share/help/pt/gnome-help/contacts.page
+share/help/pt/gnome-help/disk-benchmark.page
+share/help/pt/gnome-help/disk-capacity.page
+share/help/pt/gnome-help/disk-check.page
+share/help/pt/gnome-help/disk-format.page
+share/help/pt/gnome-help/disk-partitions.page
+share/help/pt/gnome-help/disk-repair.page
+share/help/pt/gnome-help/disk-resize.page
+share/help/pt/gnome-help/disk.page
+share/help/pt/gnome-help/display-blank.page
+share/help/pt/gnome-help/display-brightness.page
+share/help/pt/gnome-help/display-dual-monitors.page
+share/help/pt/gnome-help/figures/audio-volume-high-symbolic.svg
+share/help/pt/gnome-help/figures/audio-volume-low-symbolic.svg
+share/help/pt/gnome-help/figures/audio-volume-medium-symbolic.svg
+share/help/pt/gnome-help/figures/audio-volume-muted-symbolic.svg
+share/help/pt/gnome-help/figures/battery-caution-charging-symbolic.svg
+share/help/pt/gnome-help/figures/battery-caution-symbolic.svg
+share/help/pt/gnome-help/figures/battery-empty-charging-symbolic.svg
+share/help/pt/gnome-help/figures/battery-empty-symbolic.svg
+share/help/pt/gnome-help/figures/battery-full-charged-symbolic.svg
+share/help/pt/gnome-help/figures/battery-full-charging-symbolic.svg
+share/help/pt/gnome-help/figures/battery-full-symbolic.svg
+share/help/pt/gnome-help/figures/battery-good-charging-symbolic.svg
+share/help/pt/gnome-help/figures/battery-good-symbolic.svg
+share/help/pt/gnome-help/figures/battery-low-charging-symbolic.svg
+share/help/pt/gnome-help/figures/battery-low-symbolic.svg
+share/help/pt/gnome-help/figures/battery-missing-symbolic.svg
+share/help/pt/gnome-help/figures/bluetooth-active-symbolic.svg
+share/help/pt/gnome-help/figures/bluetooth-disabled-symbolic.svg
+share/help/pt/gnome-help/figures/bluetooth-menu.png
+share/help/pt/gnome-help/figures/color-average.png
+share/help/pt/gnome-help/figures/color-camera.png
+share/help/pt/gnome-help/figures/color-display.png
+share/help/pt/gnome-help/figures/color-printer.png
+share/help/pt/gnome-help/figures/color-profile-default.png
+share/help/pt/gnome-help/figures/color-space.png
+share/help/pt/gnome-help/figures/display-dual-monitors.webm
+share/help/pt/gnome-help/figures/emblem-system-symbolic.svg
+share/help/pt/gnome-help/figures/emblem-system.png
+share/help/pt/gnome-help/figures/gnome.png
+share/help/pt/gnome-help/figures/go-down.png
+share/help/pt/gnome-help/figures/input-keyboard-symbolic.png
+share/help/pt/gnome-help/figures/input-methods-switcher.png
+share/help/pt/gnome-help/figures/keyboard-key-calculator.svg
+share/help/pt/gnome-help/figures/keyboard-key-computer.svg
+share/help/pt/gnome-help/figures/keyboard-key-eject.svg
+share/help/pt/gnome-help/figures/keyboard-key-folder.svg
+share/help/pt/gnome-help/figures/keyboard-key-home.svg
+share/help/pt/gnome-help/figures/keyboard-key-mail.svg
+share/help/pt/gnome-help/figures/keyboard-key-media.svg
+share/help/pt/gnome-help/figures/keyboard-key-menu.svg
+share/help/pt/gnome-help/figures/keyboard-key-mute.svg
+share/help/pt/gnome-help/figures/keyboard-key-next.svg
+share/help/pt/gnome-help/figures/keyboard-key-pause.svg
+share/help/pt/gnome-help/figures/keyboard-key-play.svg
+share/help/pt/gnome-help/figures/keyboard-key-previous.svg
+share/help/pt/gnome-help/figures/keyboard-key-search.svg
+share/help/pt/gnome-help/figures/keyboard-key-stop.svg
+share/help/pt/gnome-help/figures/keyboard-key-voldown.svg
+share/help/pt/gnome-help/figures/keyboard-key-volup.svg
+share/help/pt/gnome-help/figures/keyboard-key-world.svg
+share/help/pt/gnome-help/figures/nautilus-icons.png
+share/help/pt/gnome-help/figures/network-cellular-3g-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-4g-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-acquiring-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-connected-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-edge-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-gprs-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-signal-excellent-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-signal-good-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-signal-none-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-signal-ok-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-signal-weak-symbolic.svg
+share/help/pt/gnome-help/figures/network-cellular-umts-symbolic.svg
+share/help/pt/gnome-help/figures/network-error-symbolic.svg
+share/help/pt/gnome-help/figures/network-idle-symbolic.svg
+share/help/pt/gnome-help/figures/network-no-route-symbolic.svg
+share/help/pt/gnome-help/figures/network-offline-symbolic.svg
+share/help/pt/gnome-help/figures/network-receive-symbolic.svg
+share/help/pt/gnome-help/figures/network-transmit-receive-symbolic.svg
+share/help/pt/gnome-help/figures/network-transmit-symbolic.svg
+share/help/pt/gnome-help/figures/network-vpn-acquiring-symbolic.svg
+share/help/pt/gnome-help/figures/network-vpn-symbolic.svg
+share/help/pt/gnome-help/figures/network-wired-acquiring-symbolic.svg
+share/help/pt/gnome-help/figures/network-wired-disconnected-symbolic.svg
+share/help/pt/gnome-help/figures/network-wired-symbolic.svg
+share/help/pt/gnome-help/figures/network-wireless-acquiring-symbolic.svg
+share/help/pt/gnome-help/figures/network-wireless-connected-symbolic.svg
+share/help/pt/gnome-help/figures/network-wireless-encrypted-symbolic.svg
+share/help/pt/gnome-help/figures/network-wireless-signal-excellent-symbolic.svg
+share/help/pt/gnome-help/figures/network-wireless-signal-good-symbolic.svg
+share/help/pt/gnome-help/figures/network-wireless-signal-none-symbolic.svg
+share/help/pt/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
+share/help/pt/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
+share/help/pt/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
+share/help/pt/gnome-help/figures/printing-select.png
+share/help/pt/gnome-help/figures/shell-activities-classic.png
+share/help/pt/gnome-help/figures/shell-activities.png
+share/help/pt/gnome-help/figures/shell-appmenu-classic.png
+share/help/pt/gnome-help/figures/shell-appmenu-shell.png
+share/help/pt/gnome-help/figures/shell-appts-classic.png
+share/help/pt/gnome-help/figures/shell-appts.png
+share/help/pt/gnome-help/figures/shell-dash.png
+share/help/pt/gnome-help/figures/shell-exit-classic.png
+share/help/pt/gnome-help/figures/shell-exit.png
+share/help/pt/gnome-help/figures/shell-lock.png
+share/help/pt/gnome-help/figures/shell-top-bar-classic.png
+share/help/pt/gnome-help/figures/shell-top-bar.png
+share/help/pt/gnome-help/figures/shell-window-list-classic.png
+share/help/pt/gnome-help/figures/shell-workspaces.png
+share/help/pt/gnome-help/figures/system-run-symbolic.svg
+share/help/pt/gnome-help/figures/top-bar-icons-classic.png
+share/help/pt/gnome-help/figures/top-bar-icons.png
+share/help/pt/gnome-help/figures/universal-access-menu.png
+share/help/pt/gnome-help/figures/view-more-symbolic.svg
+share/help/pt/gnome-help/figures/yelp-icon-big.png
+share/help/pt/gnome-help/files-autorun.page
+share/help/pt/gnome-help/files-browse.page
+share/help/pt/gnome-help/files-copy.page
+share/help/pt/gnome-help/files-delete.page
+share/help/pt/gnome-help/files-disc-write.page
+share/help/pt/gnome-help/files-hidden.page
+share/help/pt/gnome-help/files-lost.page
+share/help/pt/gnome-help/files-open.page
+share/help/pt/gnome-help/files-preview.page
+share/help/pt/gnome-help/files-recover.page
+share/help/pt/gnome-help/files-removedrive.page
+share/help/pt/gnome-help/files-rename.page
+share/help/pt/gnome-help/files-search.page
+share/help/pt/gnome-help/files-select.page
+share/help/pt/gnome-help/files-share.page
+share/help/pt/gnome-help/files-sort.page
+share/help/pt/gnome-help/files-templates.page
+share/help/pt/gnome-help/files-tilde.page
+share/help/pt/gnome-help/files.page
+share/help/pt/gnome-help/get-involved.page
+share/help/pt/gnome-help/gnome-classic.page
+share/help/pt/gnome-help/gnome-version.page
+share/help/pt/gnome-help/hardware-auth.page
+share/help/pt/gnome-help/hardware-cardreader.page
+share/help/pt/gnome-help/hardware-driver.page
+share/help/pt/gnome-help/hardware-problems-graphics.page
+share/help/pt/gnome-help/hardware.page
+share/help/pt/gnome-help/help-irc.page
+share/help/pt/gnome-help/help-mailing-list.page
+share/help/pt/gnome-help/index.page
+share/help/pt/gnome-help/keyboard-cursor-blink.page
+share/help/pt/gnome-help/keyboard-key-menu.page
+share/help/pt/gnome-help/keyboard-key-super.page
+share/help/pt/gnome-help/keyboard-layouts.page
+share/help/pt/gnome-help/keyboard-nav.page
+share/help/pt/gnome-help/keyboard-osk.page
+share/help/pt/gnome-help/keyboard-repeat-keys.page
+share/help/pt/gnome-help/keyboard-shortcuts-set.page
+share/help/pt/gnome-help/keyboard.page
+share/help/pt/gnome-help/legal.xml
+share/help/pt/gnome-help/look-background.page
+share/help/pt/gnome-help/look-display-fuzzy.page
+share/help/pt/gnome-help/look-resolution.page
+share/help/pt/gnome-help/media.page
+share/help/pt/gnome-help/more-help.page
+share/help/pt/gnome-help/mouse-doubleclick.page
+share/help/pt/gnome-help/mouse-lefthanded.page
+share/help/pt/gnome-help/mouse-middleclick.page
+share/help/pt/gnome-help/mouse-mousekeys.page
+share/help/pt/gnome-help/mouse-problem-notmoving.page
+share/help/pt/gnome-help/mouse-sensitivity.page
+share/help/pt/gnome-help/mouse-touchpad-click.page
+share/help/pt/gnome-help/mouse-wakeup.page
+share/help/pt/gnome-help/mouse.page
+share/help/pt/gnome-help/music-cantplay-drm.page
+share/help/pt/gnome-help/music-player-ipodtransfer.page
+share/help/pt/gnome-help/music-player-newipod.page
+share/help/pt/gnome-help/nautilus-behavior.page
+share/help/pt/gnome-help/nautilus-bookmarks-edit.page
+share/help/pt/gnome-help/nautilus-connect.page
+share/help/pt/gnome-help/nautilus-display.page
+share/help/pt/gnome-help/nautilus-file-properties-basic.page
+share/help/pt/gnome-help/nautilus-file-properties-permissions.page
+share/help/pt/gnome-help/nautilus-list.page
+share/help/pt/gnome-help/nautilus-prefs.page
+share/help/pt/gnome-help/nautilus-preview.page
+share/help/pt/gnome-help/nautilus-views.page
+share/help/pt/gnome-help/net-antivirus.page
+share/help/pt/gnome-help/net-browser.page
+share/help/pt/gnome-help/net-default-browser.page
+share/help/pt/gnome-help/net-default-email.page
+share/help/pt/gnome-help/net-email-virus.page
+share/help/pt/gnome-help/net-email.page
+share/help/pt/gnome-help/net-findip.page
+share/help/pt/gnome-help/net-firewall-on-off.page
+share/help/pt/gnome-help/net-firewall-ports.page
+share/help/pt/gnome-help/net-fixed-ip-address.page
+share/help/pt/gnome-help/net-general.page
+share/help/pt/gnome-help/net-install-flash.page
+share/help/pt/gnome-help/net-macaddress.page
+share/help/pt/gnome-help/net-manual.page
+share/help/pt/gnome-help/net-mobile.page
+share/help/pt/gnome-help/net-othersconnect.page
+share/help/pt/gnome-help/net-othersedit.page
+share/help/pt/gnome-help/net-problem.page
+share/help/pt/gnome-help/net-proxy.page
+share/help/pt/gnome-help/net-security-tips.page
+share/help/pt/gnome-help/net-security.page
+share/help/pt/gnome-help/net-slow.page
+share/help/pt/gnome-help/net-vpn-connect.page
+share/help/pt/gnome-help/net-what-is-ip-address.page
+share/help/pt/gnome-help/net-wired-connect.page
+share/help/pt/gnome-help/net-wired.page
+share/help/pt/gnome-help/net-wireless-adhoc.page
+share/help/pt/gnome-help/net-wireless-airplane.page
+share/help/pt/gnome-help/net-wireless-connect.page
+share/help/pt/gnome-help/net-wireless-disconnecting.page
+share/help/pt/gnome-help/net-wireless-find.page
+share/help/pt/gnome-help/net-wireless-hidden.page
+share/help/pt/gnome-help/net-wireless-noconnection.page
+share/help/pt/gnome-help/net-wireless-troubleshooting-device-drivers.page
+share/help/pt/gnome-help/net-wireless-troubleshooting-hardware-check.page
+share/help/pt/gnome-help/net-wireless-troubleshooting-hardware-info.page
+share/help/pt/gnome-help/net-wireless-troubleshooting-initial-check.page
+share/help/pt/gnome-help/net-wireless-troubleshooting.page
+share/help/pt/gnome-help/net-wireless-wepwpa.page
+share/help/pt/gnome-help/net-wireless.page
+share/help/pt/gnome-help/net.page
+share/help/pt/gnome-help/power-autobrightness.page
+share/help/pt/gnome-help/power-autosuspend.page
+share/help/pt/gnome-help/power-batteryestimate.page
+share/help/pt/gnome-help/power-batterylife.page
+share/help/pt/gnome-help/power-batteryoptimal.page
+share/help/pt/gnome-help/power-batteryslow.page
+share/help/pt/gnome-help/power-batterywindows.page
+share/help/pt/gnome-help/power-closelid.page
+share/help/pt/gnome-help/power-constantfan.page
+share/help/pt/gnome-help/power-hotcomputer.page
+share/help/pt/gnome-help/power-lowpower.page
+share/help/pt/gnome-help/power-nowireless.page
+share/help/pt/gnome-help/power-othercountry.page
+share/help/pt/gnome-help/power-status.page
+share/help/pt/gnome-help/power-suspend.page
+share/help/pt/gnome-help/power-suspendfail.page
+share/help/pt/gnome-help/power-whydim.page
+share/help/pt/gnome-help/power-willnotturnon.page
+share/help/pt/gnome-help/power-wireless.page
+share/help/pt/gnome-help/power.page
+share/help/pt/gnome-help/prefs-display.page
+share/help/pt/gnome-help/prefs-language.page
+share/help/pt/gnome-help/prefs-sharing.page
+share/help/pt/gnome-help/prefs.page
+share/help/pt/gnome-help/printing-2sided.page
+share/help/pt/gnome-help/printing-booklet-duplex.page
+share/help/pt/gnome-help/printing-booklet-singlesided.page
+share/help/pt/gnome-help/printing-booklet.page
+share/help/pt/gnome-help/printing-cancel-job.page
+share/help/pt/gnome-help/printing-differentsize.page
+share/help/pt/gnome-help/printing-envelopes.page
+share/help/pt/gnome-help/printing-inklevel.page
+share/help/pt/gnome-help/printing-name-location.page
+share/help/pt/gnome-help/printing-order.page
+share/help/pt/gnome-help/printing-paperjam.page
+share/help/pt/gnome-help/printing-select.page
+share/help/pt/gnome-help/printing-setup-default-printer.page
+share/help/pt/gnome-help/printing-setup.page
+share/help/pt/gnome-help/printing-streaks.page
+share/help/pt/gnome-help/printing-to-file.page
+share/help/pt/gnome-help/printing.page
+share/help/pt/gnome-help/privacy-history-recent-off.page
+share/help/pt/gnome-help/privacy-location.page
+share/help/pt/gnome-help/privacy-purge.page
+share/help/pt/gnome-help/privacy-screen-lock.page
+share/help/pt/gnome-help/privacy.page
+share/help/pt/gnome-help/screen-shot-record.page
+share/help/pt/gnome-help/session-fingerprint.page
+share/help/pt/gnome-help/session-formats.page
+share/help/pt/gnome-help/session-language.page
+share/help/pt/gnome-help/session-screenlocks.page
+share/help/pt/gnome-help/sharing-bluetooth.page
+share/help/pt/gnome-help/sharing-desktop.page
+share/help/pt/gnome-help/sharing-displayname.page
+share/help/pt/gnome-help/sharing-media.page
+share/help/pt/gnome-help/sharing-personal.page
+share/help/pt/gnome-help/sharing.page
+share/help/pt/gnome-help/shell-apps-favorites.page
+share/help/pt/gnome-help/shell-apps-open.page
+share/help/pt/gnome-help/shell-exit.page
+share/help/pt/gnome-help/shell-introduction.page
+share/help/pt/gnome-help/shell-keyboard-shortcuts.page
+share/help/pt/gnome-help/shell-lockscreen.page
+share/help/pt/gnome-help/shell-notifications.page
+share/help/pt/gnome-help/shell-overview.page
+share/help/pt/gnome-help/shell-windows-lost.page
+share/help/pt/gnome-help/shell-windows-maximize.page
+share/help/pt/gnome-help/shell-windows-states.page
+share/help/pt/gnome-help/shell-windows-switching.page
+share/help/pt/gnome-help/shell-windows-tiled.page
+share/help/pt/gnome-help/shell-windows.page
+share/help/pt/gnome-help/shell-workspaces-movewindow.page
+share/help/pt/gnome-help/shell-workspaces-switch.page
+share/help/pt/gnome-help/shell-workspaces.page
+share/help/pt/gnome-help/sound-alert.page
+share/help/pt/gnome-help/sound-broken.page
+share/help/pt/gnome-help/sound-crackle.page
+share/help/pt/gnome-help/sound-nosound.page
+share/help/pt/gnome-help/sound-usemic.page
+share/help/pt/gnome-help/sound-usespeakers.page
+share/help/pt/gnome-help/sound-volume.page
+share/help/pt/gnome-help/status-icons.page
+share/help/pt/gnome-help/tips-specialchars.page
+share/help/pt/gnome-help/tips.page
+share/help/pt/gnome-help/translate.page
+share/help/pt/gnome-help/user-accounts.page
+share/help/pt/gnome-help/user-add.page
+share/help/pt/gnome-help/user-admin-change.page
+share/help/pt/gnome-help/user-admin-explain.page
+share/help/pt/gnome-help/user-admin-problems.page
+share/help/pt/gnome-help/user-autologin.page
+share/help/pt/gnome-help/user-changepassword.page
+share/help/pt/gnome-help/user-changepicture.page
+share/help/pt/gnome-help/user-delete.page
+share/help/pt/gnome-help/user-goodpassword.page
+share/help/pt/gnome-help/video-dvd.page
+share/help/pt/gnome-help/video-sending.page
+share/help/pt/gnome-help/wacom-left-handed.page
+share/help/pt/gnome-help/wacom-mode.page
+share/help/pt/gnome-help/wacom-multi-monitor.page
+share/help/pt/gnome-help/wacom-stylus.page
+share/help/pt/gnome-help/wacom.page
share/help/pt_BR/gnome-help/a11y-bouncekeys.page
share/help/pt_BR/gnome-help/a11y-braille.page
share/help/pt_BR/gnome-help/a11y-contrast.page
@@ -8152,6 +10679,8 @@ share/help/pt_BR/gnome-help/disk-capacity.page
share/help/pt_BR/gnome-help/disk-check.page
share/help/pt_BR/gnome-help/disk-format.page
share/help/pt_BR/gnome-help/disk-partitions.page
+share/help/pt_BR/gnome-help/disk-repair.page
+share/help/pt_BR/gnome-help/disk-resize.page
share/help/pt_BR/gnome-help/disk.page
share/help/pt_BR/gnome-help/display-blank.page
share/help/pt_BR/gnome-help/display-brightness.page
@@ -8175,7 +10704,6 @@ share/help/pt_BR/gnome-help/figures/battery-missing-symbolic.svg
share/help/pt_BR/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/pt_BR/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/pt_BR/gnome-help/figures/bluetooth-menu.png
-share/help/pt_BR/gnome-help/figures/camera-photo-symbolic.svg
share/help/pt_BR/gnome-help/figures/color-average.png
share/help/pt_BR/gnome-help/figures/color-camera.png
share/help/pt_BR/gnome-help/figures/color-display.png
@@ -8183,15 +10711,30 @@ share/help/pt_BR/gnome-help/figures/color-printer.png
share/help/pt_BR/gnome-help/figures/color-profile-default.png
share/help/pt_BR/gnome-help/figures/color-space.png
share/help/pt_BR/gnome-help/figures/display-dual-monitors.webm
-share/help/pt_BR/gnome-help/figures/documents-icon.png
share/help/pt_BR/gnome-help/figures/emblem-system-symbolic.svg
share/help/pt_BR/gnome-help/figures/emblem-system.png
share/help/pt_BR/gnome-help/figures/gnome.png
share/help/pt_BR/gnome-help/figures/go-down.png
share/help/pt_BR/gnome-help/figures/input-keyboard-symbolic.png
share/help/pt_BR/gnome-help/figures/input-methods-switcher.png
+share/help/pt_BR/gnome-help/figures/keyboard-key-calculator.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-computer.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-eject.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-folder.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-home.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-mail.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-media.svg
share/help/pt_BR/gnome-help/figures/keyboard-key-menu.svg
-share/help/pt_BR/gnome-help/figures/nautilus-3-10.png
+share/help/pt_BR/gnome-help/figures/keyboard-key-mute.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-next.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-pause.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-play.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-previous.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-search.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-stop.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-voldown.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-volup.svg
+share/help/pt_BR/gnome-help/figures/keyboard-key-world.svg
share/help/pt_BR/gnome-help/figures/nautilus-icons.png
share/help/pt_BR/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/pt_BR/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -8225,35 +10768,26 @@ share/help/pt_BR/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/pt_BR/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/pt_BR/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/pt_BR/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/pt_BR/gnome-help/figures/notification-buttons.png
share/help/pt_BR/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/pt_BR/gnome-help/figures/printing-select.png
share/help/pt_BR/gnome-help/figures/shell-activities-classic.png
share/help/pt_BR/gnome-help/figures/shell-activities.png
share/help/pt_BR/gnome-help/figures/shell-appmenu-classic.png
share/help/pt_BR/gnome-help/figures/shell-appmenu-shell.png
-share/help/pt_BR/gnome-help/figures/shell-apps-open.png
share/help/pt_BR/gnome-help/figures/shell-appts-classic.png
share/help/pt_BR/gnome-help/figures/shell-appts.png
share/help/pt_BR/gnome-help/figures/shell-dash.png
share/help/pt_BR/gnome-help/figures/shell-exit-classic.png
share/help/pt_BR/gnome-help/figures/shell-exit.png
-share/help/pt_BR/gnome-help/figures/shell-files.png
-share/help/pt_BR/gnome-help/figures/shell-introduction.png
-share/help/pt_BR/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/pt_BR/gnome-help/figures/shell-lock.png
-share/help/pt_BR/gnome-help/figures/shell-notification.png
share/help/pt_BR/gnome-help/figures/shell-top-bar-classic.png
share/help/pt_BR/gnome-help/figures/shell-top-bar.png
share/help/pt_BR/gnome-help/figures/shell-window-list-classic.png
-share/help/pt_BR/gnome-help/figures/shell-windows.png
share/help/pt_BR/gnome-help/figures/shell-workspaces.png
-share/help/pt_BR/gnome-help/figures/shell.png
share/help/pt_BR/gnome-help/figures/system-run-symbolic.svg
share/help/pt_BR/gnome-help/figures/top-bar-icons-classic.png
share/help/pt_BR/gnome-help/figures/top-bar-icons.png
share/help/pt_BR/gnome-help/figures/universal-access-menu.png
-share/help/pt_BR/gnome-help/figures/view-fullscreen-16.png
share/help/pt_BR/gnome-help/figures/view-more-symbolic.svg
share/help/pt_BR/gnome-help/figures/yelp-icon-big.png
share/help/pt_BR/gnome-help/files-autorun.page
@@ -8364,6 +10898,8 @@ share/help/pt_BR/gnome-help/net-wireless-troubleshooting.page
share/help/pt_BR/gnome-help/net-wireless-wepwpa.page
share/help/pt_BR/gnome-help/net-wireless.page
share/help/pt_BR/gnome-help/net.page
+share/help/pt_BR/gnome-help/power-autobrightness.page
+share/help/pt_BR/gnome-help/power-autosuspend.page
share/help/pt_BR/gnome-help/power-batteryestimate.page
share/help/pt_BR/gnome-help/power-batterylife.page
share/help/pt_BR/gnome-help/power-batteryoptimal.page
@@ -8375,10 +10911,12 @@ share/help/pt_BR/gnome-help/power-hotcomputer.page
share/help/pt_BR/gnome-help/power-lowpower.page
share/help/pt_BR/gnome-help/power-nowireless.page
share/help/pt_BR/gnome-help/power-othercountry.page
+share/help/pt_BR/gnome-help/power-status.page
share/help/pt_BR/gnome-help/power-suspend.page
share/help/pt_BR/gnome-help/power-suspendfail.page
share/help/pt_BR/gnome-help/power-whydim.page
share/help/pt_BR/gnome-help/power-willnotturnon.page
+share/help/pt_BR/gnome-help/power-wireless.page
share/help/pt_BR/gnome-help/power.page
share/help/pt_BR/gnome-help/prefs-display.page
share/help/pt_BR/gnome-help/prefs-language.page
@@ -8462,6 +11000,452 @@ share/help/pt_BR/gnome-help/wacom-mode.page
share/help/pt_BR/gnome-help/wacom-multi-monitor.page
share/help/pt_BR/gnome-help/wacom-stylus.page
share/help/pt_BR/gnome-help/wacom.page
+share/help/pt_BR/system-admin-guide/appearance.page
+share/help/pt_BR/system-admin-guide/dconf-custom-defaults.page
+share/help/pt_BR/system-admin-guide/dconf-keyfiles.page
+share/help/pt_BR/system-admin-guide/dconf-lockdown.page
+share/help/pt_BR/system-admin-guide/dconf-nfs-home.page
+share/help/pt_BR/system-admin-guide/dconf-profiles.page
+share/help/pt_BR/system-admin-guide/dconf-snippets.xml
+share/help/pt_BR/system-admin-guide/dconf.page
+share/help/pt_BR/system-admin-guide/desktop-background.page
+share/help/pt_BR/system-admin-guide/desktop-favorite-applications.page
+share/help/pt_BR/system-admin-guide/desktop-lockscreen.page
+share/help/pt_BR/system-admin-guide/desktop-shield.page
+share/help/pt_BR/system-admin-guide/extensions-enable.page
+share/help/pt_BR/system-admin-guide/extensions-lockdown.page
+share/help/pt_BR/system-admin-guide/extensions.page
+share/help/pt_BR/system-admin-guide/fonts-user.page
+share/help/pt_BR/system-admin-guide/fonts.page
+share/help/pt_BR/system-admin-guide/index.page
+share/help/pt_BR/system-admin-guide/keyboard-layout.page
+share/help/pt_BR/system-admin-guide/legal.xml
+share/help/pt_BR/system-admin-guide/lockdown-command-line.page
+share/help/pt_BR/system-admin-guide/lockdown-file-saving.page
+share/help/pt_BR/system-admin-guide/lockdown-online-accounts.page
+share/help/pt_BR/system-admin-guide/lockdown-printing.page
+share/help/pt_BR/system-admin-guide/lockdown-repartitioning.page
+share/help/pt_BR/system-admin-guide/login-automatic.page
+share/help/pt_BR/system-admin-guide/login-banner.page
+share/help/pt_BR/system-admin-guide/login-enterprise.page
+share/help/pt_BR/system-admin-guide/login-fingerprint.page
+share/help/pt_BR/system-admin-guide/login-logo.page
+share/help/pt_BR/system-admin-guide/login-userlist-disable.page
+share/help/pt_BR/system-admin-guide/login.page
+share/help/pt_BR/system-admin-guide/logout-automatic.page
+share/help/pt_BR/system-admin-guide/mime-types-application-user.page
+share/help/pt_BR/system-admin-guide/mime-types-application.page
+share/help/pt_BR/system-admin-guide/mime-types-custom-user.page
+share/help/pt_BR/system-admin-guide/mime-types-custom.page
+share/help/pt_BR/system-admin-guide/mime-types.page
+share/help/pt_BR/system-admin-guide/network-printer-config.page
+share/help/pt_BR/system-admin-guide/network-server-list.page
+share/help/pt_BR/system-admin-guide/network-vpn.page
+share/help/pt_BR/system-admin-guide/network.page
+share/help/pt_BR/system-admin-guide/overrides.page
+share/help/pt_BR/system-admin-guide/power-dim-screen.page
+share/help/pt_BR/system-admin-guide/processes.page
+share/help/pt_BR/system-admin-guide/session-custom.page
+share/help/pt_BR/system-admin-guide/session-debug.page
+share/help/pt_BR/system-admin-guide/session-user.page
+share/help/pt_BR/system-admin-guide/setup.page
+share/help/pt_BR/system-admin-guide/software.page
+share/help/pt_BR/system-admin-guide/sundry.page
+share/help/pt_BR/system-admin-guide/user-settings.page
+share/help/ro/gnome-help/a11y-bouncekeys.page
+share/help/ro/gnome-help/a11y-braille.page
+share/help/ro/gnome-help/a11y-contrast.page
+share/help/ro/gnome-help/a11y-dwellclick.page
+share/help/ro/gnome-help/a11y-font-size.page
+share/help/ro/gnome-help/a11y-icon.page
+share/help/ro/gnome-help/a11y-mag.page
+share/help/ro/gnome-help/a11y-right-click.page
+share/help/ro/gnome-help/a11y-screen-reader.page
+share/help/ro/gnome-help/a11y-slowkeys.page
+share/help/ro/gnome-help/a11y-stickykeys.page
+share/help/ro/gnome-help/a11y-visualalert.page
+share/help/ro/gnome-help/a11y.page
+share/help/ro/gnome-help/about-this-guide.page
+share/help/ro/gnome-help/accounts-add.page
+share/help/ro/gnome-help/accounts-disable-service.page
+share/help/ro/gnome-help/accounts-provider-not-available.page
+share/help/ro/gnome-help/accounts-remove.page
+share/help/ro/gnome-help/accounts-which-application.page
+share/help/ro/gnome-help/accounts-whyadd.page
+share/help/ro/gnome-help/accounts.page
+share/help/ro/gnome-help/backup-check.page
+share/help/ro/gnome-help/backup-frequency.page
+share/help/ro/gnome-help/backup-how.page
+share/help/ro/gnome-help/backup-restore.page
+share/help/ro/gnome-help/backup-thinkabout.page
+share/help/ro/gnome-help/backup-what.page
+share/help/ro/gnome-help/backup-where.page
+share/help/ro/gnome-help/backup-why.page
+share/help/ro/gnome-help/bluetooth-connect-device.page
+share/help/ro/gnome-help/bluetooth-problem-connecting.page
+share/help/ro/gnome-help/bluetooth-remove-connection.page
+share/help/ro/gnome-help/bluetooth-send-file.page
+share/help/ro/gnome-help/bluetooth-turn-on-off.page
+share/help/ro/gnome-help/bluetooth-visibility.page
+share/help/ro/gnome-help/bluetooth.page
+share/help/ro/gnome-help/clock-calendar.page
+share/help/ro/gnome-help/clock-set.page
+share/help/ro/gnome-help/clock-timezone.page
+share/help/ro/gnome-help/clock-world.page
+share/help/ro/gnome-help/clock.page
+share/help/ro/gnome-help/color-assignprofiles.page
+share/help/ro/gnome-help/color-calibrate-camera.page
+share/help/ro/gnome-help/color-calibrate-printer.page
+share/help/ro/gnome-help/color-calibrate-scanner.page
+share/help/ro/gnome-help/color-calibrate-screen.page
+share/help/ro/gnome-help/color-calibrationcharacterization.page
+share/help/ro/gnome-help/color-calibrationdevices.page
+share/help/ro/gnome-help/color-calibrationtargets.page
+share/help/ro/gnome-help/color-canshareprofiles.page
+share/help/ro/gnome-help/color-gettingprofiles.page
+share/help/ro/gnome-help/color-howtoimport.page
+share/help/ro/gnome-help/color-missingvcgt.page
+share/help/ro/gnome-help/color-notifications.page
+share/help/ro/gnome-help/color-notspecifiededid.page
+share/help/ro/gnome-help/color-testing.page
+share/help/ro/gnome-help/color-whatisprofile.page
+share/help/ro/gnome-help/color-whatisspace.page
+share/help/ro/gnome-help/color-why-calibrate.page
+share/help/ro/gnome-help/color-whyimportant.page
+share/help/ro/gnome-help/color.page
+share/help/ro/gnome-help/contacts-add-remove.page
+share/help/ro/gnome-help/contacts-connect.page
+share/help/ro/gnome-help/contacts-edit-details.page
+share/help/ro/gnome-help/contacts-link-unlink.page
+share/help/ro/gnome-help/contacts-search.page
+share/help/ro/gnome-help/contacts-setup.page
+share/help/ro/gnome-help/contacts.page
+share/help/ro/gnome-help/disk-benchmark.page
+share/help/ro/gnome-help/disk-capacity.page
+share/help/ro/gnome-help/disk-check.page
+share/help/ro/gnome-help/disk-format.page
+share/help/ro/gnome-help/disk-partitions.page
+share/help/ro/gnome-help/disk-repair.page
+share/help/ro/gnome-help/disk-resize.page
+share/help/ro/gnome-help/disk.page
+share/help/ro/gnome-help/display-blank.page
+share/help/ro/gnome-help/display-brightness.page
+share/help/ro/gnome-help/display-dual-monitors.page
+share/help/ro/gnome-help/figures/audio-volume-high-symbolic.svg
+share/help/ro/gnome-help/figures/audio-volume-low-symbolic.svg
+share/help/ro/gnome-help/figures/audio-volume-medium-symbolic.svg
+share/help/ro/gnome-help/figures/audio-volume-muted-symbolic.svg
+share/help/ro/gnome-help/figures/battery-caution-charging-symbolic.svg
+share/help/ro/gnome-help/figures/battery-caution-symbolic.svg
+share/help/ro/gnome-help/figures/battery-empty-charging-symbolic.svg
+share/help/ro/gnome-help/figures/battery-empty-symbolic.svg
+share/help/ro/gnome-help/figures/battery-full-charged-symbolic.svg
+share/help/ro/gnome-help/figures/battery-full-charging-symbolic.svg
+share/help/ro/gnome-help/figures/battery-full-symbolic.svg
+share/help/ro/gnome-help/figures/battery-good-charging-symbolic.svg
+share/help/ro/gnome-help/figures/battery-good-symbolic.svg
+share/help/ro/gnome-help/figures/battery-low-charging-symbolic.svg
+share/help/ro/gnome-help/figures/battery-low-symbolic.svg
+share/help/ro/gnome-help/figures/battery-missing-symbolic.svg
+share/help/ro/gnome-help/figures/bluetooth-active-symbolic.svg
+share/help/ro/gnome-help/figures/bluetooth-disabled-symbolic.svg
+share/help/ro/gnome-help/figures/bluetooth-menu.png
+share/help/ro/gnome-help/figures/color-average.png
+share/help/ro/gnome-help/figures/color-camera.png
+share/help/ro/gnome-help/figures/color-display.png
+share/help/ro/gnome-help/figures/color-printer.png
+share/help/ro/gnome-help/figures/color-profile-default.png
+share/help/ro/gnome-help/figures/color-space.png
+share/help/ro/gnome-help/figures/display-dual-monitors.webm
+share/help/ro/gnome-help/figures/emblem-system-symbolic.svg
+share/help/ro/gnome-help/figures/emblem-system.png
+share/help/ro/gnome-help/figures/gnome.png
+share/help/ro/gnome-help/figures/go-down.png
+share/help/ro/gnome-help/figures/input-keyboard-symbolic.png
+share/help/ro/gnome-help/figures/input-methods-switcher.png
+share/help/ro/gnome-help/figures/keyboard-key-calculator.svg
+share/help/ro/gnome-help/figures/keyboard-key-computer.svg
+share/help/ro/gnome-help/figures/keyboard-key-eject.svg
+share/help/ro/gnome-help/figures/keyboard-key-folder.svg
+share/help/ro/gnome-help/figures/keyboard-key-home.svg
+share/help/ro/gnome-help/figures/keyboard-key-mail.svg
+share/help/ro/gnome-help/figures/keyboard-key-media.svg
+share/help/ro/gnome-help/figures/keyboard-key-menu.svg
+share/help/ro/gnome-help/figures/keyboard-key-mute.svg
+share/help/ro/gnome-help/figures/keyboard-key-next.svg
+share/help/ro/gnome-help/figures/keyboard-key-pause.svg
+share/help/ro/gnome-help/figures/keyboard-key-play.svg
+share/help/ro/gnome-help/figures/keyboard-key-previous.svg
+share/help/ro/gnome-help/figures/keyboard-key-search.svg
+share/help/ro/gnome-help/figures/keyboard-key-stop.svg
+share/help/ro/gnome-help/figures/keyboard-key-voldown.svg
+share/help/ro/gnome-help/figures/keyboard-key-volup.svg
+share/help/ro/gnome-help/figures/keyboard-key-world.svg
+share/help/ro/gnome-help/figures/nautilus-icons.png
+share/help/ro/gnome-help/figures/network-cellular-3g-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-4g-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-acquiring-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-connected-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-edge-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-gprs-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-signal-excellent-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-signal-good-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-signal-none-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-signal-ok-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-signal-weak-symbolic.svg
+share/help/ro/gnome-help/figures/network-cellular-umts-symbolic.svg
+share/help/ro/gnome-help/figures/network-error-symbolic.svg
+share/help/ro/gnome-help/figures/network-idle-symbolic.svg
+share/help/ro/gnome-help/figures/network-no-route-symbolic.svg
+share/help/ro/gnome-help/figures/network-offline-symbolic.svg
+share/help/ro/gnome-help/figures/network-receive-symbolic.svg
+share/help/ro/gnome-help/figures/network-transmit-receive-symbolic.svg
+share/help/ro/gnome-help/figures/network-transmit-symbolic.svg
+share/help/ro/gnome-help/figures/network-vpn-acquiring-symbolic.svg
+share/help/ro/gnome-help/figures/network-vpn-symbolic.svg
+share/help/ro/gnome-help/figures/network-wired-acquiring-symbolic.svg
+share/help/ro/gnome-help/figures/network-wired-disconnected-symbolic.svg
+share/help/ro/gnome-help/figures/network-wired-symbolic.svg
+share/help/ro/gnome-help/figures/network-wireless-acquiring-symbolic.svg
+share/help/ro/gnome-help/figures/network-wireless-connected-symbolic.svg
+share/help/ro/gnome-help/figures/network-wireless-encrypted-symbolic.svg
+share/help/ro/gnome-help/figures/network-wireless-signal-excellent-symbolic.svg
+share/help/ro/gnome-help/figures/network-wireless-signal-good-symbolic.svg
+share/help/ro/gnome-help/figures/network-wireless-signal-none-symbolic.svg
+share/help/ro/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
+share/help/ro/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
+share/help/ro/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
+share/help/ro/gnome-help/figures/printing-select.png
+share/help/ro/gnome-help/figures/shell-activities-classic.png
+share/help/ro/gnome-help/figures/shell-activities.png
+share/help/ro/gnome-help/figures/shell-appmenu-classic.png
+share/help/ro/gnome-help/figures/shell-appmenu-shell.png
+share/help/ro/gnome-help/figures/shell-appts-classic.png
+share/help/ro/gnome-help/figures/shell-appts.png
+share/help/ro/gnome-help/figures/shell-dash.png
+share/help/ro/gnome-help/figures/shell-exit-classic.png
+share/help/ro/gnome-help/figures/shell-exit.png
+share/help/ro/gnome-help/figures/shell-lock.png
+share/help/ro/gnome-help/figures/shell-top-bar-classic.png
+share/help/ro/gnome-help/figures/shell-top-bar.png
+share/help/ro/gnome-help/figures/shell-window-list-classic.png
+share/help/ro/gnome-help/figures/shell-workspaces.png
+share/help/ro/gnome-help/figures/system-run-symbolic.svg
+share/help/ro/gnome-help/figures/top-bar-icons-classic.png
+share/help/ro/gnome-help/figures/top-bar-icons.png
+share/help/ro/gnome-help/figures/universal-access-menu.png
+share/help/ro/gnome-help/figures/view-more-symbolic.svg
+share/help/ro/gnome-help/figures/yelp-icon-big.png
+share/help/ro/gnome-help/files-autorun.page
+share/help/ro/gnome-help/files-browse.page
+share/help/ro/gnome-help/files-copy.page
+share/help/ro/gnome-help/files-delete.page
+share/help/ro/gnome-help/files-disc-write.page
+share/help/ro/gnome-help/files-hidden.page
+share/help/ro/gnome-help/files-lost.page
+share/help/ro/gnome-help/files-open.page
+share/help/ro/gnome-help/files-preview.page
+share/help/ro/gnome-help/files-recover.page
+share/help/ro/gnome-help/files-removedrive.page
+share/help/ro/gnome-help/files-rename.page
+share/help/ro/gnome-help/files-search.page
+share/help/ro/gnome-help/files-select.page
+share/help/ro/gnome-help/files-share.page
+share/help/ro/gnome-help/files-sort.page
+share/help/ro/gnome-help/files-templates.page
+share/help/ro/gnome-help/files-tilde.page
+share/help/ro/gnome-help/files.page
+share/help/ro/gnome-help/get-involved.page
+share/help/ro/gnome-help/gnome-classic.page
+share/help/ro/gnome-help/gnome-version.page
+share/help/ro/gnome-help/hardware-auth.page
+share/help/ro/gnome-help/hardware-cardreader.page
+share/help/ro/gnome-help/hardware-driver.page
+share/help/ro/gnome-help/hardware-problems-graphics.page
+share/help/ro/gnome-help/hardware.page
+share/help/ro/gnome-help/help-irc.page
+share/help/ro/gnome-help/help-mailing-list.page
+share/help/ro/gnome-help/index.page
+share/help/ro/gnome-help/keyboard-cursor-blink.page
+share/help/ro/gnome-help/keyboard-key-menu.page
+share/help/ro/gnome-help/keyboard-key-super.page
+share/help/ro/gnome-help/keyboard-layouts.page
+share/help/ro/gnome-help/keyboard-nav.page
+share/help/ro/gnome-help/keyboard-osk.page
+share/help/ro/gnome-help/keyboard-repeat-keys.page
+share/help/ro/gnome-help/keyboard-shortcuts-set.page
+share/help/ro/gnome-help/keyboard.page
+share/help/ro/gnome-help/legal.xml
+share/help/ro/gnome-help/look-background.page
+share/help/ro/gnome-help/look-display-fuzzy.page
+share/help/ro/gnome-help/look-resolution.page
+share/help/ro/gnome-help/media.page
+share/help/ro/gnome-help/more-help.page
+share/help/ro/gnome-help/mouse-doubleclick.page
+share/help/ro/gnome-help/mouse-lefthanded.page
+share/help/ro/gnome-help/mouse-middleclick.page
+share/help/ro/gnome-help/mouse-mousekeys.page
+share/help/ro/gnome-help/mouse-problem-notmoving.page
+share/help/ro/gnome-help/mouse-sensitivity.page
+share/help/ro/gnome-help/mouse-touchpad-click.page
+share/help/ro/gnome-help/mouse-wakeup.page
+share/help/ro/gnome-help/mouse.page
+share/help/ro/gnome-help/music-cantplay-drm.page
+share/help/ro/gnome-help/music-player-ipodtransfer.page
+share/help/ro/gnome-help/music-player-newipod.page
+share/help/ro/gnome-help/nautilus-behavior.page
+share/help/ro/gnome-help/nautilus-bookmarks-edit.page
+share/help/ro/gnome-help/nautilus-connect.page
+share/help/ro/gnome-help/nautilus-display.page
+share/help/ro/gnome-help/nautilus-file-properties-basic.page
+share/help/ro/gnome-help/nautilus-file-properties-permissions.page
+share/help/ro/gnome-help/nautilus-list.page
+share/help/ro/gnome-help/nautilus-prefs.page
+share/help/ro/gnome-help/nautilus-preview.page
+share/help/ro/gnome-help/nautilus-views.page
+share/help/ro/gnome-help/net-antivirus.page
+share/help/ro/gnome-help/net-browser.page
+share/help/ro/gnome-help/net-default-browser.page
+share/help/ro/gnome-help/net-default-email.page
+share/help/ro/gnome-help/net-email-virus.page
+share/help/ro/gnome-help/net-email.page
+share/help/ro/gnome-help/net-findip.page
+share/help/ro/gnome-help/net-firewall-on-off.page
+share/help/ro/gnome-help/net-firewall-ports.page
+share/help/ro/gnome-help/net-fixed-ip-address.page
+share/help/ro/gnome-help/net-general.page
+share/help/ro/gnome-help/net-install-flash.page
+share/help/ro/gnome-help/net-macaddress.page
+share/help/ro/gnome-help/net-manual.page
+share/help/ro/gnome-help/net-mobile.page
+share/help/ro/gnome-help/net-othersconnect.page
+share/help/ro/gnome-help/net-othersedit.page
+share/help/ro/gnome-help/net-problem.page
+share/help/ro/gnome-help/net-proxy.page
+share/help/ro/gnome-help/net-security-tips.page
+share/help/ro/gnome-help/net-security.page
+share/help/ro/gnome-help/net-slow.page
+share/help/ro/gnome-help/net-vpn-connect.page
+share/help/ro/gnome-help/net-what-is-ip-address.page
+share/help/ro/gnome-help/net-wired-connect.page
+share/help/ro/gnome-help/net-wired.page
+share/help/ro/gnome-help/net-wireless-adhoc.page
+share/help/ro/gnome-help/net-wireless-airplane.page
+share/help/ro/gnome-help/net-wireless-connect.page
+share/help/ro/gnome-help/net-wireless-disconnecting.page
+share/help/ro/gnome-help/net-wireless-find.page
+share/help/ro/gnome-help/net-wireless-hidden.page
+share/help/ro/gnome-help/net-wireless-noconnection.page
+share/help/ro/gnome-help/net-wireless-troubleshooting-device-drivers.page
+share/help/ro/gnome-help/net-wireless-troubleshooting-hardware-check.page
+share/help/ro/gnome-help/net-wireless-troubleshooting-hardware-info.page
+share/help/ro/gnome-help/net-wireless-troubleshooting-initial-check.page
+share/help/ro/gnome-help/net-wireless-troubleshooting.page
+share/help/ro/gnome-help/net-wireless-wepwpa.page
+share/help/ro/gnome-help/net-wireless.page
+share/help/ro/gnome-help/net.page
+share/help/ro/gnome-help/power-autobrightness.page
+share/help/ro/gnome-help/power-autosuspend.page
+share/help/ro/gnome-help/power-batteryestimate.page
+share/help/ro/gnome-help/power-batterylife.page
+share/help/ro/gnome-help/power-batteryoptimal.page
+share/help/ro/gnome-help/power-batteryslow.page
+share/help/ro/gnome-help/power-batterywindows.page
+share/help/ro/gnome-help/power-closelid.page
+share/help/ro/gnome-help/power-constantfan.page
+share/help/ro/gnome-help/power-hotcomputer.page
+share/help/ro/gnome-help/power-lowpower.page
+share/help/ro/gnome-help/power-nowireless.page
+share/help/ro/gnome-help/power-othercountry.page
+share/help/ro/gnome-help/power-status.page
+share/help/ro/gnome-help/power-suspend.page
+share/help/ro/gnome-help/power-suspendfail.page
+share/help/ro/gnome-help/power-whydim.page
+share/help/ro/gnome-help/power-willnotturnon.page
+share/help/ro/gnome-help/power-wireless.page
+share/help/ro/gnome-help/power.page
+share/help/ro/gnome-help/prefs-display.page
+share/help/ro/gnome-help/prefs-language.page
+share/help/ro/gnome-help/prefs-sharing.page
+share/help/ro/gnome-help/prefs.page
+share/help/ro/gnome-help/printing-2sided.page
+share/help/ro/gnome-help/printing-booklet-duplex.page
+share/help/ro/gnome-help/printing-booklet-singlesided.page
+share/help/ro/gnome-help/printing-booklet.page
+share/help/ro/gnome-help/printing-cancel-job.page
+share/help/ro/gnome-help/printing-differentsize.page
+share/help/ro/gnome-help/printing-envelopes.page
+share/help/ro/gnome-help/printing-inklevel.page
+share/help/ro/gnome-help/printing-name-location.page
+share/help/ro/gnome-help/printing-order.page
+share/help/ro/gnome-help/printing-paperjam.page
+share/help/ro/gnome-help/printing-select.page
+share/help/ro/gnome-help/printing-setup-default-printer.page
+share/help/ro/gnome-help/printing-setup.page
+share/help/ro/gnome-help/printing-streaks.page
+share/help/ro/gnome-help/printing-to-file.page
+share/help/ro/gnome-help/printing.page
+share/help/ro/gnome-help/privacy-history-recent-off.page
+share/help/ro/gnome-help/privacy-location.page
+share/help/ro/gnome-help/privacy-purge.page
+share/help/ro/gnome-help/privacy-screen-lock.page
+share/help/ro/gnome-help/privacy.page
+share/help/ro/gnome-help/screen-shot-record.page
+share/help/ro/gnome-help/session-fingerprint.page
+share/help/ro/gnome-help/session-formats.page
+share/help/ro/gnome-help/session-language.page
+share/help/ro/gnome-help/session-screenlocks.page
+share/help/ro/gnome-help/sharing-bluetooth.page
+share/help/ro/gnome-help/sharing-desktop.page
+share/help/ro/gnome-help/sharing-displayname.page
+share/help/ro/gnome-help/sharing-media.page
+share/help/ro/gnome-help/sharing-personal.page
+share/help/ro/gnome-help/sharing.page
+share/help/ro/gnome-help/shell-apps-favorites.page
+share/help/ro/gnome-help/shell-apps-open.page
+share/help/ro/gnome-help/shell-exit.page
+share/help/ro/gnome-help/shell-introduction.page
+share/help/ro/gnome-help/shell-keyboard-shortcuts.page
+share/help/ro/gnome-help/shell-lockscreen.page
+share/help/ro/gnome-help/shell-notifications.page
+share/help/ro/gnome-help/shell-overview.page
+share/help/ro/gnome-help/shell-windows-lost.page
+share/help/ro/gnome-help/shell-windows-maximize.page
+share/help/ro/gnome-help/shell-windows-states.page
+share/help/ro/gnome-help/shell-windows-switching.page
+share/help/ro/gnome-help/shell-windows-tiled.page
+share/help/ro/gnome-help/shell-windows.page
+share/help/ro/gnome-help/shell-workspaces-movewindow.page
+share/help/ro/gnome-help/shell-workspaces-switch.page
+share/help/ro/gnome-help/shell-workspaces.page
+share/help/ro/gnome-help/sound-alert.page
+share/help/ro/gnome-help/sound-broken.page
+share/help/ro/gnome-help/sound-crackle.page
+share/help/ro/gnome-help/sound-nosound.page
+share/help/ro/gnome-help/sound-usemic.page
+share/help/ro/gnome-help/sound-usespeakers.page
+share/help/ro/gnome-help/sound-volume.page
+share/help/ro/gnome-help/status-icons.page
+share/help/ro/gnome-help/tips-specialchars.page
+share/help/ro/gnome-help/tips.page
+share/help/ro/gnome-help/translate.page
+share/help/ro/gnome-help/user-accounts.page
+share/help/ro/gnome-help/user-add.page
+share/help/ro/gnome-help/user-admin-change.page
+share/help/ro/gnome-help/user-admin-explain.page
+share/help/ro/gnome-help/user-admin-problems.page
+share/help/ro/gnome-help/user-autologin.page
+share/help/ro/gnome-help/user-changepassword.page
+share/help/ro/gnome-help/user-changepicture.page
+share/help/ro/gnome-help/user-delete.page
+share/help/ro/gnome-help/user-goodpassword.page
+share/help/ro/gnome-help/video-dvd.page
+share/help/ro/gnome-help/video-sending.page
+share/help/ro/gnome-help/wacom-left-handed.page
+share/help/ro/gnome-help/wacom-mode.page
+share/help/ro/gnome-help/wacom-multi-monitor.page
+share/help/ro/gnome-help/wacom-stylus.page
+share/help/ro/gnome-help/wacom.page
share/help/ru/gnome-help/a11y-bouncekeys.page
share/help/ru/gnome-help/a11y-braille.page
share/help/ru/gnome-help/a11y-contrast.page
@@ -8535,6 +11519,8 @@ share/help/ru/gnome-help/disk-capacity.page
share/help/ru/gnome-help/disk-check.page
share/help/ru/gnome-help/disk-format.page
share/help/ru/gnome-help/disk-partitions.page
+share/help/ru/gnome-help/disk-repair.page
+share/help/ru/gnome-help/disk-resize.page
share/help/ru/gnome-help/disk.page
share/help/ru/gnome-help/display-blank.page
share/help/ru/gnome-help/display-brightness.page
@@ -8558,7 +11544,6 @@ share/help/ru/gnome-help/figures/battery-missing-symbolic.svg
share/help/ru/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/ru/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/ru/gnome-help/figures/bluetooth-menu.png
-share/help/ru/gnome-help/figures/camera-photo-symbolic.svg
share/help/ru/gnome-help/figures/color-average.png
share/help/ru/gnome-help/figures/color-camera.png
share/help/ru/gnome-help/figures/color-display.png
@@ -8566,15 +11551,30 @@ share/help/ru/gnome-help/figures/color-printer.png
share/help/ru/gnome-help/figures/color-profile-default.png
share/help/ru/gnome-help/figures/color-space.png
share/help/ru/gnome-help/figures/display-dual-monitors.webm
-share/help/ru/gnome-help/figures/documents-icon.png
share/help/ru/gnome-help/figures/emblem-system-symbolic.svg
share/help/ru/gnome-help/figures/emblem-system.png
share/help/ru/gnome-help/figures/gnome.png
share/help/ru/gnome-help/figures/go-down.png
share/help/ru/gnome-help/figures/input-keyboard-symbolic.png
share/help/ru/gnome-help/figures/input-methods-switcher.png
+share/help/ru/gnome-help/figures/keyboard-key-calculator.svg
+share/help/ru/gnome-help/figures/keyboard-key-computer.svg
+share/help/ru/gnome-help/figures/keyboard-key-eject.svg
+share/help/ru/gnome-help/figures/keyboard-key-folder.svg
+share/help/ru/gnome-help/figures/keyboard-key-home.svg
+share/help/ru/gnome-help/figures/keyboard-key-mail.svg
+share/help/ru/gnome-help/figures/keyboard-key-media.svg
share/help/ru/gnome-help/figures/keyboard-key-menu.svg
-share/help/ru/gnome-help/figures/nautilus-3-10.png
+share/help/ru/gnome-help/figures/keyboard-key-mute.svg
+share/help/ru/gnome-help/figures/keyboard-key-next.svg
+share/help/ru/gnome-help/figures/keyboard-key-pause.svg
+share/help/ru/gnome-help/figures/keyboard-key-play.svg
+share/help/ru/gnome-help/figures/keyboard-key-previous.svg
+share/help/ru/gnome-help/figures/keyboard-key-search.svg
+share/help/ru/gnome-help/figures/keyboard-key-stop.svg
+share/help/ru/gnome-help/figures/keyboard-key-voldown.svg
+share/help/ru/gnome-help/figures/keyboard-key-volup.svg
+share/help/ru/gnome-help/figures/keyboard-key-world.svg
share/help/ru/gnome-help/figures/nautilus-icons.png
share/help/ru/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/ru/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -8608,35 +11608,26 @@ share/help/ru/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/ru/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/ru/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/ru/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/ru/gnome-help/figures/notification-buttons.png
share/help/ru/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/ru/gnome-help/figures/printing-select.png
share/help/ru/gnome-help/figures/shell-activities-classic.png
share/help/ru/gnome-help/figures/shell-activities.png
share/help/ru/gnome-help/figures/shell-appmenu-classic.png
share/help/ru/gnome-help/figures/shell-appmenu-shell.png
-share/help/ru/gnome-help/figures/shell-apps-open.png
share/help/ru/gnome-help/figures/shell-appts-classic.png
share/help/ru/gnome-help/figures/shell-appts.png
share/help/ru/gnome-help/figures/shell-dash.png
share/help/ru/gnome-help/figures/shell-exit-classic.png
share/help/ru/gnome-help/figures/shell-exit.png
-share/help/ru/gnome-help/figures/shell-files.png
-share/help/ru/gnome-help/figures/shell-introduction.png
-share/help/ru/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/ru/gnome-help/figures/shell-lock.png
-share/help/ru/gnome-help/figures/shell-notification.png
share/help/ru/gnome-help/figures/shell-top-bar-classic.png
share/help/ru/gnome-help/figures/shell-top-bar.png
share/help/ru/gnome-help/figures/shell-window-list-classic.png
-share/help/ru/gnome-help/figures/shell-windows.png
share/help/ru/gnome-help/figures/shell-workspaces.png
-share/help/ru/gnome-help/figures/shell.png
share/help/ru/gnome-help/figures/system-run-symbolic.svg
share/help/ru/gnome-help/figures/top-bar-icons-classic.png
share/help/ru/gnome-help/figures/top-bar-icons.png
share/help/ru/gnome-help/figures/universal-access-menu.png
-share/help/ru/gnome-help/figures/view-fullscreen-16.png
share/help/ru/gnome-help/figures/view-more-symbolic.svg
share/help/ru/gnome-help/figures/yelp-icon-big.png
share/help/ru/gnome-help/files-autorun.page
@@ -8747,6 +11738,8 @@ share/help/ru/gnome-help/net-wireless-troubleshooting.page
share/help/ru/gnome-help/net-wireless-wepwpa.page
share/help/ru/gnome-help/net-wireless.page
share/help/ru/gnome-help/net.page
+share/help/ru/gnome-help/power-autobrightness.page
+share/help/ru/gnome-help/power-autosuspend.page
share/help/ru/gnome-help/power-batteryestimate.page
share/help/ru/gnome-help/power-batterylife.page
share/help/ru/gnome-help/power-batteryoptimal.page
@@ -8758,10 +11751,12 @@ share/help/ru/gnome-help/power-hotcomputer.page
share/help/ru/gnome-help/power-lowpower.page
share/help/ru/gnome-help/power-nowireless.page
share/help/ru/gnome-help/power-othercountry.page
+share/help/ru/gnome-help/power-status.page
share/help/ru/gnome-help/power-suspend.page
share/help/ru/gnome-help/power-suspendfail.page
share/help/ru/gnome-help/power-whydim.page
share/help/ru/gnome-help/power-willnotturnon.page
+share/help/ru/gnome-help/power-wireless.page
share/help/ru/gnome-help/power.page
share/help/ru/gnome-help/prefs-display.page
share/help/ru/gnome-help/prefs-language.page
@@ -8918,6 +11913,8 @@ share/help/sl/gnome-help/disk-capacity.page
share/help/sl/gnome-help/disk-check.page
share/help/sl/gnome-help/disk-format.page
share/help/sl/gnome-help/disk-partitions.page
+share/help/sl/gnome-help/disk-repair.page
+share/help/sl/gnome-help/disk-resize.page
share/help/sl/gnome-help/disk.page
share/help/sl/gnome-help/display-blank.page
share/help/sl/gnome-help/display-brightness.page
@@ -8941,7 +11938,6 @@ share/help/sl/gnome-help/figures/battery-missing-symbolic.svg
share/help/sl/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/sl/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/sl/gnome-help/figures/bluetooth-menu.png
-share/help/sl/gnome-help/figures/camera-photo-symbolic.svg
share/help/sl/gnome-help/figures/color-average.png
share/help/sl/gnome-help/figures/color-camera.png
share/help/sl/gnome-help/figures/color-display.png
@@ -8949,15 +11945,30 @@ share/help/sl/gnome-help/figures/color-printer.png
share/help/sl/gnome-help/figures/color-profile-default.png
share/help/sl/gnome-help/figures/color-space.png
share/help/sl/gnome-help/figures/display-dual-monitors.webm
-share/help/sl/gnome-help/figures/documents-icon.png
share/help/sl/gnome-help/figures/emblem-system-symbolic.svg
share/help/sl/gnome-help/figures/emblem-system.png
share/help/sl/gnome-help/figures/gnome.png
share/help/sl/gnome-help/figures/go-down.png
share/help/sl/gnome-help/figures/input-keyboard-symbolic.png
share/help/sl/gnome-help/figures/input-methods-switcher.png
+share/help/sl/gnome-help/figures/keyboard-key-calculator.svg
+share/help/sl/gnome-help/figures/keyboard-key-computer.svg
+share/help/sl/gnome-help/figures/keyboard-key-eject.svg
+share/help/sl/gnome-help/figures/keyboard-key-folder.svg
+share/help/sl/gnome-help/figures/keyboard-key-home.svg
+share/help/sl/gnome-help/figures/keyboard-key-mail.svg
+share/help/sl/gnome-help/figures/keyboard-key-media.svg
share/help/sl/gnome-help/figures/keyboard-key-menu.svg
-share/help/sl/gnome-help/figures/nautilus-3-10.png
+share/help/sl/gnome-help/figures/keyboard-key-mute.svg
+share/help/sl/gnome-help/figures/keyboard-key-next.svg
+share/help/sl/gnome-help/figures/keyboard-key-pause.svg
+share/help/sl/gnome-help/figures/keyboard-key-play.svg
+share/help/sl/gnome-help/figures/keyboard-key-previous.svg
+share/help/sl/gnome-help/figures/keyboard-key-search.svg
+share/help/sl/gnome-help/figures/keyboard-key-stop.svg
+share/help/sl/gnome-help/figures/keyboard-key-voldown.svg
+share/help/sl/gnome-help/figures/keyboard-key-volup.svg
+share/help/sl/gnome-help/figures/keyboard-key-world.svg
share/help/sl/gnome-help/figures/nautilus-icons.png
share/help/sl/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/sl/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -8991,35 +12002,26 @@ share/help/sl/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/sl/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/sl/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/sl/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/sl/gnome-help/figures/notification-buttons.png
share/help/sl/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/sl/gnome-help/figures/printing-select.png
share/help/sl/gnome-help/figures/shell-activities-classic.png
share/help/sl/gnome-help/figures/shell-activities.png
share/help/sl/gnome-help/figures/shell-appmenu-classic.png
share/help/sl/gnome-help/figures/shell-appmenu-shell.png
-share/help/sl/gnome-help/figures/shell-apps-open.png
share/help/sl/gnome-help/figures/shell-appts-classic.png
share/help/sl/gnome-help/figures/shell-appts.png
share/help/sl/gnome-help/figures/shell-dash.png
share/help/sl/gnome-help/figures/shell-exit-classic.png
share/help/sl/gnome-help/figures/shell-exit.png
-share/help/sl/gnome-help/figures/shell-files.png
-share/help/sl/gnome-help/figures/shell-introduction.png
-share/help/sl/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/sl/gnome-help/figures/shell-lock.png
-share/help/sl/gnome-help/figures/shell-notification.png
share/help/sl/gnome-help/figures/shell-top-bar-classic.png
share/help/sl/gnome-help/figures/shell-top-bar.png
share/help/sl/gnome-help/figures/shell-window-list-classic.png
-share/help/sl/gnome-help/figures/shell-windows.png
share/help/sl/gnome-help/figures/shell-workspaces.png
-share/help/sl/gnome-help/figures/shell.png
share/help/sl/gnome-help/figures/system-run-symbolic.svg
share/help/sl/gnome-help/figures/top-bar-icons-classic.png
share/help/sl/gnome-help/figures/top-bar-icons.png
share/help/sl/gnome-help/figures/universal-access-menu.png
-share/help/sl/gnome-help/figures/view-fullscreen-16.png
share/help/sl/gnome-help/figures/view-more-symbolic.svg
share/help/sl/gnome-help/figures/yelp-icon-big.png
share/help/sl/gnome-help/files-autorun.page
@@ -9130,6 +12132,8 @@ share/help/sl/gnome-help/net-wireless-troubleshooting.page
share/help/sl/gnome-help/net-wireless-wepwpa.page
share/help/sl/gnome-help/net-wireless.page
share/help/sl/gnome-help/net.page
+share/help/sl/gnome-help/power-autobrightness.page
+share/help/sl/gnome-help/power-autosuspend.page
share/help/sl/gnome-help/power-batteryestimate.page
share/help/sl/gnome-help/power-batterylife.page
share/help/sl/gnome-help/power-batteryoptimal.page
@@ -9141,10 +12145,12 @@ share/help/sl/gnome-help/power-hotcomputer.page
share/help/sl/gnome-help/power-lowpower.page
share/help/sl/gnome-help/power-nowireless.page
share/help/sl/gnome-help/power-othercountry.page
+share/help/sl/gnome-help/power-status.page
share/help/sl/gnome-help/power-suspend.page
share/help/sl/gnome-help/power-suspendfail.page
share/help/sl/gnome-help/power-whydim.page
share/help/sl/gnome-help/power-willnotturnon.page
+share/help/sl/gnome-help/power-wireless.page
share/help/sl/gnome-help/power.page
share/help/sl/gnome-help/prefs-display.page
share/help/sl/gnome-help/prefs-language.page
@@ -9301,6 +12307,8 @@ share/help/sr/gnome-help/disk-capacity.page
share/help/sr/gnome-help/disk-check.page
share/help/sr/gnome-help/disk-format.page
share/help/sr/gnome-help/disk-partitions.page
+share/help/sr/gnome-help/disk-repair.page
+share/help/sr/gnome-help/disk-resize.page
share/help/sr/gnome-help/disk.page
share/help/sr/gnome-help/display-blank.page
share/help/sr/gnome-help/display-brightness.page
@@ -9324,7 +12332,6 @@ share/help/sr/gnome-help/figures/battery-missing-symbolic.svg
share/help/sr/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/sr/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/sr/gnome-help/figures/bluetooth-menu.png
-share/help/sr/gnome-help/figures/camera-photo-symbolic.svg
share/help/sr/gnome-help/figures/color-average.png
share/help/sr/gnome-help/figures/color-camera.png
share/help/sr/gnome-help/figures/color-display.png
@@ -9332,15 +12339,30 @@ share/help/sr/gnome-help/figures/color-printer.png
share/help/sr/gnome-help/figures/color-profile-default.png
share/help/sr/gnome-help/figures/color-space.png
share/help/sr/gnome-help/figures/display-dual-monitors.webm
-share/help/sr/gnome-help/figures/documents-icon.png
share/help/sr/gnome-help/figures/emblem-system-symbolic.svg
share/help/sr/gnome-help/figures/emblem-system.png
share/help/sr/gnome-help/figures/gnome.png
share/help/sr/gnome-help/figures/go-down.png
share/help/sr/gnome-help/figures/input-keyboard-symbolic.png
share/help/sr/gnome-help/figures/input-methods-switcher.png
+share/help/sr/gnome-help/figures/keyboard-key-calculator.svg
+share/help/sr/gnome-help/figures/keyboard-key-computer.svg
+share/help/sr/gnome-help/figures/keyboard-key-eject.svg
+share/help/sr/gnome-help/figures/keyboard-key-folder.svg
+share/help/sr/gnome-help/figures/keyboard-key-home.svg
+share/help/sr/gnome-help/figures/keyboard-key-mail.svg
+share/help/sr/gnome-help/figures/keyboard-key-media.svg
share/help/sr/gnome-help/figures/keyboard-key-menu.svg
-share/help/sr/gnome-help/figures/nautilus-3-10.png
+share/help/sr/gnome-help/figures/keyboard-key-mute.svg
+share/help/sr/gnome-help/figures/keyboard-key-next.svg
+share/help/sr/gnome-help/figures/keyboard-key-pause.svg
+share/help/sr/gnome-help/figures/keyboard-key-play.svg
+share/help/sr/gnome-help/figures/keyboard-key-previous.svg
+share/help/sr/gnome-help/figures/keyboard-key-search.svg
+share/help/sr/gnome-help/figures/keyboard-key-stop.svg
+share/help/sr/gnome-help/figures/keyboard-key-voldown.svg
+share/help/sr/gnome-help/figures/keyboard-key-volup.svg
+share/help/sr/gnome-help/figures/keyboard-key-world.svg
share/help/sr/gnome-help/figures/nautilus-icons.png
share/help/sr/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/sr/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -9374,35 +12396,26 @@ share/help/sr/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/sr/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/sr/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/sr/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/sr/gnome-help/figures/notification-buttons.png
share/help/sr/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/sr/gnome-help/figures/printing-select.png
share/help/sr/gnome-help/figures/shell-activities-classic.png
share/help/sr/gnome-help/figures/shell-activities.png
share/help/sr/gnome-help/figures/shell-appmenu-classic.png
share/help/sr/gnome-help/figures/shell-appmenu-shell.png
-share/help/sr/gnome-help/figures/shell-apps-open.png
share/help/sr/gnome-help/figures/shell-appts-classic.png
share/help/sr/gnome-help/figures/shell-appts.png
share/help/sr/gnome-help/figures/shell-dash.png
share/help/sr/gnome-help/figures/shell-exit-classic.png
share/help/sr/gnome-help/figures/shell-exit.png
-share/help/sr/gnome-help/figures/shell-files.png
-share/help/sr/gnome-help/figures/shell-introduction.png
-share/help/sr/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/sr/gnome-help/figures/shell-lock.png
-share/help/sr/gnome-help/figures/shell-notification.png
share/help/sr/gnome-help/figures/shell-top-bar-classic.png
share/help/sr/gnome-help/figures/shell-top-bar.png
share/help/sr/gnome-help/figures/shell-window-list-classic.png
-share/help/sr/gnome-help/figures/shell-windows.png
share/help/sr/gnome-help/figures/shell-workspaces.png
-share/help/sr/gnome-help/figures/shell.png
share/help/sr/gnome-help/figures/system-run-symbolic.svg
share/help/sr/gnome-help/figures/top-bar-icons-classic.png
share/help/sr/gnome-help/figures/top-bar-icons.png
share/help/sr/gnome-help/figures/universal-access-menu.png
-share/help/sr/gnome-help/figures/view-fullscreen-16.png
share/help/sr/gnome-help/figures/view-more-symbolic.svg
share/help/sr/gnome-help/figures/yelp-icon-big.png
share/help/sr/gnome-help/files-autorun.page
@@ -9513,6 +12526,8 @@ share/help/sr/gnome-help/net-wireless-troubleshooting.page
share/help/sr/gnome-help/net-wireless-wepwpa.page
share/help/sr/gnome-help/net-wireless.page
share/help/sr/gnome-help/net.page
+share/help/sr/gnome-help/power-autobrightness.page
+share/help/sr/gnome-help/power-autosuspend.page
share/help/sr/gnome-help/power-batteryestimate.page
share/help/sr/gnome-help/power-batterylife.page
share/help/sr/gnome-help/power-batteryoptimal.page
@@ -9524,10 +12539,12 @@ share/help/sr/gnome-help/power-hotcomputer.page
share/help/sr/gnome-help/power-lowpower.page
share/help/sr/gnome-help/power-nowireless.page
share/help/sr/gnome-help/power-othercountry.page
+share/help/sr/gnome-help/power-status.page
share/help/sr/gnome-help/power-suspend.page
share/help/sr/gnome-help/power-suspendfail.page
share/help/sr/gnome-help/power-whydim.page
share/help/sr/gnome-help/power-willnotturnon.page
+share/help/sr/gnome-help/power-wireless.page
share/help/sr/gnome-help/power.page
share/help/sr/gnome-help/prefs-display.page
share/help/sr/gnome-help/prefs-language.page
@@ -9684,6 +12701,8 @@ share/help/sr@latin/gnome-help/disk-capacity.page
share/help/sr@latin/gnome-help/disk-check.page
share/help/sr@latin/gnome-help/disk-format.page
share/help/sr@latin/gnome-help/disk-partitions.page
+share/help/sr@latin/gnome-help/disk-repair.page
+share/help/sr@latin/gnome-help/disk-resize.page
share/help/sr@latin/gnome-help/disk.page
share/help/sr@latin/gnome-help/display-blank.page
share/help/sr@latin/gnome-help/display-brightness.page
@@ -9707,7 +12726,6 @@ share/help/sr@latin/gnome-help/figures/battery-missing-symbolic.svg
share/help/sr@latin/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/sr@latin/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/sr@latin/gnome-help/figures/bluetooth-menu.png
-share/help/sr@latin/gnome-help/figures/camera-photo-symbolic.svg
share/help/sr@latin/gnome-help/figures/color-average.png
share/help/sr@latin/gnome-help/figures/color-camera.png
share/help/sr@latin/gnome-help/figures/color-display.png
@@ -9715,15 +12733,30 @@ share/help/sr@latin/gnome-help/figures/color-printer.png
share/help/sr@latin/gnome-help/figures/color-profile-default.png
share/help/sr@latin/gnome-help/figures/color-space.png
share/help/sr@latin/gnome-help/figures/display-dual-monitors.webm
-share/help/sr@latin/gnome-help/figures/documents-icon.png
share/help/sr@latin/gnome-help/figures/emblem-system-symbolic.svg
share/help/sr@latin/gnome-help/figures/emblem-system.png
share/help/sr@latin/gnome-help/figures/gnome.png
share/help/sr@latin/gnome-help/figures/go-down.png
share/help/sr@latin/gnome-help/figures/input-keyboard-symbolic.png
share/help/sr@latin/gnome-help/figures/input-methods-switcher.png
+share/help/sr@latin/gnome-help/figures/keyboard-key-calculator.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-computer.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-eject.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-folder.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-home.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-mail.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-media.svg
share/help/sr@latin/gnome-help/figures/keyboard-key-menu.svg
-share/help/sr@latin/gnome-help/figures/nautilus-3-10.png
+share/help/sr@latin/gnome-help/figures/keyboard-key-mute.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-next.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-pause.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-play.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-previous.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-search.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-stop.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-voldown.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-volup.svg
+share/help/sr@latin/gnome-help/figures/keyboard-key-world.svg
share/help/sr@latin/gnome-help/figures/nautilus-icons.png
share/help/sr@latin/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/sr@latin/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -9757,35 +12790,26 @@ share/help/sr@latin/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/sr@latin/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/sr@latin/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/sr@latin/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/sr@latin/gnome-help/figures/notification-buttons.png
share/help/sr@latin/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/sr@latin/gnome-help/figures/printing-select.png
share/help/sr@latin/gnome-help/figures/shell-activities-classic.png
share/help/sr@latin/gnome-help/figures/shell-activities.png
share/help/sr@latin/gnome-help/figures/shell-appmenu-classic.png
share/help/sr@latin/gnome-help/figures/shell-appmenu-shell.png
-share/help/sr@latin/gnome-help/figures/shell-apps-open.png
share/help/sr@latin/gnome-help/figures/shell-appts-classic.png
share/help/sr@latin/gnome-help/figures/shell-appts.png
share/help/sr@latin/gnome-help/figures/shell-dash.png
share/help/sr@latin/gnome-help/figures/shell-exit-classic.png
share/help/sr@latin/gnome-help/figures/shell-exit.png
-share/help/sr@latin/gnome-help/figures/shell-files.png
-share/help/sr@latin/gnome-help/figures/shell-introduction.png
-share/help/sr@latin/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/sr@latin/gnome-help/figures/shell-lock.png
-share/help/sr@latin/gnome-help/figures/shell-notification.png
share/help/sr@latin/gnome-help/figures/shell-top-bar-classic.png
share/help/sr@latin/gnome-help/figures/shell-top-bar.png
share/help/sr@latin/gnome-help/figures/shell-window-list-classic.png
-share/help/sr@latin/gnome-help/figures/shell-windows.png
share/help/sr@latin/gnome-help/figures/shell-workspaces.png
-share/help/sr@latin/gnome-help/figures/shell.png
share/help/sr@latin/gnome-help/figures/system-run-symbolic.svg
share/help/sr@latin/gnome-help/figures/top-bar-icons-classic.png
share/help/sr@latin/gnome-help/figures/top-bar-icons.png
share/help/sr@latin/gnome-help/figures/universal-access-menu.png
-share/help/sr@latin/gnome-help/figures/view-fullscreen-16.png
share/help/sr@latin/gnome-help/figures/view-more-symbolic.svg
share/help/sr@latin/gnome-help/figures/yelp-icon-big.png
share/help/sr@latin/gnome-help/files-autorun.page
@@ -9896,6 +12920,8 @@ share/help/sr@latin/gnome-help/net-wireless-troubleshooting.page
share/help/sr@latin/gnome-help/net-wireless-wepwpa.page
share/help/sr@latin/gnome-help/net-wireless.page
share/help/sr@latin/gnome-help/net.page
+share/help/sr@latin/gnome-help/power-autobrightness.page
+share/help/sr@latin/gnome-help/power-autosuspend.page
share/help/sr@latin/gnome-help/power-batteryestimate.page
share/help/sr@latin/gnome-help/power-batterylife.page
share/help/sr@latin/gnome-help/power-batteryoptimal.page
@@ -9907,10 +12933,12 @@ share/help/sr@latin/gnome-help/power-hotcomputer.page
share/help/sr@latin/gnome-help/power-lowpower.page
share/help/sr@latin/gnome-help/power-nowireless.page
share/help/sr@latin/gnome-help/power-othercountry.page
+share/help/sr@latin/gnome-help/power-status.page
share/help/sr@latin/gnome-help/power-suspend.page
share/help/sr@latin/gnome-help/power-suspendfail.page
share/help/sr@latin/gnome-help/power-whydim.page
share/help/sr@latin/gnome-help/power-willnotturnon.page
+share/help/sr@latin/gnome-help/power-wireless.page
share/help/sr@latin/gnome-help/power.page
share/help/sr@latin/gnome-help/prefs-display.page
share/help/sr@latin/gnome-help/prefs-language.page
@@ -10067,6 +13095,8 @@ share/help/sv/gnome-help/disk-capacity.page
share/help/sv/gnome-help/disk-check.page
share/help/sv/gnome-help/disk-format.page
share/help/sv/gnome-help/disk-partitions.page
+share/help/sv/gnome-help/disk-repair.page
+share/help/sv/gnome-help/disk-resize.page
share/help/sv/gnome-help/disk.page
share/help/sv/gnome-help/display-blank.page
share/help/sv/gnome-help/display-brightness.page
@@ -10090,7 +13120,6 @@ share/help/sv/gnome-help/figures/battery-missing-symbolic.svg
share/help/sv/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/sv/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/sv/gnome-help/figures/bluetooth-menu.png
-share/help/sv/gnome-help/figures/camera-photo-symbolic.svg
share/help/sv/gnome-help/figures/color-average.png
share/help/sv/gnome-help/figures/color-camera.png
share/help/sv/gnome-help/figures/color-display.png
@@ -10098,15 +13127,30 @@ share/help/sv/gnome-help/figures/color-printer.png
share/help/sv/gnome-help/figures/color-profile-default.png
share/help/sv/gnome-help/figures/color-space.png
share/help/sv/gnome-help/figures/display-dual-monitors.webm
-share/help/sv/gnome-help/figures/documents-icon.png
share/help/sv/gnome-help/figures/emblem-system-symbolic.svg
share/help/sv/gnome-help/figures/emblem-system.png
share/help/sv/gnome-help/figures/gnome.png
share/help/sv/gnome-help/figures/go-down.png
share/help/sv/gnome-help/figures/input-keyboard-symbolic.png
share/help/sv/gnome-help/figures/input-methods-switcher.png
+share/help/sv/gnome-help/figures/keyboard-key-calculator.svg
+share/help/sv/gnome-help/figures/keyboard-key-computer.svg
+share/help/sv/gnome-help/figures/keyboard-key-eject.svg
+share/help/sv/gnome-help/figures/keyboard-key-folder.svg
+share/help/sv/gnome-help/figures/keyboard-key-home.svg
+share/help/sv/gnome-help/figures/keyboard-key-mail.svg
+share/help/sv/gnome-help/figures/keyboard-key-media.svg
share/help/sv/gnome-help/figures/keyboard-key-menu.svg
-share/help/sv/gnome-help/figures/nautilus-3-10.png
+share/help/sv/gnome-help/figures/keyboard-key-mute.svg
+share/help/sv/gnome-help/figures/keyboard-key-next.svg
+share/help/sv/gnome-help/figures/keyboard-key-pause.svg
+share/help/sv/gnome-help/figures/keyboard-key-play.svg
+share/help/sv/gnome-help/figures/keyboard-key-previous.svg
+share/help/sv/gnome-help/figures/keyboard-key-search.svg
+share/help/sv/gnome-help/figures/keyboard-key-stop.svg
+share/help/sv/gnome-help/figures/keyboard-key-voldown.svg
+share/help/sv/gnome-help/figures/keyboard-key-volup.svg
+share/help/sv/gnome-help/figures/keyboard-key-world.svg
share/help/sv/gnome-help/figures/nautilus-icons.png
share/help/sv/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/sv/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -10140,35 +13184,26 @@ share/help/sv/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/sv/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/sv/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/sv/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/sv/gnome-help/figures/notification-buttons.png
share/help/sv/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/sv/gnome-help/figures/printing-select.png
share/help/sv/gnome-help/figures/shell-activities-classic.png
share/help/sv/gnome-help/figures/shell-activities.png
share/help/sv/gnome-help/figures/shell-appmenu-classic.png
share/help/sv/gnome-help/figures/shell-appmenu-shell.png
-share/help/sv/gnome-help/figures/shell-apps-open.png
share/help/sv/gnome-help/figures/shell-appts-classic.png
share/help/sv/gnome-help/figures/shell-appts.png
share/help/sv/gnome-help/figures/shell-dash.png
share/help/sv/gnome-help/figures/shell-exit-classic.png
share/help/sv/gnome-help/figures/shell-exit.png
-share/help/sv/gnome-help/figures/shell-files.png
-share/help/sv/gnome-help/figures/shell-introduction.png
-share/help/sv/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/sv/gnome-help/figures/shell-lock.png
-share/help/sv/gnome-help/figures/shell-notification.png
share/help/sv/gnome-help/figures/shell-top-bar-classic.png
share/help/sv/gnome-help/figures/shell-top-bar.png
share/help/sv/gnome-help/figures/shell-window-list-classic.png
-share/help/sv/gnome-help/figures/shell-windows.png
share/help/sv/gnome-help/figures/shell-workspaces.png
-share/help/sv/gnome-help/figures/shell.png
share/help/sv/gnome-help/figures/system-run-symbolic.svg
share/help/sv/gnome-help/figures/top-bar-icons-classic.png
share/help/sv/gnome-help/figures/top-bar-icons.png
share/help/sv/gnome-help/figures/universal-access-menu.png
-share/help/sv/gnome-help/figures/view-fullscreen-16.png
share/help/sv/gnome-help/figures/view-more-symbolic.svg
share/help/sv/gnome-help/figures/yelp-icon-big.png
share/help/sv/gnome-help/files-autorun.page
@@ -10279,6 +13314,8 @@ share/help/sv/gnome-help/net-wireless-troubleshooting.page
share/help/sv/gnome-help/net-wireless-wepwpa.page
share/help/sv/gnome-help/net-wireless.page
share/help/sv/gnome-help/net.page
+share/help/sv/gnome-help/power-autobrightness.page
+share/help/sv/gnome-help/power-autosuspend.page
share/help/sv/gnome-help/power-batteryestimate.page
share/help/sv/gnome-help/power-batterylife.page
share/help/sv/gnome-help/power-batteryoptimal.page
@@ -10290,10 +13327,12 @@ share/help/sv/gnome-help/power-hotcomputer.page
share/help/sv/gnome-help/power-lowpower.page
share/help/sv/gnome-help/power-nowireless.page
share/help/sv/gnome-help/power-othercountry.page
+share/help/sv/gnome-help/power-status.page
share/help/sv/gnome-help/power-suspend.page
share/help/sv/gnome-help/power-suspendfail.page
share/help/sv/gnome-help/power-whydim.page
share/help/sv/gnome-help/power-willnotturnon.page
+share/help/sv/gnome-help/power-wireless.page
share/help/sv/gnome-help/power.page
share/help/sv/gnome-help/prefs-display.page
share/help/sv/gnome-help/prefs-language.page
@@ -10377,6 +13416,58 @@ share/help/sv/gnome-help/wacom-mode.page
share/help/sv/gnome-help/wacom-multi-monitor.page
share/help/sv/gnome-help/wacom-stylus.page
share/help/sv/gnome-help/wacom.page
+share/help/sv/system-admin-guide/appearance.page
+share/help/sv/system-admin-guide/dconf-custom-defaults.page
+share/help/sv/system-admin-guide/dconf-keyfiles.page
+share/help/sv/system-admin-guide/dconf-lockdown.page
+share/help/sv/system-admin-guide/dconf-nfs-home.page
+share/help/sv/system-admin-guide/dconf-profiles.page
+share/help/sv/system-admin-guide/dconf-snippets.xml
+share/help/sv/system-admin-guide/dconf.page
+share/help/sv/system-admin-guide/desktop-background.page
+share/help/sv/system-admin-guide/desktop-favorite-applications.page
+share/help/sv/system-admin-guide/desktop-lockscreen.page
+share/help/sv/system-admin-guide/desktop-shield.page
+share/help/sv/system-admin-guide/extensions-enable.page
+share/help/sv/system-admin-guide/extensions-lockdown.page
+share/help/sv/system-admin-guide/extensions.page
+share/help/sv/system-admin-guide/fonts-user.page
+share/help/sv/system-admin-guide/fonts.page
+share/help/sv/system-admin-guide/index.page
+share/help/sv/system-admin-guide/keyboard-layout.page
+share/help/sv/system-admin-guide/legal.xml
+share/help/sv/system-admin-guide/lockdown-command-line.page
+share/help/sv/system-admin-guide/lockdown-file-saving.page
+share/help/sv/system-admin-guide/lockdown-online-accounts.page
+share/help/sv/system-admin-guide/lockdown-printing.page
+share/help/sv/system-admin-guide/lockdown-repartitioning.page
+share/help/sv/system-admin-guide/login-automatic.page
+share/help/sv/system-admin-guide/login-banner.page
+share/help/sv/system-admin-guide/login-enterprise.page
+share/help/sv/system-admin-guide/login-fingerprint.page
+share/help/sv/system-admin-guide/login-logo.page
+share/help/sv/system-admin-guide/login-userlist-disable.page
+share/help/sv/system-admin-guide/login.page
+share/help/sv/system-admin-guide/logout-automatic.page
+share/help/sv/system-admin-guide/mime-types-application-user.page
+share/help/sv/system-admin-guide/mime-types-application.page
+share/help/sv/system-admin-guide/mime-types-custom-user.page
+share/help/sv/system-admin-guide/mime-types-custom.page
+share/help/sv/system-admin-guide/mime-types.page
+share/help/sv/system-admin-guide/network-printer-config.page
+share/help/sv/system-admin-guide/network-server-list.page
+share/help/sv/system-admin-guide/network-vpn.page
+share/help/sv/system-admin-guide/network.page
+share/help/sv/system-admin-guide/overrides.page
+share/help/sv/system-admin-guide/power-dim-screen.page
+share/help/sv/system-admin-guide/processes.page
+share/help/sv/system-admin-guide/session-custom.page
+share/help/sv/system-admin-guide/session-debug.page
+share/help/sv/system-admin-guide/session-user.page
+share/help/sv/system-admin-guide/setup.page
+share/help/sv/system-admin-guide/software.page
+share/help/sv/system-admin-guide/sundry.page
+share/help/sv/system-admin-guide/user-settings.page
share/help/ta/gnome-help/a11y-bouncekeys.page
share/help/ta/gnome-help/a11y-braille.page
share/help/ta/gnome-help/a11y-contrast.page
@@ -10450,6 +13541,8 @@ share/help/ta/gnome-help/disk-capacity.page
share/help/ta/gnome-help/disk-check.page
share/help/ta/gnome-help/disk-format.page
share/help/ta/gnome-help/disk-partitions.page
+share/help/ta/gnome-help/disk-repair.page
+share/help/ta/gnome-help/disk-resize.page
share/help/ta/gnome-help/disk.page
share/help/ta/gnome-help/display-blank.page
share/help/ta/gnome-help/display-brightness.page
@@ -10473,7 +13566,6 @@ share/help/ta/gnome-help/figures/battery-missing-symbolic.svg
share/help/ta/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/ta/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/ta/gnome-help/figures/bluetooth-menu.png
-share/help/ta/gnome-help/figures/camera-photo-symbolic.svg
share/help/ta/gnome-help/figures/color-average.png
share/help/ta/gnome-help/figures/color-camera.png
share/help/ta/gnome-help/figures/color-display.png
@@ -10481,15 +13573,30 @@ share/help/ta/gnome-help/figures/color-printer.png
share/help/ta/gnome-help/figures/color-profile-default.png
share/help/ta/gnome-help/figures/color-space.png
share/help/ta/gnome-help/figures/display-dual-monitors.webm
-share/help/ta/gnome-help/figures/documents-icon.png
share/help/ta/gnome-help/figures/emblem-system-symbolic.svg
share/help/ta/gnome-help/figures/emblem-system.png
share/help/ta/gnome-help/figures/gnome.png
share/help/ta/gnome-help/figures/go-down.png
share/help/ta/gnome-help/figures/input-keyboard-symbolic.png
share/help/ta/gnome-help/figures/input-methods-switcher.png
+share/help/ta/gnome-help/figures/keyboard-key-calculator.svg
+share/help/ta/gnome-help/figures/keyboard-key-computer.svg
+share/help/ta/gnome-help/figures/keyboard-key-eject.svg
+share/help/ta/gnome-help/figures/keyboard-key-folder.svg
+share/help/ta/gnome-help/figures/keyboard-key-home.svg
+share/help/ta/gnome-help/figures/keyboard-key-mail.svg
+share/help/ta/gnome-help/figures/keyboard-key-media.svg
share/help/ta/gnome-help/figures/keyboard-key-menu.svg
-share/help/ta/gnome-help/figures/nautilus-3-10.png
+share/help/ta/gnome-help/figures/keyboard-key-mute.svg
+share/help/ta/gnome-help/figures/keyboard-key-next.svg
+share/help/ta/gnome-help/figures/keyboard-key-pause.svg
+share/help/ta/gnome-help/figures/keyboard-key-play.svg
+share/help/ta/gnome-help/figures/keyboard-key-previous.svg
+share/help/ta/gnome-help/figures/keyboard-key-search.svg
+share/help/ta/gnome-help/figures/keyboard-key-stop.svg
+share/help/ta/gnome-help/figures/keyboard-key-voldown.svg
+share/help/ta/gnome-help/figures/keyboard-key-volup.svg
+share/help/ta/gnome-help/figures/keyboard-key-world.svg
share/help/ta/gnome-help/figures/nautilus-icons.png
share/help/ta/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/ta/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -10523,35 +13630,26 @@ share/help/ta/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/ta/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/ta/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/ta/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/ta/gnome-help/figures/notification-buttons.png
share/help/ta/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/ta/gnome-help/figures/printing-select.png
share/help/ta/gnome-help/figures/shell-activities-classic.png
share/help/ta/gnome-help/figures/shell-activities.png
share/help/ta/gnome-help/figures/shell-appmenu-classic.png
share/help/ta/gnome-help/figures/shell-appmenu-shell.png
-share/help/ta/gnome-help/figures/shell-apps-open.png
share/help/ta/gnome-help/figures/shell-appts-classic.png
share/help/ta/gnome-help/figures/shell-appts.png
share/help/ta/gnome-help/figures/shell-dash.png
share/help/ta/gnome-help/figures/shell-exit-classic.png
share/help/ta/gnome-help/figures/shell-exit.png
-share/help/ta/gnome-help/figures/shell-files.png
-share/help/ta/gnome-help/figures/shell-introduction.png
-share/help/ta/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/ta/gnome-help/figures/shell-lock.png
-share/help/ta/gnome-help/figures/shell-notification.png
share/help/ta/gnome-help/figures/shell-top-bar-classic.png
share/help/ta/gnome-help/figures/shell-top-bar.png
share/help/ta/gnome-help/figures/shell-window-list-classic.png
-share/help/ta/gnome-help/figures/shell-windows.png
share/help/ta/gnome-help/figures/shell-workspaces.png
-share/help/ta/gnome-help/figures/shell.png
share/help/ta/gnome-help/figures/system-run-symbolic.svg
share/help/ta/gnome-help/figures/top-bar-icons-classic.png
share/help/ta/gnome-help/figures/top-bar-icons.png
share/help/ta/gnome-help/figures/universal-access-menu.png
-share/help/ta/gnome-help/figures/view-fullscreen-16.png
share/help/ta/gnome-help/figures/view-more-symbolic.svg
share/help/ta/gnome-help/figures/yelp-icon-big.png
share/help/ta/gnome-help/files-autorun.page
@@ -10662,6 +13760,8 @@ share/help/ta/gnome-help/net-wireless-troubleshooting.page
share/help/ta/gnome-help/net-wireless-wepwpa.page
share/help/ta/gnome-help/net-wireless.page
share/help/ta/gnome-help/net.page
+share/help/ta/gnome-help/power-autobrightness.page
+share/help/ta/gnome-help/power-autosuspend.page
share/help/ta/gnome-help/power-batteryestimate.page
share/help/ta/gnome-help/power-batterylife.page
share/help/ta/gnome-help/power-batteryoptimal.page
@@ -10673,10 +13773,12 @@ share/help/ta/gnome-help/power-hotcomputer.page
share/help/ta/gnome-help/power-lowpower.page
share/help/ta/gnome-help/power-nowireless.page
share/help/ta/gnome-help/power-othercountry.page
+share/help/ta/gnome-help/power-status.page
share/help/ta/gnome-help/power-suspend.page
share/help/ta/gnome-help/power-suspendfail.page
share/help/ta/gnome-help/power-whydim.page
share/help/ta/gnome-help/power-willnotturnon.page
+share/help/ta/gnome-help/power-wireless.page
share/help/ta/gnome-help/power.page
share/help/ta/gnome-help/prefs-display.page
share/help/ta/gnome-help/prefs-language.page
@@ -10833,6 +13935,8 @@ share/help/te/gnome-help/disk-capacity.page
share/help/te/gnome-help/disk-check.page
share/help/te/gnome-help/disk-format.page
share/help/te/gnome-help/disk-partitions.page
+share/help/te/gnome-help/disk-repair.page
+share/help/te/gnome-help/disk-resize.page
share/help/te/gnome-help/disk.page
share/help/te/gnome-help/display-blank.page
share/help/te/gnome-help/display-brightness.page
@@ -10856,7 +13960,6 @@ share/help/te/gnome-help/figures/battery-missing-symbolic.svg
share/help/te/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/te/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/te/gnome-help/figures/bluetooth-menu.png
-share/help/te/gnome-help/figures/camera-photo-symbolic.svg
share/help/te/gnome-help/figures/color-average.png
share/help/te/gnome-help/figures/color-camera.png
share/help/te/gnome-help/figures/color-display.png
@@ -10864,15 +13967,30 @@ share/help/te/gnome-help/figures/color-printer.png
share/help/te/gnome-help/figures/color-profile-default.png
share/help/te/gnome-help/figures/color-space.png
share/help/te/gnome-help/figures/display-dual-monitors.webm
-share/help/te/gnome-help/figures/documents-icon.png
share/help/te/gnome-help/figures/emblem-system-symbolic.svg
share/help/te/gnome-help/figures/emblem-system.png
share/help/te/gnome-help/figures/gnome.png
share/help/te/gnome-help/figures/go-down.png
share/help/te/gnome-help/figures/input-keyboard-symbolic.png
share/help/te/gnome-help/figures/input-methods-switcher.png
+share/help/te/gnome-help/figures/keyboard-key-calculator.svg
+share/help/te/gnome-help/figures/keyboard-key-computer.svg
+share/help/te/gnome-help/figures/keyboard-key-eject.svg
+share/help/te/gnome-help/figures/keyboard-key-folder.svg
+share/help/te/gnome-help/figures/keyboard-key-home.svg
+share/help/te/gnome-help/figures/keyboard-key-mail.svg
+share/help/te/gnome-help/figures/keyboard-key-media.svg
share/help/te/gnome-help/figures/keyboard-key-menu.svg
-share/help/te/gnome-help/figures/nautilus-3-10.png
+share/help/te/gnome-help/figures/keyboard-key-mute.svg
+share/help/te/gnome-help/figures/keyboard-key-next.svg
+share/help/te/gnome-help/figures/keyboard-key-pause.svg
+share/help/te/gnome-help/figures/keyboard-key-play.svg
+share/help/te/gnome-help/figures/keyboard-key-previous.svg
+share/help/te/gnome-help/figures/keyboard-key-search.svg
+share/help/te/gnome-help/figures/keyboard-key-stop.svg
+share/help/te/gnome-help/figures/keyboard-key-voldown.svg
+share/help/te/gnome-help/figures/keyboard-key-volup.svg
+share/help/te/gnome-help/figures/keyboard-key-world.svg
share/help/te/gnome-help/figures/nautilus-icons.png
share/help/te/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/te/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -10906,35 +14024,26 @@ share/help/te/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/te/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/te/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/te/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/te/gnome-help/figures/notification-buttons.png
share/help/te/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/te/gnome-help/figures/printing-select.png
share/help/te/gnome-help/figures/shell-activities-classic.png
share/help/te/gnome-help/figures/shell-activities.png
share/help/te/gnome-help/figures/shell-appmenu-classic.png
share/help/te/gnome-help/figures/shell-appmenu-shell.png
-share/help/te/gnome-help/figures/shell-apps-open.png
share/help/te/gnome-help/figures/shell-appts-classic.png
share/help/te/gnome-help/figures/shell-appts.png
share/help/te/gnome-help/figures/shell-dash.png
share/help/te/gnome-help/figures/shell-exit-classic.png
share/help/te/gnome-help/figures/shell-exit.png
-share/help/te/gnome-help/figures/shell-files.png
-share/help/te/gnome-help/figures/shell-introduction.png
-share/help/te/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/te/gnome-help/figures/shell-lock.png
-share/help/te/gnome-help/figures/shell-notification.png
share/help/te/gnome-help/figures/shell-top-bar-classic.png
share/help/te/gnome-help/figures/shell-top-bar.png
share/help/te/gnome-help/figures/shell-window-list-classic.png
-share/help/te/gnome-help/figures/shell-windows.png
share/help/te/gnome-help/figures/shell-workspaces.png
-share/help/te/gnome-help/figures/shell.png
share/help/te/gnome-help/figures/system-run-symbolic.svg
share/help/te/gnome-help/figures/top-bar-icons-classic.png
share/help/te/gnome-help/figures/top-bar-icons.png
share/help/te/gnome-help/figures/universal-access-menu.png
-share/help/te/gnome-help/figures/view-fullscreen-16.png
share/help/te/gnome-help/figures/view-more-symbolic.svg
share/help/te/gnome-help/figures/yelp-icon-big.png
share/help/te/gnome-help/files-autorun.page
@@ -11045,6 +14154,8 @@ share/help/te/gnome-help/net-wireless-troubleshooting.page
share/help/te/gnome-help/net-wireless-wepwpa.page
share/help/te/gnome-help/net-wireless.page
share/help/te/gnome-help/net.page
+share/help/te/gnome-help/power-autobrightness.page
+share/help/te/gnome-help/power-autosuspend.page
share/help/te/gnome-help/power-batteryestimate.page
share/help/te/gnome-help/power-batterylife.page
share/help/te/gnome-help/power-batteryoptimal.page
@@ -11056,10 +14167,12 @@ share/help/te/gnome-help/power-hotcomputer.page
share/help/te/gnome-help/power-lowpower.page
share/help/te/gnome-help/power-nowireless.page
share/help/te/gnome-help/power-othercountry.page
+share/help/te/gnome-help/power-status.page
share/help/te/gnome-help/power-suspend.page
share/help/te/gnome-help/power-suspendfail.page
share/help/te/gnome-help/power-whydim.page
share/help/te/gnome-help/power-willnotturnon.page
+share/help/te/gnome-help/power-wireless.page
share/help/te/gnome-help/power.page
share/help/te/gnome-help/prefs-display.page
share/help/te/gnome-help/prefs-language.page
@@ -11216,6 +14329,8 @@ share/help/vi/gnome-help/disk-capacity.page
share/help/vi/gnome-help/disk-check.page
share/help/vi/gnome-help/disk-format.page
share/help/vi/gnome-help/disk-partitions.page
+share/help/vi/gnome-help/disk-repair.page
+share/help/vi/gnome-help/disk-resize.page
share/help/vi/gnome-help/disk.page
share/help/vi/gnome-help/display-blank.page
share/help/vi/gnome-help/display-brightness.page
@@ -11239,7 +14354,6 @@ share/help/vi/gnome-help/figures/battery-missing-symbolic.svg
share/help/vi/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/vi/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/vi/gnome-help/figures/bluetooth-menu.png
-share/help/vi/gnome-help/figures/camera-photo-symbolic.svg
share/help/vi/gnome-help/figures/color-average.png
share/help/vi/gnome-help/figures/color-camera.png
share/help/vi/gnome-help/figures/color-display.png
@@ -11247,15 +14361,30 @@ share/help/vi/gnome-help/figures/color-printer.png
share/help/vi/gnome-help/figures/color-profile-default.png
share/help/vi/gnome-help/figures/color-space.png
share/help/vi/gnome-help/figures/display-dual-monitors.webm
-share/help/vi/gnome-help/figures/documents-icon.png
share/help/vi/gnome-help/figures/emblem-system-symbolic.svg
share/help/vi/gnome-help/figures/emblem-system.png
share/help/vi/gnome-help/figures/gnome.png
share/help/vi/gnome-help/figures/go-down.png
share/help/vi/gnome-help/figures/input-keyboard-symbolic.png
share/help/vi/gnome-help/figures/input-methods-switcher.png
+share/help/vi/gnome-help/figures/keyboard-key-calculator.svg
+share/help/vi/gnome-help/figures/keyboard-key-computer.svg
+share/help/vi/gnome-help/figures/keyboard-key-eject.svg
+share/help/vi/gnome-help/figures/keyboard-key-folder.svg
+share/help/vi/gnome-help/figures/keyboard-key-home.svg
+share/help/vi/gnome-help/figures/keyboard-key-mail.svg
+share/help/vi/gnome-help/figures/keyboard-key-media.svg
share/help/vi/gnome-help/figures/keyboard-key-menu.svg
-share/help/vi/gnome-help/figures/nautilus-3-10.png
+share/help/vi/gnome-help/figures/keyboard-key-mute.svg
+share/help/vi/gnome-help/figures/keyboard-key-next.svg
+share/help/vi/gnome-help/figures/keyboard-key-pause.svg
+share/help/vi/gnome-help/figures/keyboard-key-play.svg
+share/help/vi/gnome-help/figures/keyboard-key-previous.svg
+share/help/vi/gnome-help/figures/keyboard-key-search.svg
+share/help/vi/gnome-help/figures/keyboard-key-stop.svg
+share/help/vi/gnome-help/figures/keyboard-key-voldown.svg
+share/help/vi/gnome-help/figures/keyboard-key-volup.svg
+share/help/vi/gnome-help/figures/keyboard-key-world.svg
share/help/vi/gnome-help/figures/nautilus-icons.png
share/help/vi/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/vi/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -11289,35 +14418,26 @@ share/help/vi/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/vi/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/vi/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/vi/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/vi/gnome-help/figures/notification-buttons.png
share/help/vi/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/vi/gnome-help/figures/printing-select.png
share/help/vi/gnome-help/figures/shell-activities-classic.png
share/help/vi/gnome-help/figures/shell-activities.png
share/help/vi/gnome-help/figures/shell-appmenu-classic.png
share/help/vi/gnome-help/figures/shell-appmenu-shell.png
-share/help/vi/gnome-help/figures/shell-apps-open.png
share/help/vi/gnome-help/figures/shell-appts-classic.png
share/help/vi/gnome-help/figures/shell-appts.png
share/help/vi/gnome-help/figures/shell-dash.png
share/help/vi/gnome-help/figures/shell-exit-classic.png
share/help/vi/gnome-help/figures/shell-exit.png
-share/help/vi/gnome-help/figures/shell-files.png
-share/help/vi/gnome-help/figures/shell-introduction.png
-share/help/vi/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/vi/gnome-help/figures/shell-lock.png
-share/help/vi/gnome-help/figures/shell-notification.png
share/help/vi/gnome-help/figures/shell-top-bar-classic.png
share/help/vi/gnome-help/figures/shell-top-bar.png
share/help/vi/gnome-help/figures/shell-window-list-classic.png
-share/help/vi/gnome-help/figures/shell-windows.png
share/help/vi/gnome-help/figures/shell-workspaces.png
-share/help/vi/gnome-help/figures/shell.png
share/help/vi/gnome-help/figures/system-run-symbolic.svg
share/help/vi/gnome-help/figures/top-bar-icons-classic.png
share/help/vi/gnome-help/figures/top-bar-icons.png
share/help/vi/gnome-help/figures/universal-access-menu.png
-share/help/vi/gnome-help/figures/view-fullscreen-16.png
share/help/vi/gnome-help/figures/view-more-symbolic.svg
share/help/vi/gnome-help/figures/yelp-icon-big.png
share/help/vi/gnome-help/files-autorun.page
@@ -11428,6 +14548,8 @@ share/help/vi/gnome-help/net-wireless-troubleshooting.page
share/help/vi/gnome-help/net-wireless-wepwpa.page
share/help/vi/gnome-help/net-wireless.page
share/help/vi/gnome-help/net.page
+share/help/vi/gnome-help/power-autobrightness.page
+share/help/vi/gnome-help/power-autosuspend.page
share/help/vi/gnome-help/power-batteryestimate.page
share/help/vi/gnome-help/power-batterylife.page
share/help/vi/gnome-help/power-batteryoptimal.page
@@ -11439,10 +14561,12 @@ share/help/vi/gnome-help/power-hotcomputer.page
share/help/vi/gnome-help/power-lowpower.page
share/help/vi/gnome-help/power-nowireless.page
share/help/vi/gnome-help/power-othercountry.page
+share/help/vi/gnome-help/power-status.page
share/help/vi/gnome-help/power-suspend.page
share/help/vi/gnome-help/power-suspendfail.page
share/help/vi/gnome-help/power-whydim.page
share/help/vi/gnome-help/power-willnotturnon.page
+share/help/vi/gnome-help/power-wireless.page
share/help/vi/gnome-help/power.page
share/help/vi/gnome-help/prefs-display.page
share/help/vi/gnome-help/prefs-language.page
@@ -11599,6 +14723,8 @@ share/help/zh_CN/gnome-help/disk-capacity.page
share/help/zh_CN/gnome-help/disk-check.page
share/help/zh_CN/gnome-help/disk-format.page
share/help/zh_CN/gnome-help/disk-partitions.page
+share/help/zh_CN/gnome-help/disk-repair.page
+share/help/zh_CN/gnome-help/disk-resize.page
share/help/zh_CN/gnome-help/disk.page
share/help/zh_CN/gnome-help/display-blank.page
share/help/zh_CN/gnome-help/display-brightness.page
@@ -11622,7 +14748,6 @@ share/help/zh_CN/gnome-help/figures/battery-missing-symbolic.svg
share/help/zh_CN/gnome-help/figures/bluetooth-active-symbolic.svg
share/help/zh_CN/gnome-help/figures/bluetooth-disabled-symbolic.svg
share/help/zh_CN/gnome-help/figures/bluetooth-menu.png
-share/help/zh_CN/gnome-help/figures/camera-photo-symbolic.svg
share/help/zh_CN/gnome-help/figures/color-average.png
share/help/zh_CN/gnome-help/figures/color-camera.png
share/help/zh_CN/gnome-help/figures/color-display.png
@@ -11630,15 +14755,30 @@ share/help/zh_CN/gnome-help/figures/color-printer.png
share/help/zh_CN/gnome-help/figures/color-profile-default.png
share/help/zh_CN/gnome-help/figures/color-space.png
share/help/zh_CN/gnome-help/figures/display-dual-monitors.webm
-share/help/zh_CN/gnome-help/figures/documents-icon.png
share/help/zh_CN/gnome-help/figures/emblem-system-symbolic.svg
share/help/zh_CN/gnome-help/figures/emblem-system.png
share/help/zh_CN/gnome-help/figures/gnome.png
share/help/zh_CN/gnome-help/figures/go-down.png
share/help/zh_CN/gnome-help/figures/input-keyboard-symbolic.png
share/help/zh_CN/gnome-help/figures/input-methods-switcher.png
+share/help/zh_CN/gnome-help/figures/keyboard-key-calculator.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-computer.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-eject.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-folder.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-home.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-mail.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-media.svg
share/help/zh_CN/gnome-help/figures/keyboard-key-menu.svg
-share/help/zh_CN/gnome-help/figures/nautilus-3-10.png
+share/help/zh_CN/gnome-help/figures/keyboard-key-mute.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-next.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-pause.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-play.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-previous.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-search.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-stop.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-voldown.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-volup.svg
+share/help/zh_CN/gnome-help/figures/keyboard-key-world.svg
share/help/zh_CN/gnome-help/figures/nautilus-icons.png
share/help/zh_CN/gnome-help/figures/network-cellular-3g-symbolic.svg
share/help/zh_CN/gnome-help/figures/network-cellular-4g-symbolic.svg
@@ -11672,35 +14812,26 @@ share/help/zh_CN/gnome-help/figures/network-wireless-signal-good-symbolic.svg
share/help/zh_CN/gnome-help/figures/network-wireless-signal-none-symbolic.svg
share/help/zh_CN/gnome-help/figures/network-wireless-signal-ok-symbolic.svg
share/help/zh_CN/gnome-help/figures/network-wireless-signal-weak-symbolic.svg
-share/help/zh_CN/gnome-help/figures/notification-buttons.png
share/help/zh_CN/gnome-help/figures/preferences-desktop-accessibility-symbolic.svg
share/help/zh_CN/gnome-help/figures/printing-select.png
share/help/zh_CN/gnome-help/figures/shell-activities-classic.png
share/help/zh_CN/gnome-help/figures/shell-activities.png
share/help/zh_CN/gnome-help/figures/shell-appmenu-classic.png
share/help/zh_CN/gnome-help/figures/shell-appmenu-shell.png
-share/help/zh_CN/gnome-help/figures/shell-apps-open.png
share/help/zh_CN/gnome-help/figures/shell-appts-classic.png
share/help/zh_CN/gnome-help/figures/shell-appts.png
share/help/zh_CN/gnome-help/figures/shell-dash.png
share/help/zh_CN/gnome-help/figures/shell-exit-classic.png
share/help/zh_CN/gnome-help/figures/shell-exit.png
-share/help/zh_CN/gnome-help/figures/shell-files.png
-share/help/zh_CN/gnome-help/figures/shell-introduction.png
-share/help/zh_CN/gnome-help/figures/shell-keyboard-shortcuts.png
share/help/zh_CN/gnome-help/figures/shell-lock.png
-share/help/zh_CN/gnome-help/figures/shell-notification.png
share/help/zh_CN/gnome-help/figures/shell-top-bar-classic.png
share/help/zh_CN/gnome-help/figures/shell-top-bar.png
share/help/zh_CN/gnome-help/figures/shell-window-list-classic.png
-share/help/zh_CN/gnome-help/figures/shell-windows.png
share/help/zh_CN/gnome-help/figures/shell-workspaces.png
-share/help/zh_CN/gnome-help/figures/shell.png
share/help/zh_CN/gnome-help/figures/system-run-symbolic.svg
share/help/zh_CN/gnome-help/figures/top-bar-icons-classic.png
share/help/zh_CN/gnome-help/figures/top-bar-icons.png
share/help/zh_CN/gnome-help/figures/universal-access-menu.png
-share/help/zh_CN/gnome-help/figures/view-fullscreen-16.png
share/help/zh_CN/gnome-help/figures/view-more-symbolic.svg
share/help/zh_CN/gnome-help/figures/yelp-icon-big.png
share/help/zh_CN/gnome-help/files-autorun.page
@@ -11811,6 +14942,8 @@ share/help/zh_CN/gnome-help/net-wireless-troubleshooting.page
share/help/zh_CN/gnome-help/net-wireless-wepwpa.page
share/help/zh_CN/gnome-help/net-wireless.page
share/help/zh_CN/gnome-help/net.page
+share/help/zh_CN/gnome-help/power-autobrightness.page
+share/help/zh_CN/gnome-help/power-autosuspend.page
share/help/zh_CN/gnome-help/power-batteryestimate.page
share/help/zh_CN/gnome-help/power-batterylife.page
share/help/zh_CN/gnome-help/power-batteryoptimal.page
@@ -11822,10 +14955,12 @@ share/help/zh_CN/gnome-help/power-hotcomputer.page
share/help/zh_CN/gnome-help/power-lowpower.page
share/help/zh_CN/gnome-help/power-nowireless.page
share/help/zh_CN/gnome-help/power-othercountry.page
+share/help/zh_CN/gnome-help/power-status.page
share/help/zh_CN/gnome-help/power-suspend.page
share/help/zh_CN/gnome-help/power-suspendfail.page
share/help/zh_CN/gnome-help/power-whydim.page
share/help/zh_CN/gnome-help/power-willnotturnon.page
+share/help/zh_CN/gnome-help/power-wireless.page
share/help/zh_CN/gnome-help/power.page
share/help/zh_CN/gnome-help/prefs-display.page
share/help/zh_CN/gnome-help/prefs-language.page
diff --git a/misc/lxde-common/Makefile b/misc/lxde-common/Makefile
index fe2ab04d4676..1244aa0ce2f9 100644
--- a/misc/lxde-common/Makefile
+++ b/misc/lxde-common/Makefile
@@ -3,6 +3,7 @@
PORTNAME= lxde-common
PORTVERSION= 0.99.2
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= SF/lxde/${PORTNAME}%20%28default%20config%29/${PORTNAME}%20${PORTVERSION:R}/
@@ -13,7 +14,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= lxde-icon-theme>=0:x11-themes/lxde-icon-theme \
- gnome-themes-standard>=3.18:x11-themes/gnome-themes-standard \
+ gnome-themes-extra>=3.18:x11-themes/gnome-themes-extra \
xscreensaver:x11/xscreensaver
USES= gettext-tools gmake localbase tar:xz
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 85b6a634e8f5..bfce36baa902 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cheese
-PORTVERSION= 3.18.1
-PORTREVISION= 3
+PORTVERSION= 3.28.0
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,11 +10,18 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Photobooth-inspired app for taking pictures and videos from webcam
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat \
gnome-video-effects>=0:graphics/gnome-video-effects \
vala>=0.14.0:lang/vala \
itstool:textproc/itstool
LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+ libcanberra.so:audio/libcanberra \
+ libclutter-1.0.so:graphics/clutter \
+ libcogl.so:graphics/cogl \
+ libjson-glib-1.0.so:devel/json-glib \
libhal.so:sysutils/hal \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libclutter-gst-3.0.so:multimedia/clutter-gst3
@@ -23,16 +29,17 @@ RUN_DEPENDS= gnome-video-effects>=0:graphics/gnome-video-effects
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME= intlhack evolutiondataserver3 librsvg2 \
+USES= gettext gmake gnome libtool localbase pathfix \
+ pkgconfig tar:xz
+USE_GNOME= cairo intlhack evolutiondataserver3 librsvg2 \
gnomedesktop3 libxml2:build introspection:build
-USE_XORG= xxf86vm x11
+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+= -I${LOCALBASE}/include -Wno-format-nonliteral
-LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -Wno-format-nonliteral
INSTALL_TARGET= install-strip
DOCS= AUTHORS COPYING ChangeLog NEWS README
diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo
index e1b8910cb3e1..9a6f5baf26bc 100644
--- a/multimedia/cheese/distinfo
+++ b/multimedia/cheese/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/cheese-3.18.1.tar.xz) = fc9d8798b1f0c6b35731f063869a32c6910bab6d0386b9ea36386ebda0d57177
-SIZE (gnome3/cheese-3.18.1.tar.xz) = 1829408
+TIMESTAMP = 1524943812
+SHA256 (gnome3/cheese-3.28.0.tar.xz) = 5c1e7a2e1fccc1b0c7b636fb03f2ae83862e2feaebadb94be37c3758182eaa19
+SIZE (gnome3/cheese-3.28.0.tar.xz) = 1544904
diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist
index 5f0d59213761..08971df083e2 100644
--- a/multimedia/cheese/pkg-plist
+++ b/multimedia/cheese/pkg-plist
@@ -12,17 +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.0.3
+lib/libcheese-gtk.so.25.1.0
lib/libcheese.so
lib/libcheese.so.8
-lib/libcheese.so.8.0.3
+lib/libcheese.so.8.0.10
libdata/pkgconfig/cheese-gtk.pc
libdata/pkgconfig/cheese.pc
-libexec/gnome-camera-service
%%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.Camera.service
share/dbus-1/services/org.gnome.Cheese.service
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -40,7 +38,6 @@ 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-deprecated.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
@@ -63,16 +60,9 @@ 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-delete.png
-share/help/C/cheese/figures/cheese-effects.png
-share/help/C/cheese/figures/cheese-introduction.png
-share/help/C/cheese/figures/cheese-record.png
-share/help/C/cheese/figures/cheese-save.png
-share/help/C/cheese/figures/cheese-take.png
share/help/C/cheese/figures/cheese.png
share/help/C/cheese/figures/effects.png
share/help/C/cheese/figures/image-properties.png
-share/help/C/cheese/figures/settings.png
share/help/C/cheese/index.page
share/help/C/cheese/introduction.page
share/help/C/cheese/legal.xml
@@ -88,16 +78,9 @@ share/help/C/cheese/pref-resolution.page
share/help/C/cheese/video-record.page
share/help/ca/cheese/burst-mode.page
share/help/ca/cheese/effects-apply.page
-share/help/ca/cheese/figures/cheese-delete.png
-share/help/ca/cheese/figures/cheese-effects.png
-share/help/ca/cheese/figures/cheese-introduction.png
-share/help/ca/cheese/figures/cheese-record.png
-share/help/ca/cheese/figures/cheese-save.png
-share/help/ca/cheese/figures/cheese-take.png
share/help/ca/cheese/figures/cheese.png
share/help/ca/cheese/figures/effects.png
share/help/ca/cheese/figures/image-properties.png
-share/help/ca/cheese/figures/settings.png
share/help/ca/cheese/index.page
share/help/ca/cheese/introduction.page
share/help/ca/cheese/legal.xml
@@ -113,16 +96,9 @@ share/help/ca/cheese/pref-resolution.page
share/help/ca/cheese/video-record.page
share/help/cs/cheese/burst-mode.page
share/help/cs/cheese/effects-apply.page
-share/help/cs/cheese/figures/cheese-delete.png
-share/help/cs/cheese/figures/cheese-effects.png
-share/help/cs/cheese/figures/cheese-introduction.png
-share/help/cs/cheese/figures/cheese-record.png
-share/help/cs/cheese/figures/cheese-save.png
-share/help/cs/cheese/figures/cheese-take.png
share/help/cs/cheese/figures/cheese.png
share/help/cs/cheese/figures/effects.png
share/help/cs/cheese/figures/image-properties.png
-share/help/cs/cheese/figures/settings.png
share/help/cs/cheese/index.page
share/help/cs/cheese/introduction.page
share/help/cs/cheese/legal.xml
@@ -138,16 +114,9 @@ share/help/cs/cheese/pref-resolution.page
share/help/cs/cheese/video-record.page
share/help/de/cheese/burst-mode.page
share/help/de/cheese/effects-apply.page
-share/help/de/cheese/figures/cheese-delete.png
-share/help/de/cheese/figures/cheese-effects.png
-share/help/de/cheese/figures/cheese-introduction.png
-share/help/de/cheese/figures/cheese-record.png
-share/help/de/cheese/figures/cheese-save.png
-share/help/de/cheese/figures/cheese-take.png
share/help/de/cheese/figures/cheese.png
share/help/de/cheese/figures/effects.png
share/help/de/cheese/figures/image-properties.png
-share/help/de/cheese/figures/settings.png
share/help/de/cheese/index.page
share/help/de/cheese/introduction.page
share/help/de/cheese/legal.xml
@@ -163,16 +132,9 @@ share/help/de/cheese/pref-resolution.page
share/help/de/cheese/video-record.page
share/help/el/cheese/burst-mode.page
share/help/el/cheese/effects-apply.page
-share/help/el/cheese/figures/cheese-delete.png
-share/help/el/cheese/figures/cheese-effects.png
-share/help/el/cheese/figures/cheese-introduction.png
-share/help/el/cheese/figures/cheese-record.png
-share/help/el/cheese/figures/cheese-save.png
-share/help/el/cheese/figures/cheese-take.png
share/help/el/cheese/figures/cheese.png
share/help/el/cheese/figures/effects.png
share/help/el/cheese/figures/image-properties.png
-share/help/el/cheese/figures/settings.png
share/help/el/cheese/index.page
share/help/el/cheese/introduction.page
share/help/el/cheese/legal.xml
@@ -188,16 +150,9 @@ share/help/el/cheese/pref-resolution.page
share/help/el/cheese/video-record.page
share/help/es/cheese/burst-mode.page
share/help/es/cheese/effects-apply.page
-share/help/es/cheese/figures/cheese-delete.png
-share/help/es/cheese/figures/cheese-effects.png
-share/help/es/cheese/figures/cheese-introduction.png
-share/help/es/cheese/figures/cheese-record.png
-share/help/es/cheese/figures/cheese-save.png
-share/help/es/cheese/figures/cheese-take.png
share/help/es/cheese/figures/cheese.png
share/help/es/cheese/figures/effects.png
share/help/es/cheese/figures/image-properties.png
-share/help/es/cheese/figures/settings.png
share/help/es/cheese/index.page
share/help/es/cheese/introduction.page
share/help/es/cheese/legal.xml
@@ -213,16 +168,9 @@ share/help/es/cheese/pref-resolution.page
share/help/es/cheese/video-record.page
share/help/fi/cheese/burst-mode.page
share/help/fi/cheese/effects-apply.page
-share/help/fi/cheese/figures/cheese-delete.png
-share/help/fi/cheese/figures/cheese-effects.png
-share/help/fi/cheese/figures/cheese-introduction.png
-share/help/fi/cheese/figures/cheese-record.png
-share/help/fi/cheese/figures/cheese-save.png
-share/help/fi/cheese/figures/cheese-take.png
share/help/fi/cheese/figures/cheese.png
share/help/fi/cheese/figures/effects.png
share/help/fi/cheese/figures/image-properties.png
-share/help/fi/cheese/figures/settings.png
share/help/fi/cheese/index.page
share/help/fi/cheese/introduction.page
share/help/fi/cheese/legal.xml
@@ -238,16 +186,9 @@ share/help/fi/cheese/pref-resolution.page
share/help/fi/cheese/video-record.page
share/help/fr/cheese/burst-mode.page
share/help/fr/cheese/effects-apply.page
-share/help/fr/cheese/figures/cheese-delete.png
-share/help/fr/cheese/figures/cheese-effects.png
-share/help/fr/cheese/figures/cheese-introduction.png
-share/help/fr/cheese/figures/cheese-record.png
-share/help/fr/cheese/figures/cheese-save.png
-share/help/fr/cheese/figures/cheese-take.png
share/help/fr/cheese/figures/cheese.png
share/help/fr/cheese/figures/effects.png
share/help/fr/cheese/figures/image-properties.png
-share/help/fr/cheese/figures/settings.png
share/help/fr/cheese/index.page
share/help/fr/cheese/introduction.page
share/help/fr/cheese/legal.xml
@@ -263,16 +204,9 @@ share/help/fr/cheese/pref-resolution.page
share/help/fr/cheese/video-record.page
share/help/gl/cheese/burst-mode.page
share/help/gl/cheese/effects-apply.page
-share/help/gl/cheese/figures/cheese-delete.png
-share/help/gl/cheese/figures/cheese-effects.png
-share/help/gl/cheese/figures/cheese-introduction.png
-share/help/gl/cheese/figures/cheese-record.png
-share/help/gl/cheese/figures/cheese-save.png
-share/help/gl/cheese/figures/cheese-take.png
share/help/gl/cheese/figures/cheese.png
share/help/gl/cheese/figures/effects.png
share/help/gl/cheese/figures/image-properties.png
-share/help/gl/cheese/figures/settings.png
share/help/gl/cheese/index.page
share/help/gl/cheese/introduction.page
share/help/gl/cheese/legal.xml
@@ -288,16 +222,9 @@ share/help/gl/cheese/pref-resolution.page
share/help/gl/cheese/video-record.page
share/help/hu/cheese/burst-mode.page
share/help/hu/cheese/effects-apply.page
-share/help/hu/cheese/figures/cheese-delete.png
-share/help/hu/cheese/figures/cheese-effects.png
-share/help/hu/cheese/figures/cheese-introduction.png
-share/help/hu/cheese/figures/cheese-record.png
-share/help/hu/cheese/figures/cheese-save.png
-share/help/hu/cheese/figures/cheese-take.png
share/help/hu/cheese/figures/cheese.png
share/help/hu/cheese/figures/effects.png
share/help/hu/cheese/figures/image-properties.png
-share/help/hu/cheese/figures/settings.png
share/help/hu/cheese/index.page
share/help/hu/cheese/introduction.page
share/help/hu/cheese/legal.xml
@@ -313,16 +240,9 @@ share/help/hu/cheese/pref-resolution.page
share/help/hu/cheese/video-record.page
share/help/id/cheese/burst-mode.page
share/help/id/cheese/effects-apply.page
-share/help/id/cheese/figures/cheese-delete.png
-share/help/id/cheese/figures/cheese-effects.png
-share/help/id/cheese/figures/cheese-introduction.png
-share/help/id/cheese/figures/cheese-record.png
-share/help/id/cheese/figures/cheese-save.png
-share/help/id/cheese/figures/cheese-take.png
share/help/id/cheese/figures/cheese.png
share/help/id/cheese/figures/effects.png
share/help/id/cheese/figures/image-properties.png
-share/help/id/cheese/figures/settings.png
share/help/id/cheese/index.page
share/help/id/cheese/introduction.page
share/help/id/cheese/legal.xml
@@ -338,16 +258,9 @@ share/help/id/cheese/pref-resolution.page
share/help/id/cheese/video-record.page
share/help/ko/cheese/burst-mode.page
share/help/ko/cheese/effects-apply.page
-share/help/ko/cheese/figures/cheese-delete.png
-share/help/ko/cheese/figures/cheese-effects.png
-share/help/ko/cheese/figures/cheese-introduction.png
-share/help/ko/cheese/figures/cheese-record.png
-share/help/ko/cheese/figures/cheese-save.png
-share/help/ko/cheese/figures/cheese-take.png
share/help/ko/cheese/figures/cheese.png
share/help/ko/cheese/figures/effects.png
share/help/ko/cheese/figures/image-properties.png
-share/help/ko/cheese/figures/settings.png
share/help/ko/cheese/index.page
share/help/ko/cheese/introduction.page
share/help/ko/cheese/legal.xml
@@ -361,18 +274,47 @@ share/help/ko/cheese/pref-fullscreen.page
share/help/ko/cheese/pref-image-properties.page
share/help/ko/cheese/pref-resolution.page
share/help/ko/cheese/video-record.page
+share/help/nl/cheese/burst-mode.page
+share/help/nl/cheese/effects-apply.page
+share/help/nl/cheese/figures/cheese.png
+share/help/nl/cheese/figures/effects.png
+share/help/nl/cheese/figures/image-properties.png
+share/help/nl/cheese/index.page
+share/help/nl/cheese/introduction.page
+share/help/nl/cheese/legal.xml
+share/help/nl/cheese/photo-delete.page
+share/help/nl/cheese/photo-save.page
+share/help/nl/cheese/photo-take.page
+share/help/nl/cheese/photo-view.page
+share/help/nl/cheese/pref-countdown.page
+share/help/nl/cheese/pref-flash.page
+share/help/nl/cheese/pref-fullscreen.page
+share/help/nl/cheese/pref-image-properties.page
+share/help/nl/cheese/pref-resolution.page
+share/help/nl/cheese/video-record.page
+share/help/pl/cheese/burst-mode.page
+share/help/pl/cheese/effects-apply.page
+share/help/pl/cheese/figures/cheese.png
+share/help/pl/cheese/figures/effects.png
+share/help/pl/cheese/figures/image-properties.png
+share/help/pl/cheese/index.page
+share/help/pl/cheese/introduction.page
+share/help/pl/cheese/legal.xml
+share/help/pl/cheese/photo-delete.page
+share/help/pl/cheese/photo-save.page
+share/help/pl/cheese/photo-take.page
+share/help/pl/cheese/photo-view.page
+share/help/pl/cheese/pref-countdown.page
+share/help/pl/cheese/pref-flash.page
+share/help/pl/cheese/pref-fullscreen.page
+share/help/pl/cheese/pref-image-properties.page
+share/help/pl/cheese/pref-resolution.page
+share/help/pl/cheese/video-record.page
share/help/pt_BR/cheese/burst-mode.page
share/help/pt_BR/cheese/effects-apply.page
-share/help/pt_BR/cheese/figures/cheese-delete.png
-share/help/pt_BR/cheese/figures/cheese-effects.png
-share/help/pt_BR/cheese/figures/cheese-introduction.png
-share/help/pt_BR/cheese/figures/cheese-record.png
-share/help/pt_BR/cheese/figures/cheese-save.png
-share/help/pt_BR/cheese/figures/cheese-take.png
share/help/pt_BR/cheese/figures/cheese.png
share/help/pt_BR/cheese/figures/effects.png
share/help/pt_BR/cheese/figures/image-properties.png
-share/help/pt_BR/cheese/figures/settings.png
share/help/pt_BR/cheese/index.page
share/help/pt_BR/cheese/introduction.page
share/help/pt_BR/cheese/legal.xml
@@ -388,16 +330,9 @@ share/help/pt_BR/cheese/pref-resolution.page
share/help/pt_BR/cheese/video-record.page
share/help/ru/cheese/burst-mode.page
share/help/ru/cheese/effects-apply.page
-share/help/ru/cheese/figures/cheese-delete.png
-share/help/ru/cheese/figures/cheese-effects.png
-share/help/ru/cheese/figures/cheese-introduction.png
-share/help/ru/cheese/figures/cheese-record.png
-share/help/ru/cheese/figures/cheese-save.png
-share/help/ru/cheese/figures/cheese-take.png
share/help/ru/cheese/figures/cheese.png
share/help/ru/cheese/figures/effects.png
share/help/ru/cheese/figures/image-properties.png
-share/help/ru/cheese/figures/settings.png
share/help/ru/cheese/index.page
share/help/ru/cheese/introduction.page
share/help/ru/cheese/legal.xml
@@ -413,16 +348,9 @@ share/help/ru/cheese/pref-resolution.page
share/help/ru/cheese/video-record.page
share/help/sl/cheese/burst-mode.page
share/help/sl/cheese/effects-apply.page
-share/help/sl/cheese/figures/cheese-delete.png
-share/help/sl/cheese/figures/cheese-effects.png
-share/help/sl/cheese/figures/cheese-introduction.png
-share/help/sl/cheese/figures/cheese-record.png
-share/help/sl/cheese/figures/cheese-save.png
-share/help/sl/cheese/figures/cheese-take.png
share/help/sl/cheese/figures/cheese.png
share/help/sl/cheese/figures/effects.png
share/help/sl/cheese/figures/image-properties.png
-share/help/sl/cheese/figures/settings.png
share/help/sl/cheese/index.page
share/help/sl/cheese/introduction.page
share/help/sl/cheese/legal.xml
@@ -436,18 +364,29 @@ share/help/sl/cheese/pref-fullscreen.page
share/help/sl/cheese/pref-image-properties.page
share/help/sl/cheese/pref-resolution.page
share/help/sl/cheese/video-record.page
+share/help/sv/cheese/burst-mode.page
+share/help/sv/cheese/effects-apply.page
+share/help/sv/cheese/figures/cheese.png
+share/help/sv/cheese/figures/effects.png
+share/help/sv/cheese/figures/image-properties.png
+share/help/sv/cheese/index.page
+share/help/sv/cheese/introduction.page
+share/help/sv/cheese/legal.xml
+share/help/sv/cheese/photo-delete.page
+share/help/sv/cheese/photo-save.page
+share/help/sv/cheese/photo-take.page
+share/help/sv/cheese/photo-view.page
+share/help/sv/cheese/pref-countdown.page
+share/help/sv/cheese/pref-flash.page
+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/zh_CN/cheese/burst-mode.page
share/help/zh_CN/cheese/effects-apply.page
-share/help/zh_CN/cheese/figures/cheese-delete.png
-share/help/zh_CN/cheese/figures/cheese-effects.png
-share/help/zh_CN/cheese/figures/cheese-introduction.png
-share/help/zh_CN/cheese/figures/cheese-record.png
-share/help/zh_CN/cheese/figures/cheese-save.png
-share/help/zh_CN/cheese/figures/cheese-take.png
share/help/zh_CN/cheese/figures/cheese.png
share/help/zh_CN/cheese/figures/effects.png
share/help/zh_CN/cheese/figures/image-properties.png
-share/help/zh_CN/cheese/figures/settings.png
share/help/zh_CN/cheese/index.page
share/help/zh_CN/cheese/introduction.page
share/help/zh_CN/cheese/legal.xml
@@ -461,13 +400,13 @@ 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/cheese.png
-share/icons/hicolor/22x22/apps/cheese.png
-share/icons/hicolor/24x24/apps/cheese.png
-share/icons/hicolor/256x256/apps/cheese.png
-share/icons/hicolor/32x32/apps/cheese.png
-share/icons/hicolor/48x48/apps/cheese.png
-share/icons/hicolor/symbolic/apps/cheese-symbolic.svg
+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/symbolic/apps/org.gnome.Cheese-symbolic.svg
share/locale/af/LC_MESSAGES/cheese.mo
share/locale/an/LC_MESSAGES/cheese.mo
share/locale/ar/LC_MESSAGES/cheese.mo
@@ -514,6 +453,7 @@ share/locale/kn/LC_MESSAGES/cheese.mo
share/locale/ko/LC_MESSAGES/cheese.mo
share/locale/ku/LC_MESSAGES/cheese.mo
share/locale/ky/LC_MESSAGES/cheese.mo
+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
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 0f3b949b4f78..2fdd290085b4 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= clutter-gst
-PORTVERSION= 2.0.16
-PORTREVISION= 1
+PORTVERSION= 2.0.18
CATEGORIES= multimedia
MASTER_SITES= GNOME
@@ -14,7 +13,8 @@ LIB_DEPENDS= libclutter-1.0.so:graphics/clutter
PORTSCOUT= ignore:1
-USES= gmake libtool pathfix pkgconfig tar:xz
+USES= gmake libtool localbase pathfix \
+ pkgconfig tar:xz
USE_GNOME= introspection gnomeprefix
GNU_CONFIGURE= yes
USE_GL= gl
@@ -23,8 +23,7 @@ USE_XORG= xp x11
USE_LDCONFIG= yes
MAKE_ENV= XDG_CACHE_HOME=${WRKDIR}
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -lpthread -L${LOCALBASE}/lib
+LDFLAGS+= -lpthread
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/multimedia/clutter-gst/distinfo b/multimedia/clutter-gst/distinfo
index 3fe9c0151bdc..914dfd404708 100644
--- a/multimedia/clutter-gst/distinfo
+++ b/multimedia/clutter-gst/distinfo
@@ -1,2 +1,3 @@
-SHA256 (clutter-gst-2.0.16.tar.xz) = a944f84186937021aba6329c23954f6015d33bf151ba8994e13c59cefd742039
-SIZE (clutter-gst-2.0.16.tar.xz) = 357380
+TIMESTAMP = 1538308470
+SHA256 (clutter-gst-2.0.18.tar.xz) = 8d82bebf01b65d433bfb0f8da7bf7a8da42289f58b66bc4dfa775df0385bf8b5
+SIZE (clutter-gst-2.0.18.tar.xz) = 358936
diff --git a/multimedia/clutter-gst/pkg-plist b/multimedia/clutter-gst/pkg-plist
index 258301c4bd94..c1f0e7f07e60 100644
--- a/multimedia/clutter-gst/pkg-plist
+++ b/multimedia/clutter-gst/pkg-plist
@@ -10,7 +10,7 @@ lib/girepository-1.0/ClutterGst-2.0.typelib
lib/gstreamer-1.0/libgstclutter.so
lib/libclutter-gst-2.0.so
lib/libclutter-gst-2.0.so.0
-lib/libclutter-gst-2.0.so.0.16.0
+lib/libclutter-gst-2.0.so.0.18.0
libdata/pkgconfig/clutter-gst-2.0.pc
%%DOCSDIR%%/ClutterGstPlayer.html
%%DOCSDIR%%/ClutterGstVideoSink.html
diff --git a/multimedia/clutter-gst3/Makefile b/multimedia/clutter-gst3/Makefile
index 0ffd8e4c6bbb..df8bd3c2ca57 100644
--- a/multimedia/clutter-gst3/Makefile
+++ b/multimedia/clutter-gst3/Makefile
@@ -2,32 +2,40 @@
# $FreeBSD$
PORTNAME= clutter-gst
-PORTVERSION= 3.0.14
-PORTREVISION= 1
+PORTVERSION= 3.0.26
CATEGORIES= multimedia
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Clutter GStreamer integration
-LIB_DEPENDS= libclutter-1.0.so:graphics/clutter
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME= gnomeprefix introspection:build
+LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
+ libcogl-path.so:graphics/cogl \
+ libfribidi.so:converters/fribidi \
+ libjson-glib-1.0.so:devel/json-glib
+
+USES= gettext-runtime gl gmake gnome libtool localbase pathfix \
+ pkgconfig tar:xz
+USE_GNOME= atk cairo gdkpixbuf2 gnomeprefix introspection:build pango
GNU_CONFIGURE= yes
-USE_GL= gl
+USE_GL= gl egl
USE_GSTREAMER1= yes
-USE_XORG= xp x11
+USE_XORG= xcomposite xdamage xext xfixes xi xp xrandr x11
USE_LDCONFIG= yes
MAKE_ENV= XDG_CACHE_HOME=${WRKDIR}
+CONFIGURE_ARGS= --disable-udev
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
INSTALL_TARGET= install-strip
# The clutter-gst gstreamer plugin is not parrallel installable with
-# the 2.0 version. Don't install it (see @comment in plist) until
-# all users can be ported (upstream task) to the 3.0 version.
+# the 2.0 version. But we install it anyway since all GNOME users
+# are switched.
.include <bsd.port.mk>
diff --git a/multimedia/clutter-gst3/distinfo b/multimedia/clutter-gst3/distinfo
index 258ee3809a0a..7ff3f78db3ab 100644
--- a/multimedia/clutter-gst3/distinfo
+++ b/multimedia/clutter-gst3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (clutter-gst-3.0.14.tar.xz) = f7c8a7dc479759cad5ff7483cb5a1abbe3efd0b4f83ed0e443dc602430a82de2
-SIZE (clutter-gst-3.0.14.tar.xz) = 391596
+TIMESTAMP = 1526111723
+SHA256 (gnome/clutter-gst-3.0.26.tar.xz) = d8618a6d9accec0f2a8574c5e1220051f8505fb82b20336c26bdbd482aa6cb3a
+SIZE (gnome/clutter-gst-3.0.26.tar.xz) = 402976
diff --git a/multimedia/clutter-gst3/pkg-plist b/multimedia/clutter-gst3/pkg-plist
index c8ad2a83a124..5735c291ea64 100644
--- a/multimedia/clutter-gst3/pkg-plist
+++ b/multimedia/clutter-gst3/pkg-plist
@@ -13,37 +13,9 @@ include/clutter-gst-3.0/clutter-gst/clutter-gst-version.h
include/clutter-gst-3.0/clutter-gst/clutter-gst-video-sink.h
include/clutter-gst-3.0/clutter-gst/clutter-gst.h
lib/girepository-1.0/ClutterGst-3.0.typelib
-@comment See Makefile for comments on this.
-@comment lib/gstreamer-1.0/libgstclutter-3.0.so
+lib/gstreamer-1.0/libcluttergst3.so
lib/libclutter-gst-3.0.so
lib/libclutter-gst-3.0.so.0
-lib/libclutter-gst-3.0.so.0.14.0
+lib/libclutter-gst-3.0.so.0.26.0
libdata/pkgconfig/clutter-gst-3.0.pc
-%%DOCSDIR%%-3.0/ClutterGstAspectratio.html
-%%DOCSDIR%%-3.0/ClutterGstCamera.html
-%%DOCSDIR%%-3.0/ClutterGstCameraDevice.html
-%%DOCSDIR%%-3.0/ClutterGstContent.html
-%%DOCSDIR%%-3.0/ClutterGstCrop.html
-%%DOCSDIR%%-3.0/ClutterGstPlayback.html
-%%DOCSDIR%%-3.0/ClutterGstPlayer.html
-%%DOCSDIR%%-3.0/ch01.html
-%%DOCSDIR%%-3.0/ch02.html
-%%DOCSDIR%%-3.0/ch03.html
-%%DOCSDIR%%-3.0/ch04.html
-%%DOCSDIR%%-3.0/ch05.html
-%%DOCSDIR%%-3.0/clutter-gst-3.0.devhelp2
-%%DOCSDIR%%-3.0/clutter-gst-Utilities.html
-%%DOCSDIR%%-3.0/clutter-gst-Versioning-Macros.html
-%%DOCSDIR%%-3.0/clutter-gst-Video-Sink.html
-%%DOCSDIR%%-3.0/home.png
-%%DOCSDIR%%-3.0/index.html
-%%DOCSDIR%%-3.0/index.sgml
-%%DOCSDIR%%-3.0/left-insensitive.png
-%%DOCSDIR%%-3.0/left.png
-%%DOCSDIR%%-3.0/license.html
-%%DOCSDIR%%-3.0/right-insensitive.png
-%%DOCSDIR%%-3.0/right.png
-%%DOCSDIR%%-3.0/style.css
-%%DOCSDIR%%-3.0/up-insensitive.png
-%%DOCSDIR%%-3.0/up.png
share/gir-1.0/ClutterGst-3.0.gir
diff --git a/multimedia/libmediaart/Makefile b/multimedia/libmediaart/Makefile
index 8b0bf7a8bb99..424409f32220 100644
--- a/multimedia/libmediaart/Makefile
+++ b/multimedia/libmediaart/Makefile
@@ -2,24 +2,33 @@
# $FreeBSD$
PORTNAME= libmediaart
-PORTVERSION= 1.9.1
+PORTVERSION= 1.9.4
CATEGORIES= multimedia devel
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library for handling media art
-BUILD_DEPENDS= gtkdoc-check:textproc/gtk-doc \
- vala>=0:lang/vala
+LICENSE= GPLv2 LGPL21
+LICENSE_COMB= dual
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LESSER
-USES= gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= gdkpixbuf2 glib20 introspection
-GNU_CONFIGURE= yes
+BUILD_DEPENDS= vala>=0:lang/vala
+
+USES= gnome meson pathfix pkgconfig tar:xz
+USE_GNOME= gdkpixbuf2 introspection:build
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ARGS+=--enable-gtk-doc \
- --enable-introspection \
- --enable-vala
-INSTALL_TARGET= install-strip
+
+MESON_ARGS= -Dimage_library=gdk-pixbuf
+
+OPTIONS_DEFINE= DOCS
+DOCS_BUILD_DEPENDS= gtk-doc>=0:textproc/gtk-doc
+DOCS_MESON_ON= -Dwith-docs=yes
+DOCS_MESON_OFF= -Dwith-docs=no
+#option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'qt5'],
+# description: 'Which image processing backend to use')
+#option('with-docs', type : 'combo', choices : ['auto', 'yes', 'no'], value : 'auto')
+
.include <bsd.port.mk>
diff --git a/multimedia/libmediaart/distinfo b/multimedia/libmediaart/distinfo
index 9b72308841e1..c90cdf3911e5 100644
--- a/multimedia/libmediaart/distinfo
+++ b/multimedia/libmediaart/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491087912
-SHA256 (libmediaart-1.9.1.tar.xz) = 5b14aa4e0cc84eaec57b6cb28f39092d503fdaecf36d5d165fac37583b7fe949
-SIZE (libmediaart-1.9.1.tar.xz) = 5826128
+TIMESTAMP = 1506669087
+SHA256 (libmediaart-1.9.4.tar.xz) = a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d
+SIZE (libmediaart-1.9.4.tar.xz) = 5827928
diff --git a/multimedia/libmediaart/pkg-descr b/multimedia/libmediaart/pkg-descr
index 7c175ee895fc..47f91d26d107 100644
--- a/multimedia/libmediaart/pkg-descr
+++ b/multimedia/libmediaart/pkg-descr
@@ -1,3 +1,3 @@
Library for handling media art
-WWW: https://github.com/GNOME/libmediaart
+WWW: https://www.gnome.org/
diff --git a/multimedia/libmediaart/pkg-plist b/multimedia/libmediaart/pkg-plist
index 4bc64a5c4347..0db6bf4aabe4 100644
--- a/multimedia/libmediaart/pkg-plist
+++ b/multimedia/libmediaart/pkg-plist
@@ -1,29 +1,31 @@
include/libmediaart-2.0/libmediaart/cache.h
include/libmediaart-2.0/libmediaart/extract.h
include/libmediaart-2.0/libmediaart/extractgeneric.h
+include/libmediaart-2.0/libmediaart/mediaart-macros.h
include/libmediaart-2.0/libmediaart/mediaart.h
+lib/girepository-1.0/MediaArt-2.0.typelib
lib/libmediaart-2.0.so
lib/libmediaart-2.0.so.0
-lib/libmediaart-2.0.so.0.901.0
-lib/girepository-1.0/MediaArt-2.0.typelib
+lib/libmediaart-2.0.so.0.904.0
libdata/pkgconfig/libmediaart-2.0.pc
share/gir-1.0/MediaArt-2.0.gir
-share/gtk-doc/html/libmediaart/annotation-glossary.html
-share/gtk-doc/html/libmediaart/ch02.html
-share/gtk-doc/html/libmediaart/home.png
-share/gtk-doc/html/libmediaart/index.html
-share/gtk-doc/html/libmediaart/left-insensitive.png
-share/gtk-doc/html/libmediaart/left.png
-share/gtk-doc/html/libmediaart/libmediaart-Cache.html
-share/gtk-doc/html/libmediaart/libmediaart-MediaArtProcess.html
-share/gtk-doc/html/libmediaart/libmediaart-Plugins.html
-share/gtk-doc/html/libmediaart/libmediaart-reference.html
-share/gtk-doc/html/libmediaart/libmediaart.devhelp2
-share/gtk-doc/html/libmediaart/overview-compiling.html
-share/gtk-doc/html/libmediaart/overview.html
-share/gtk-doc/html/libmediaart/right-insensitive.png
-share/gtk-doc/html/libmediaart/right.png
-share/gtk-doc/html/libmediaart/style.css
-share/gtk-doc/html/libmediaart/up-insensitive.png
-share/gtk-doc/html/libmediaart/up.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/ch02.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/home.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/index.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/left.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/libmediaart-Cache.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/libmediaart-MediaArtProcess.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/libmediaart-Plugins.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/libmediaart-reference.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/libmediaart.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/overview-compiling.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/overview.html
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/right.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/style.css
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libmediaart/up.png
+share/vala/vapi/libmediaart-2.0.deps
share/vala/vapi/libmediaart-2.0.vapi
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 215dc5b481af..6e4a632eb17e 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= totem-pl-parser
-PORTVERSION= 3.10.8
+PORTVERSION= 3.26.1
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -13,27 +13,21 @@ COMMENT= GObject-based library to parse a host of playlist formats
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \
+LIB_DEPENDS= libgmime-3.0.so:mail/gmime30 \
libsoup-2.4.so:devel/libsoup \
libgpg-error.so:security/libgpg-error \
libgcrypt.so:security/libgcrypt
-USES= gettext gmake gnome libarchive libtool pathfix pkgconfig tar:xz
-USE_GNOME= glib20 gnomeprefix intltool introspection:build libxml2
+USES= gettext gnome libarchive localbase:ldflags meson pkgconfig tar:xz
+USE_GNOME= glib20 introspection:build libxml2
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-libarchive
-INSTALL_TARGET= install-strip
OPTIONS_SUB= yes
OPTIONS_DEFINE= QUVI
OPTIONS_DEFAULT=QUVI
+
QUVI_DESC= Flash media stream URL support
-QUVI_CONFIGURE_ENABLE= quvi
+QUVI_MESON_YES= enable-quvi
QUVI_LIB_DEPENDS= libquvi-0.9.so:multimedia/libquvi09
-post-patch:
- @${REINPLACE_CMD} -e 's|gmime-3.0|disabled-gmime-3.0|g' \
- ${WRKSRC}/configure
-
.include <bsd.port.mk>
diff --git a/multimedia/totem-pl-parser/distinfo b/multimedia/totem-pl-parser/distinfo
index 100e83d067e7..4e1ddf394f75 100644
--- a/multimedia/totem-pl-parser/distinfo
+++ b/multimedia/totem-pl-parser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498210013
-SHA256 (gnome2/totem-pl-parser-3.10.8.tar.xz) = ffc50a0713d5f3049912545169eea7d367483b2c4a868032940516ed1e78dd2b
-SIZE (gnome2/totem-pl-parser-3.10.8.tar.xz) = 1618992
+TIMESTAMP = 1529610555
+SHA256 (gnome2/totem-pl-parser-3.26.1.tar.xz) = 6ae2c4b8acaf052af21b8db256b6314385de031ba721a2dbdb361e90d4b4b74c
+SIZE (gnome2/totem-pl-parser-3.26.1.tar.xz) = 1312628
diff --git a/multimedia/totem-pl-parser/pkg-plist b/multimedia/totem-pl-parser/pkg-plist
index e6d282c8597d..d75018af9e76 100644
--- a/multimedia/totem-pl-parser/pkg-plist
+++ b/multimedia/totem-pl-parser/pkg-plist
@@ -4,33 +4,15 @@ include/totem-pl-parser/1/plparser/totem-pl-parser-mini.h
include/totem-pl-parser/1/plparser/totem-pl-parser.h
include/totem-pl-parser/1/plparser/totem-pl-playlist.h
lib/girepository-1.0/TotemPlParser-1.0.typelib
-lib/libtotem-plparser-mini.a
lib/libtotem-plparser-mini.so
lib/libtotem-plparser-mini.so.18
-lib/libtotem-plparser-mini.so.18.1.0
-lib/libtotem-plparser.a
+lib/libtotem-plparser-mini.so.18.1.2
lib/libtotem-plparser.so
lib/libtotem-plparser.so.18
-lib/libtotem-plparser.so.18.1.0
+lib/libtotem-plparser.so.18.1.2
libdata/pkgconfig/totem-plparser-mini.pc
libdata/pkgconfig/totem-plparser.pc
-%%QUVI%%libexec/totem-pl-parser/99-totem-pl-parser-videosite
-%%DOCSDIR%%/TotemPlParser.html
-%%DOCSDIR%%/TotemPlPlaylist.html
-%%DOCSDIR%%/annotation-glossary.html
-%%DOCSDIR%%/api-index-full.html
-%%DOCSDIR%%/api-reference.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/left-insensitive.png
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right-insensitive.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/totem-pl-parser-TotemPlPlaylistIter.html
-%%DOCSDIR%%/totem-pl-parser.devhelp2
-%%DOCSDIR%%/up-insensitive.png
-%%DOCSDIR%%/up.png
+libexec/totem-pl-parser/99-totem-pl-parser-videosite
share/gir-1.0/TotemPlParser-1.0.gir
share/locale/af/LC_MESSAGES/totem-pl-parser.mo
share/locale/am/LC_MESSAGES/totem-pl-parser.mo
@@ -54,9 +36,9 @@ share/locale/da/LC_MESSAGES/totem-pl-parser.mo
share/locale/de/LC_MESSAGES/totem-pl-parser.mo
share/locale/dz/LC_MESSAGES/totem-pl-parser.mo
share/locale/el/LC_MESSAGES/totem-pl-parser.mo
+share/locale/en@shaw/LC_MESSAGES/totem-pl-parser.mo
share/locale/en_CA/LC_MESSAGES/totem-pl-parser.mo
share/locale/en_GB/LC_MESSAGES/totem-pl-parser.mo
-share/locale/en@shaw/LC_MESSAGES/totem-pl-parser.mo
share/locale/eo/LC_MESSAGES/totem-pl-parser.mo
share/locale/es/LC_MESSAGES/totem-pl-parser.mo
share/locale/et/LC_MESSAGES/totem-pl-parser.mo
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 45792eee6a7e..abbda4d68c95 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= totem
-PORTVERSION= 3.18.1
-PORTREVISION= 6
+PORTVERSION= 3.26.1
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,74 +10,61 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gstreamer-based video player for the GNOME 3 Desktop
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
- ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
- pylint:devel/pylint1 \
+ pylint:devel/pylint \
appstream-glib>=0:devel/appstream-glib \
itstool:textproc/itstool \
- grilo-plugins2>=0:net/grilo-plugins2
+ grilo-plugins>=0:net/grilo-plugins
LIB_DEPENDS= libgdata.so:devel/libgdata \
- libdbus-glib-1.so:devel/dbus-glib \
+ libcogl.so:graphics/cogl \
+ libclutter-1.0.so:graphics/clutter \
libclutter-gst-3.0.so:multimedia/clutter-gst3 \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libpeas-1.0.so:devel/libpeas \
+ libjson-glib-1.0.so:devel/json-glib \
+ libgrilo-0.3.so:net/grilo \
+ libzeitgeist-2.0.so:sysutils/zeitgeist \
libtotem-plparser.so:multimedia/totem-pl-parser
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
- ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} \
gnome-settings-daemon>=2.91.0:sysutils/gnome-settings-daemon \
gnome-icon-theme-symbolic>=2.91.0:x11-themes/gnome-icon-theme-symbolic \
- grilo-plugins2>=0:net/grilo-plugins2
+ grilo-plugins>=0:net/grilo-plugins
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake gnome libtool \
- pathfix pkgconfig python:2.7 tar:xz
-USE_GNOME= gtk30 intlhack introspection:build libxml2 nautilus3 \
+USES= desktop-file-utils gettext gnome localbase meson \
+ pkgconfig python:3.4+ tar:xz
+USE_GNOME= cairo gtk30 intlhack introspection libxml2 nautilus3 \
pygobject3
USE_XORG= x11 xorgproto xtst ice sm
USE_GSTREAMER1= core good bad soup ugly
INSTALLS_ICONS= yes
-GNU_CONFIGURE= yes
+USE_GL= egl
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include -Wno-error=format-nonliteral
-CFLAGS+= -I${LOCALBASE}/include -Wno-error=format-nonliteral
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LIBS="-lXrandr"
-CONFIGURE_ARGS= --with-plugins="${TOTEM_PLUGINS}"
-#CONFIGURE_ENV+= APPDATA_VALIDATE="${LOCALBASE}/bin/appdata-validate --nonet"
-MAKE_ENV= XDG_CACHE_HOME=${WRKDIR}
-INSTALL_TARGET= install-strip
+
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.totem.enums.xml \
org.gnome.totem.gschema.xml \
- org.gnome.totem.plugins.opensubtitles.gschema.xml
-
-OPTIONS_DEFINE= LIRC
-
-PLIST_SUB+= PYVER=${PYTHON_VER:S/.//}
-
-OPTIONS_DEFAULT=
-
-# check configure script for allowed_plugins="..." for new plugins
-TOTEM_PLUGINS= apple-trailers autoload-subtitles brasero-disc-recorder chapters \
- dbusservice im-status grilo gromit iplayer media-player-keys \
- nautilus ontop opensubtitles properties recent \
- save-file screensaver screenshot sidebar-test skipto vimeo \
- youtube
+ org.gnome.totem.plugins.opensubtitles.gschema.xml \
+ org.gnome.totem.plugins.pythonconsole.gschema.xml
-# pythonconsole samplepython
-# vala sample-vala
-# iplayer zeitgeist-dp grilo
+# https://bugzilla.gnome.org/show_bug.cgi?id=786248
+# https://github.com/mesonbuild/meson/issues/1994
+MAKE_JOBS_UNSAFE=yes
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MLIRC}
-LIB_DEPENDS+= liblirc_client.so:comms/lirc
-PLIST_SUB+= LIRC=""
-TOTEM_PLUGINS:= ${TOTEM_PLUGINS} lirc
+.if ${ARCH} == i386 || ${OSVERSION} <= 1100000
+MESON_ARGS= -Denable-vala=no
+PLIST_SUB+= VALA="@comment "
.else
-PLIST_SUB+= LIRC="@comment "
+BUILD_DEPENDS+= valac:lang/vala
+PLIST_SUB+= VALA=""
.endif
.if defined(WITH_DVD_DEVICE)
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index c498e3262ce2..06effe458692 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/totem-3.18.1.tar.xz) = d7816eae9606846c44fd508902eae10bdaed28e6d4f621531990d473184107a2
-SIZE (gnome3/totem-3.18.1.tar.xz) = 3172416
+TIMESTAMP = 1529610772
+SHA256 (gnome3/totem-3.26.1.tar.xz) = 298160c9ee8d34f1ac6586c69e0440e3586a75fd4b1719d79f908edb9c00c382
+SIZE (gnome3/totem-3.26.1.tar.xz) = 3281392
diff --git a/multimedia/totem/pkg-descr b/multimedia/totem/pkg-descr
index 3f33f1f5f682..caf3b0955d44 100644
--- a/multimedia/totem/pkg-descr
+++ b/multimedia/totem/pkg-descr
@@ -1,7 +1,5 @@
-Totem is simple movie player for the Gnome 2 desktop based on xine.
+Totem is simple movie player for the Gnome 3 desktop based on xine.
It features a simple playlist, a full-screen mode, seek and volume controls,
as well as a pretty complete keyboard navigation.
WWW: http://www.gnome.org/projects/totem/
-
--- Hendrik Scholz <hendrik@scholz.net>
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 76b427f5c625..ede38b87def6 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -1,111 +1,69 @@
bin/totem
-bin/totem-audio-preview
bin/totem-video-thumbnailer
include/totem/1.0/totem-dirs.h
include/totem/1.0/totem-interface.h
include/totem/1.0/totem-plugin.h
include/totem/1.0/totem.h
lib/girepository-1.0/Totem-1.0.typelib
-lib/libtotem.a
lib/libtotem.so
lib/libtotem.so.0
lib/libtotem.so.0.0.0
-lib/nautilus/extensions-3.0/libtotem-properties-page.a
lib/nautilus/extensions-3.0/libtotem-properties-page.so
lib/totem/plugins/apple-trailers/apple-trailers.plugin
-lib/totem/plugins/apple-trailers/libapple-trailers.a
lib/totem/plugins/apple-trailers/libapple-trailers.so
lib/totem/plugins/autoload-subtitles/autoload-subtitles.plugin
-lib/totem/plugins/autoload-subtitles/libautoload-subtitles.a
lib/totem/plugins/autoload-subtitles/libautoload-subtitles.so
lib/totem/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin
-lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.a
lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.so
lib/totem/plugins/dbus/dbusservice.plugin
lib/totem/plugins/dbus/dbusservice.py
-lib/totem/plugins/dbus/dbusservice.pyc
-lib/totem/plugins/dbus/dbusservice.pyo
lib/totem/plugins/gromit/gromit.plugin
-lib/totem/plugins/gromit/libgromit.a
lib/totem/plugins/gromit/libgromit.so
-lib/totem/plugins/im-status/libtotem-im-status.a
lib/totem/plugins/im-status/libtotem-im-status.so
lib/totem/plugins/im-status/totem-im-status.plugin
-%%LIRC%%lib/totem/plugins/lirc/liblirc.a
-%%LIRC%%lib/totem/plugins/lirc/liblirc.so
-%%LIRC%%lib/totem/plugins/lirc/lirc.plugin
-%%LIRC%%lib/totem/plugins/lirc/totem_lirc_default
-lib/totem/plugins/media-player-keys/libmedia_player_keys.a
lib/totem/plugins/media-player-keys/libmedia_player_keys.so
lib/totem/plugins/media-player-keys/media-player-keys.plugin
-lib/totem/plugins/ontop/libontop.a
lib/totem/plugins/ontop/libontop.so
lib/totem/plugins/ontop/ontop.plugin
lib/totem/plugins/opensubtitles/hash.py
-lib/totem/plugins/opensubtitles/hash.pyc
-lib/totem/plugins/opensubtitles/hash.pyo
lib/totem/plugins/opensubtitles/opensubtitles.plugin
lib/totem/plugins/opensubtitles/opensubtitles.py
-lib/totem/plugins/opensubtitles/opensubtitles.pyc
-lib/totem/plugins/opensubtitles/opensubtitles.pyo
lib/totem/plugins/opensubtitles/opensubtitles.ui
-lib/totem/plugins/properties/libmovie-properties.a
lib/totem/plugins/properties/libmovie-properties.so
lib/totem/plugins/properties/movie-properties.plugin
-lib/totem/plugins/recent/librecent.a
+lib/totem/plugins/pythonconsole/console.py
+lib/totem/plugins/pythonconsole/pythonconsole.plugin
+lib/totem/plugins/pythonconsole/pythonconsole.py
lib/totem/plugins/recent/librecent.so
lib/totem/plugins/recent/recent.plugin
-lib/totem/plugins/save-file/libsave-file.a
+%%VALA%%lib/totem/plugins/rotation/librotation.so
+%%VALA%%lib/totem/plugins/rotation/rotation.plugin
lib/totem/plugins/save-file/libsave-file.so
lib/totem/plugins/save-file/save-file.plugin
-lib/totem/plugins/screensaver/libscreensaver.a
lib/totem/plugins/screensaver/libscreensaver.so
lib/totem/plugins/screensaver/screensaver.plugin
lib/totem/plugins/screenshot/gallery.ui
-lib/totem/plugins/screenshot/libscreenshot.a
lib/totem/plugins/screenshot/libscreenshot.so
lib/totem/plugins/screenshot/screenshot.plugin
-lib/totem/plugins/skipto/libskipto.a
lib/totem/plugins/skipto/libskipto.so
lib/totem/plugins/skipto/skipto.plugin
lib/totem/plugins/skipto/skipto.ui
-lib/totem/plugins/vimeo/libvimeo.a
+lib/totem/plugins/variable-rate/libvariable-rate.so
+lib/totem/plugins/variable-rate/variable-rate.plugin
lib/totem/plugins/vimeo/libvimeo.so
lib/totem/plugins/vimeo/vimeo.plugin
+%%VALA%%lib/totem/plugins/zeitgeist-dp/libtotem-zeitgeist-dp-plugin.so
+%%VALA%%lib/totem/plugins/zeitgeist-dp/zeitgeist-dp.plugin
libdata/pkgconfig/totem.pc
+libexec/totem-gallery-thumbnailer
man/man1/totem-video-thumbnailer.1.gz
man/man1/totem.1.gz
share/GConf/gsettings/opensubtitles.convert
+share/GConf/gsettings/pythonconsole.convert
share/GConf/gsettings/totem.convert
-share/appdata/org.gnome.Totem.appdata.xml
share/applications/org.gnome.Totem.desktop
share/dbus-1/services/org.gnome.Totem.service
share/gir-1.0/Totem-1.0.gir
-share/gtk-doc/html/totem/BaconVideoWidget.html
-share/gtk-doc/html/totem/TotemObject.html
-share/gtk-doc/html/totem/annotation-glossary.html
-share/gtk-doc/html/totem/api-index-deprecated.html
-share/gtk-doc/html/totem/api-index-full.html
-share/gtk-doc/html/totem/core-api.html
-share/gtk-doc/html/totem/home.png
-share/gtk-doc/html/totem/index.html
-share/gtk-doc/html/totem/index.sgml
-share/gtk-doc/html/totem/ix02.html
-share/gtk-doc/html/totem/ix03.html
-share/gtk-doc/html/totem/ix04.html
-share/gtk-doc/html/totem/ix05.html
-share/gtk-doc/html/totem/left-insensitive.png
-share/gtk-doc/html/totem/left.png
-share/gtk-doc/html/totem/right-insensitive.png
-share/gtk-doc/html/totem/right.png
-share/gtk-doc/html/totem/style.css
-share/gtk-doc/html/totem/totem-Interface.html
-share/gtk-doc/html/totem/totem-TotemPlugin.html
-share/gtk-doc/html/totem/totem-plugins.html
-share/gtk-doc/html/totem/totem.devhelp2
-share/gtk-doc/html/totem/tutorials.html
-share/gtk-doc/html/totem/up-insensitive.png
-share/gtk-doc/html/totem/up.png
share/help/C/totem/figures/totem_next_button.png
share/help/C/totem/figures/totem_pause_button.png
share/help/C/totem/figures/totem_play_button.png
@@ -236,6 +194,16 @@ share/help/gl/totem/figures/totem_volume_maximum_button.png
share/help/gl/totem/figures/totem_volume_mute_button.png
share/help/gl/totem/index.docbook
share/help/gl/totem/legal.xml
+share/help/hr/totem/figures/totem_next_button.png
+share/help/hr/totem/figures/totem_pause_button.png
+share/help/hr/totem/figures/totem_play_button.png
+share/help/hr/totem/figures/totem_previous_button.png
+share/help/hr/totem/figures/totem_show_playlist_button.png
+share/help/hr/totem/figures/totem_start_window.png
+share/help/hr/totem/figures/totem_volume_maximum_button.png
+share/help/hr/totem/figures/totem_volume_mute_button.png
+share/help/hr/totem/index.docbook
+share/help/hr/totem/legal.xml
share/help/id/totem/figures/totem_next_button.png
share/help/id/totem/figures/totem_pause_button.png
share/help/id/totem/figures/totem_play_button.png
@@ -266,6 +234,16 @@ share/help/ja/totem/figures/totem_volume_maximum_button.png
share/help/ja/totem/figures/totem_volume_mute_button.png
share/help/ja/totem/index.docbook
share/help/ja/totem/legal.xml
+share/help/nb/totem/figures/totem_next_button.png
+share/help/nb/totem/figures/totem_pause_button.png
+share/help/nb/totem/figures/totem_play_button.png
+share/help/nb/totem/figures/totem_previous_button.png
+share/help/nb/totem/figures/totem_show_playlist_button.png
+share/help/nb/totem/figures/totem_start_window.png
+share/help/nb/totem/figures/totem_volume_maximum_button.png
+share/help/nb/totem/figures/totem_volume_mute_button.png
+share/help/nb/totem/index.docbook
+share/help/nb/totem/legal.xml
share/help/oc/totem/figures/totem_next_button.png
share/help/oc/totem/figures/totem_pause_button.png
share/help/oc/totem/figures/totem_play_button.png
@@ -396,13 +374,13 @@ share/help/zh_TW/totem/figures/totem_volume_maximum_button.png
share/help/zh_TW/totem/figures/totem_volume_mute_button.png
share/help/zh_TW/totem/index.docbook
share/help/zh_TW/totem/legal.xml
-share/icons/hicolor/16x16/apps/totem.png
-share/icons/hicolor/22x22/apps/totem.png
-share/icons/hicolor/24x24/apps/totem.png
-share/icons/hicolor/256x256/apps/totem.png
-share/icons/hicolor/32x32/apps/totem.png
-share/icons/hicolor/48x48/apps/totem.png
-share/icons/hicolor/scalable/apps/totem-symbolic.svg
+share/icons/hicolor/16x16/apps/org.gnome.Totem.png
+share/icons/hicolor/22x22/apps/org.gnome.Totem.png
+share/icons/hicolor/24x24/apps/org.gnome.Totem.png
+share/icons/hicolor/256x256/apps/org.gnome.Totem.png
+share/icons/hicolor/32x32/apps/org.gnome.Totem.png
+share/icons/hicolor/48x48/apps/org.gnome.Totem.png
+share/icons/hicolor/symbolic/apps/org.gnome.Totem-symbolic.svg
share/locale/af/LC_MESSAGES/totem.mo
share/locale/am/LC_MESSAGES/totem.mo
share/locale/ar/LC_MESSAGES/totem.mo
@@ -435,6 +413,7 @@ share/locale/eu/LC_MESSAGES/totem.mo
share/locale/fa/LC_MESSAGES/totem.mo
share/locale/fi/LC_MESSAGES/totem.mo
share/locale/fr/LC_MESSAGES/totem.mo
+share/locale/fur/LC_MESSAGES/totem.mo
share/locale/ga/LC_MESSAGES/totem.mo
share/locale/gd/LC_MESSAGES/totem.mo
share/locale/gl/LC_MESSAGES/totem.mo
@@ -498,10 +477,12 @@ share/locale/zh_CN/LC_MESSAGES/totem.mo
share/locale/zh_HK/LC_MESSAGES/totem.mo
share/locale/zh_TW/LC_MESSAGES/totem.mo
share/locale/zu/LC_MESSAGES/totem.mo
+share/metainfo/org.gnome.Totem.appdata.xml
share/thumbnailers/totem.thumbnailer
%%DATADIR%%/controls.ui
%%DATADIR%%/playlist.ui
%%DATADIR%%/preferences.ui
%%DATADIR%%/properties.ui
+%%DATADIR%%/shortcuts.ui
%%DATADIR%%/totem.ui
%%DATADIR%%/uri.ui
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index c747e8a5c40b..f938b0afa625 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libpng.so:graphics/png \
USES= desktop-file-utils gmake iconv jpeg pkgconfig readline \
shared-mime-info tar:xz
-USE_XORG= x11 xext xinerama xscrnsaver xtst xv xxf86vm
+USE_XORG= x11 xext xinerama xscrnsaver xt xtst xv xxf86vm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-vdr-keys \
--disable-nvtvsimple \
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index 71e3bb731ec5..2340421725ae 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -3,23 +3,32 @@
PORTNAME= folks
PORTVERSION= 0.11.4
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= library to aggregates people from multiple sources
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= vapigen:lang/vala \
${LOCALBASE}/bin/egrep:textproc/gnugrep
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgcr-3.so:security/gcr \
libzeitgeist-2.0.so:sysutils/zeitgeist \
- libtelepathy-glib.so:net-im/telepathy-glib
-
-CONFLICTS= folks-0.4.[0-9]*
+ libtelepathy-glib.so:net-im/telepathy-glib \
+ libnspr4.so:devel/nspr \
+ libssl3.so:security/nss \
+ libsecret-1.so:security/libsecret \
+ libsoup-2.4.so:devel/libsoup \
+ libdbus-glib-1.so:devel/dbus-glib \
+ libdbus-1.so:devel/dbus
USE_LDCONFIG= yes
-USES= gettext gmake libtool localbase pathfix pkgconfig tar:xz
+USES= gettext gmake libtool localbase pathfix pkgconfig \
+ readline sqlite tar:xz
USE_GNOME= evolutiondataserver3 intlhack introspection:build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-bluez-backend
@@ -35,13 +44,17 @@ OPTIONS_DEFINE= SOCIALWEB TRACKER
OPTIONS_DEFAULT=SOCIALWEB TRACKER
SOCIALWEB_DESC= Social web backend
TRACKER_DESC= Tracker backend
+
SOCIALWEB_CONFIGURE_ENABLE= libsocialweb-backend
SOCIALWEB_LIB_DEPENDS= libsocialweb.so:www/libsocialweb
+
TRACKER_CONFIGURE_ENABLE= tracker-backend
-TRACKER_LIB_DEPENDS= libtracker-control-1.0.so:sysutils/tracker
+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/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index 627dacac93e5..58265dfc8f37 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -3,8 +3,7 @@
# $MCom: ports/trunk/net-im/telepathy-logger/Makefile 19955 2014-10-15 10:15:00Z gusi $
PORTNAME= telepathy-logger
-PORTVERSION= 0.8.1
-PORTREVISION= 1
+PORTVERSION= 0.8.2
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
diff --git a/net-im/telepathy-logger/distinfo b/net-im/telepathy-logger/distinfo
index c076cb1a2809..0468dbe0eebc 100644
--- a/net-im/telepathy-logger/distinfo
+++ b/net-im/telepathy-logger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (telepathy-logger-0.8.1.tar.bz2) = 359528f5fa1539b250fead8d68c7a0eaef11ed4284dfb3761fff2b6dd688da39
-SIZE (telepathy-logger-0.8.1.tar.bz2) = 569680
+TIMESTAMP = 1538308544
+SHA256 (telepathy-logger-0.8.2.tar.bz2) = 8fcad534d653b1b365132c5b158adae947810ffbae9843f72dd1797966415dae
+SIZE (telepathy-logger-0.8.2.tar.bz2) = 562670
diff --git a/net-im/telepathy-logger/pkg-plist b/net-im/telepathy-logger/pkg-plist
index c561fc851b23..60bd37f9d35d 100644
--- a/net-im/telepathy-logger/pkg-plist
+++ b/net-im/telepathy-logger/pkg-plist
@@ -25,9 +25,12 @@ share/gtk-doc/html/telepathy-logger/ch-public.html
share/gtk-doc/html/telepathy-logger/home.png
share/gtk-doc/html/telepathy-logger/index.html
share/gtk-doc/html/telepathy-logger/index.sgml
+share/gtk-doc/html/telepathy-logger/left-insensitive.png
share/gtk-doc/html/telepathy-logger/left.png
+share/gtk-doc/html/telepathy-logger/right-insensitive.png
share/gtk-doc/html/telepathy-logger/right.png
share/gtk-doc/html/telepathy-logger/style.css
share/gtk-doc/html/telepathy-logger/telepathy-logger.devhelp2
+share/gtk-doc/html/telepathy-logger/up-insensitive.png
share/gtk-doc/html/telepathy-logger/up.png
share/telepathy/clients/Logger.client
diff --git a/net/Makefile b/net/Makefile
index 5662edb3a2d7..625f39d01321 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -210,8 +210,6 @@
SUBDIR += grdesktop
SUBDIR += grilo
SUBDIR += grilo-plugins
- SUBDIR += grilo-plugins2
- SUBDIR += grilo2
SUBDIR += grive2
SUBDIR += grpcurl
SUBDIR += grsync
@@ -376,6 +374,7 @@
SUBDIR += libfixbuf
SUBDIR += libgnetwork
SUBDIR += libgravatar
+ SUBDIR += libgrss
SUBDIR += libgweather
SUBDIR += libilbc
SUBDIR += libkfbapi
diff --git a/net/geoclue/Makefile b/net/geoclue/Makefile
index dd5e6e086bc8..e6857a2d9dd4 100644
--- a/net/geoclue/Makefile
+++ b/net/geoclue/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= geoclue
-PORTVERSION= 2.4.3
+PORTVERSION= 2.4.7
CATEGORIES= net devel gnome
MASTER_SITES= http://www.freedesktop.org/software/geoclue/releases/${PORTVERSION:R}/
diff --git a/net/geoclue/distinfo b/net/geoclue/distinfo
index 9f736f86069b..99fcbae34dd7 100644
--- a/net/geoclue/distinfo
+++ b/net/geoclue/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494534086
-SHA256 (geoclue-2.4.3.tar.xz) = ada9dba870dd79e1b21923aeda4d82b66cbda39e57978fbe3d83d356cc3c605e
-SIZE (geoclue-2.4.3.tar.xz) = 389260
+TIMESTAMP = 1497348876
+SHA256 (geoclue-2.4.7.tar.xz) = d17b96bb5799a84723385ea5704235565e9c3dedd2b7afac475a06e550ae0ea6
+SIZE (geoclue-2.4.7.tar.xz) = 368472
diff --git a/net/geocode-glib/Makefile b/net/geocode-glib/Makefile
index e62809b8b811..069bb62240ea 100644
--- a/net/geocode-glib/Makefile
+++ b/net/geocode-glib/Makefile
@@ -2,25 +2,23 @@
# $FreeBSD$
PORTNAME= geocode-glib
-PORTVERSION= 3.18.2
+PORTVERSION= 3.26.0
CATEGORIES= net devel gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Convenience library for the geocoding and reverse geocoding
+BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc
LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libsoup-2.4.so:devel/libsoup
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME= intlhack
+USES= gettext gnome localbase meson pkgconfig tar:xz
+USE_GNOME= glib20 introspection:build
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV= XDG_CACHE_HOME=${WRKDIR}
-INSTALL_TARGET= install-strip
+MESON_ARGS= -Denable-installed-tests=false
+#MAKE_ENV= XDG_CACHE_HOME=${WRKDIR}
.include <bsd.port.mk>
diff --git a/net/geocode-glib/distinfo b/net/geocode-glib/distinfo
index 1b76a4b1a574..b98cb7ec397c 100644
--- a/net/geocode-glib/distinfo
+++ b/net/geocode-glib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (geocode-glib-3.18.2.tar.xz) = 95b11ef2697ac5dbb2f397e7117e08e157b2168624c71507656928095012494e
-SIZE (geocode-glib-3.18.2.tar.xz) = 369516
+TIMESTAMP = 1528201446
+SHA256 (geocode-glib-3.26.0.tar.xz) = ea4086b127050250c158beff28dbcdf81a797b3938bb79bbaaecc75e746fbeee
+SIZE (geocode-glib-3.26.0.tar.xz) = 75984
diff --git a/net/geocode-glib/pkg-descr b/net/geocode-glib/pkg-descr
index 273d5a72c452..4d4a1942295a 100644
--- a/net/geocode-glib/pkg-descr
+++ b/net/geocode-glib/pkg-descr
@@ -4,4 +4,4 @@ coordinates). It uses Nominatim service to achieve that. It also caches
(reverse-)geocoding requests for faster results and to avoid unnecessary server
load.
-WWW: https://github.com/GNOME/geocode-glib
+WWW: https://git.gnome.org/browse/geocode-glib
diff --git a/net/geocode-glib/pkg-plist b/net/geocode-glib/pkg-plist
index e563b335a41e..24944a34fd5f 100644
--- a/net/geocode-glib/pkg-plist
+++ b/net/geocode-glib/pkg-plist
@@ -1,9 +1,12 @@
+include/geocode-glib-1.0/geocode-glib/geocode-backend.h
include/geocode-glib-1.0/geocode-glib/geocode-bounding-box.h
include/geocode-glib-1.0/geocode-glib/geocode-enum-types.h
include/geocode-glib-1.0/geocode-glib/geocode-error.h
include/geocode-glib-1.0/geocode-glib/geocode-forward.h
include/geocode-glib-1.0/geocode-glib/geocode-glib.h
include/geocode-glib-1.0/geocode-glib/geocode-location.h
+include/geocode-glib-1.0/geocode-glib/geocode-mock-backend.h
+include/geocode-glib-1.0/geocode-glib/geocode-nominatim.h
include/geocode-glib-1.0/geocode-glib/geocode-place.h
include/geocode-glib-1.0/geocode-glib/geocode-reverse.h
lib/girepository-1.0/GeocodeGlib-1.0.typelib
@@ -12,31 +15,34 @@ lib/libgeocode-glib.so.0
lib/libgeocode-glib.so.0.0.0
libdata/pkgconfig/geocode-glib-1.0.pc
share/gir-1.0/GeocodeGlib-1.0.gir
-share/gtk-doc/html/geocode-glib-1.0/GeocodeBoundingBox.html
-share/gtk-doc/html/geocode-glib-1.0/GeocodeForward.html
-share/gtk-doc/html/geocode-glib-1.0/GeocodeLocation.html
-share/gtk-doc/html/geocode-glib-1.0/GeocodePlace.html
-share/gtk-doc/html/geocode-glib-1.0/GeocodeReverse.html
-share/gtk-doc/html/geocode-glib-1.0/annotation-glossary.html
-share/gtk-doc/html/geocode-glib-1.0/api-index-full.html
-share/gtk-doc/html/geocode-glib-1.0/ch01.html
-share/gtk-doc/html/geocode-glib-1.0/geocode-glib-1.0.devhelp2
-share/gtk-doc/html/geocode-glib-1.0/geocode-glib-geocode-enum-types.html
-share/gtk-doc/html/geocode-glib-1.0/geocode-glib-geocode-error.html
-share/gtk-doc/html/geocode-glib-1.0/home.png
-share/gtk-doc/html/geocode-glib-1.0/index.html
-share/gtk-doc/html/geocode-glib-1.0/left-insensitive.png
-share/gtk-doc/html/geocode-glib-1.0/left.png
-share/gtk-doc/html/geocode-glib-1.0/right-insensitive.png
-share/gtk-doc/html/geocode-glib-1.0/right.png
-share/gtk-doc/html/geocode-glib-1.0/style.css
-share/gtk-doc/html/geocode-glib-1.0/up-insensitive.png
-share/gtk-doc/html/geocode-glib-1.0/up.png
+share/gtk-doc/html/geocode-glib/GeocodeBackend.html
+share/gtk-doc/html/geocode-glib/GeocodeBoundingBox.html
+share/gtk-doc/html/geocode-glib/GeocodeForward.html
+share/gtk-doc/html/geocode-glib/GeocodeLocation.html
+share/gtk-doc/html/geocode-glib/GeocodeNominatim.html
+share/gtk-doc/html/geocode-glib/GeocodePlace.html
+share/gtk-doc/html/geocode-glib/GeocodeReverse.html
+share/gtk-doc/html/geocode-glib/annotation-glossary.html
+share/gtk-doc/html/geocode-glib/api-index-full.html
+share/gtk-doc/html/geocode-glib/ch01.html
+share/gtk-doc/html/geocode-glib/geocode-glib-geocode-error.html
+share/gtk-doc/html/geocode-glib/geocode-glib-geocode-mock-backend.html
+share/gtk-doc/html/geocode-glib/geocode-glib.devhelp2
+share/gtk-doc/html/geocode-glib/home.png
+share/gtk-doc/html/geocode-glib/index.html
+share/gtk-doc/html/geocode-glib/left-insensitive.png
+share/gtk-doc/html/geocode-glib/left.png
+share/gtk-doc/html/geocode-glib/right-insensitive.png
+share/gtk-doc/html/geocode-glib/right.png
+share/gtk-doc/html/geocode-glib/style.css
+share/gtk-doc/html/geocode-glib/up-insensitive.png
+share/gtk-doc/html/geocode-glib/up.png
share/icons/gnome/scalable/places/poi-airport.svg
share/icons/gnome/scalable/places/poi-bar.svg
share/icons/gnome/scalable/places/poi-building.svg
share/icons/gnome/scalable/places/poi-bus-stop.svg
share/icons/gnome/scalable/places/poi-car.svg
+share/icons/gnome/scalable/places/poi-light-rail-station.svg
share/icons/gnome/scalable/places/poi-marker.svg
share/icons/gnome/scalable/places/poi-place-of-worship.svg
share/icons/gnome/scalable/places/poi-railway-station.svg
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index c200c0306132..1b15921a78e6 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -2,19 +2,20 @@
# $FreeBSD$
PORTNAME= glib-networking
-PORTVERSION= 2.50.0
-PORTREVISION= 1
+PORTVERSION= 2.56.1
CATEGORIES= net
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Network-related giomodules for glib
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
BUILD_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
LIB_DEPENDS= libgnutls.so:security/gnutls \
- libgcrypt.so:security/libgcrypt \
libp11-kit.so:security/p11-kit \
libdbus-1.so:devel/dbus \
libproxy.so:net/libproxy
@@ -23,16 +24,15 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
-USE_GNOME= glib20 intltool
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
-INSTALL_TARGET= install-strip
+USES= gettext gnome localbase meson pkgconfig \
+ python:3.6+,build tar:xz
+USE_GNOME= glib20
+MESON_ARGS= -Dca_certificates_path="${LOCALBASE}/share/certs/ca-root-nss.crt"
-post-patch:
- @${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure
+BINARY_ALIAS= python3=${PYTHON_VERSION}
post-install:
${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
+ ${RM} -r ${STAGEDIR}${PREFIX}/share/installed-tests
.include <bsd.port.mk>
diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo
index eb74b64b538e..199150f32ea1 100644
--- a/net/glib-networking/distinfo
+++ b/net/glib-networking/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491088154
-SHA256 (gnome2/glib-networking-2.50.0.tar.xz) = 3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee
-SIZE (gnome2/glib-networking-2.50.0.tar.xz) = 435380
+TIMESTAMP = 1527916290
+SHA256 (gnome/glib-networking-2.56.1.tar.xz) = df47b0e0a037d2dcf6b1846cbdf68dd4b3cc055e026bb40c4a55f19f29f635c8
+SIZE (gnome/glib-networking-2.56.1.tar.xz) = 164852
diff --git a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
deleted file mode 100644
index 0e8e34509232..000000000000
--- a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- tls/gnutls/gtlsclientconnection-gnutls.c.orig 2015-04-30 17:57:54.000000000 +0200
-+++ tls/gnutls/gtlsclientconnection-gnutls.c 2015-08-06 17:06:17.000000000 +0200
-@@ -322,7 +322,8 @@
-
- g_assert (inout_error != NULL);
-
-- if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
-+ if (inout_error &&
-+ g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
- gnutls->priv->cert_requested)
- {
- g_clear_error (inout_error);
-@@ -339,7 +340,7 @@
- }
-
- resumed = gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (conn));
-- if (*inout_error || !resumed)
-+ if (inout_error && *inout_error || !resumed)
- {
- /* Clear session data since the server did not accept what we provided. */
- gnutls->priv->session_data_override = FALSE;
-@@ -348,7 +349,7 @@
- g_tls_backend_gnutls_remove_session (GNUTLS_CLIENT, gnutls->priv->session_id);
- }
-
-- if (!*inout_error && !resumed)
-+ if (inout_error && !*inout_error && !resumed)
- {
- gnutls_datum_t session_datum;
-
diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist
index 6877e3b40a1f..3059116d4a38 100644
--- a/net/glib-networking/pkg-plist
+++ b/net/glib-networking/pkg-plist
@@ -1,8 +1,5 @@
-lib/gio/modules/libgiognomeproxy.a
lib/gio/modules/libgiognomeproxy.so
-lib/gio/modules/libgiognutls.a
lib/gio/modules/libgiognutls.so
-lib/gio/modules/libgiolibproxy.a
lib/gio/modules/libgiolibproxy.so
libexec/glib-pacrunner
share/dbus-1/services/org.gtk.GLib.PACRunner.service
@@ -34,6 +31,7 @@ share/locale/gl/LC_MESSAGES/glib-networking.mo
share/locale/gu/LC_MESSAGES/glib-networking.mo
share/locale/he/LC_MESSAGES/glib-networking.mo
share/locale/hi/LC_MESSAGES/glib-networking.mo
+share/locale/hr/LC_MESSAGES/glib-networking.mo
share/locale/hu/LC_MESSAGES/glib-networking.mo
share/locale/id/LC_MESSAGES/glib-networking.mo
share/locale/it/LC_MESSAGES/glib-networking.mo
@@ -47,6 +45,7 @@ share/locale/lv/LC_MESSAGES/glib-networking.mo
share/locale/ml/LC_MESSAGES/glib-networking.mo
share/locale/mr/LC_MESSAGES/glib-networking.mo
share/locale/nb/LC_MESSAGES/glib-networking.mo
+share/locale/ne/LC_MESSAGES/glib-networking.mo
share/locale/nl/LC_MESSAGES/glib-networking.mo
share/locale/oc/LC_MESSAGES/glib-networking.mo
share/locale/or/LC_MESSAGES/glib-networking.mo
@@ -72,5 +71,3 @@ share/locale/vi/LC_MESSAGES/glib-networking.mo
share/locale/zh_CN/LC_MESSAGES/glib-networking.mo
share/locale/zh_HK/LC_MESSAGES/glib-networking.mo
share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
-@postexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
-@postunexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index dcfa6cc763a4..bf3a6a245f95 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-online-accounts
-PORTVERSION= 3.24.1
-PORTREVISION= 3
+PORTVERSION= 3.28.0
CATEGORIES= net
MASTER_SITES= GNOME
@@ -13,19 +12,21 @@ COMMENT= Interface provider to access the user's online accounts
LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl
+BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \
+ valac:lang/vala
LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
- libtelepathy-glib.so:net-im/telepathy-glib \
libjson-glib-1.0.so:devel/json-glib \
libsecret-1.so:security/libsecret \
libsoup-2.4.so:devel/libsoup \
- librest-0.7.so:devel/librest
+ librest-0.7.so:devel/librest \
+ libp11-kit.so:security/p11-kit \
+ libgck-1.so:security/gcr
PORTSCOUT= limitw:1,even
USES= compiler:c++11-lib gettext gmake gnome libtool \
localbase pathfix pkgconfig tar:xz
-USE_GNOME= cairo gtk30 intlhack introspection:build libxml2 libxslt:build
+USE_GNOME= cairo gtk30 introspection:build libxml2 libxslt:build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
@@ -34,4 +35,15 @@ CONFIGURE_ARGS= --enable-lastfm
GLIB_SCHEMAS= org.gnome.online-accounts.gschema.xml
+CONFIGURE_ARGS+=--enable-kerberos=no
+
+OPTIONS_SUB= yes
+OPTIONS_DEFINE= TELEPATHY
+
+TELEPATHY_DESC= Telepathy data provider
+TELEPATHY_CONFIGURE_ENABLE= telepathy
+TELEPATHY_LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-glib
+
+# + flickr
+
.include <bsd.port.mk>
diff --git a/net/gnome-online-accounts/distinfo b/net/gnome-online-accounts/distinfo
index aac12edca7b8..86bd4603f5e8 100644
--- a/net/gnome-online-accounts/distinfo
+++ b/net/gnome-online-accounts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496083968
-SHA256 (gnome-online-accounts-3.24.1.tar.xz) = 0a30ab4e4e8015fae707c3b38f05163299743725a36136076fce993c2b8ef651
-SIZE (gnome-online-accounts-3.24.1.tar.xz) = 1404612
+TIMESTAMP = 1525501410
+SHA256 (gnome-online-accounts-3.28.0.tar.xz) = 87bc4ef307604f1ce4f09f6e5c9996ef8d37ca5e0a3bf76f6b27d71844adb40c
+SIZE (gnome-online-accounts-3.28.0.tar.xz) = 1531200
diff --git a/net/gnome-online-accounts/pkg-plist b/net/gnome-online-accounts/pkg-plist
index 690f7d4b7c3f..a1036c7627f7 100644
--- a/net/gnome-online-accounts/pkg-plist
+++ b/net/gnome-online-accounts/pkg-plist
@@ -27,7 +27,7 @@ libexec/goa-daemon
man/man8/goa-daemon.8.gz
share/dbus-1/services/org.gnome.OnlineAccounts.service
share/gir-1.0/Goa-1.0.gir
-%%DATADIR%%/irc-networks.xml
+%%TELEPATHY%%%%DATADIR%%/irc-networks.xml
share/icons/hicolor/16x16/apps/goa-account-facebook.png
share/icons/hicolor/16x16/apps/goa-account-flickr.png
share/icons/hicolor/16x16/apps/goa-account-foursquare.png
@@ -35,28 +35,30 @@ share/icons/hicolor/16x16/apps/goa-account-google.png
share/icons/hicolor/16x16/apps/goa-account-msn.png
share/icons/hicolor/16x16/apps/goa-account-owncloud.png
share/icons/hicolor/16x16/apps/goa-account-pocket.png
+share/icons/hicolor/16x16/apps/goa-account-todoist.png
share/icons/hicolor/16x16/apps/goa-account.png
-share/icons/hicolor/16x16/apps/im-aim.png
-share/icons/hicolor/16x16/apps/im-ekiga.png
-share/icons/hicolor/16x16/apps/im-facebook.png
-share/icons/hicolor/16x16/apps/im-gadugadu.png
-share/icons/hicolor/16x16/apps/im-gizmo.png
-share/icons/hicolor/16x16/apps/im-google-talk.png
-share/icons/hicolor/16x16/apps/im-groupwise.png
-share/icons/hicolor/16x16/apps/im-icq.png
-share/icons/hicolor/16x16/apps/im-irc.png
-share/icons/hicolor/16x16/apps/im-jabber.png
-share/icons/hicolor/16x16/apps/im-local-xmpp.png
-share/icons/hicolor/16x16/apps/im-meanwhile.png
-share/icons/hicolor/16x16/apps/im-msn.png
-share/icons/hicolor/16x16/apps/im-mxit.png
-share/icons/hicolor/16x16/apps/im-myspace.png
-share/icons/hicolor/16x16/apps/im-qq.png
-share/icons/hicolor/16x16/apps/im-sametime.png
-share/icons/hicolor/16x16/apps/im-silc.png
-share/icons/hicolor/16x16/apps/im-sip.png
-share/icons/hicolor/16x16/apps/im-yahoo.png
-share/icons/hicolor/16x16/apps/im-zephyr.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-aim.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-ekiga.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-facebook.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-gadugadu.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-gizmo.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-google-talk.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-groupwise.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-icq.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-irc.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-jabber.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-local-xmpp.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-meanwhile.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-msn.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-mxit.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-myspace.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-qq.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-sametime.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-silc.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-sip.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-skype.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-yahoo.png
+%%TELEPATHY%%share/icons/hicolor/16x16/apps/im-zephyr.png
share/icons/hicolor/22x22/apps/goa-account-facebook.png
share/icons/hicolor/22x22/apps/goa-account-flickr.png
share/icons/hicolor/22x22/apps/goa-account-foursquare.png
@@ -64,28 +66,30 @@ share/icons/hicolor/22x22/apps/goa-account-google.png
share/icons/hicolor/22x22/apps/goa-account-msn.png
share/icons/hicolor/22x22/apps/goa-account-owncloud.png
share/icons/hicolor/22x22/apps/goa-account-pocket.png
+share/icons/hicolor/22x22/apps/goa-account-todoist.png
share/icons/hicolor/22x22/apps/goa-account.png
-share/icons/hicolor/22x22/apps/im-aim.png
-share/icons/hicolor/22x22/apps/im-ekiga.png
-share/icons/hicolor/22x22/apps/im-facebook.png
-share/icons/hicolor/22x22/apps/im-gadugadu.png
-share/icons/hicolor/22x22/apps/im-gizmo.png
-share/icons/hicolor/22x22/apps/im-google-talk.png
-share/icons/hicolor/22x22/apps/im-groupwise.png
-share/icons/hicolor/22x22/apps/im-icq.png
-share/icons/hicolor/22x22/apps/im-irc.png
-share/icons/hicolor/22x22/apps/im-jabber.png
-share/icons/hicolor/22x22/apps/im-local-xmpp.png
-share/icons/hicolor/22x22/apps/im-meanwhile.png
-share/icons/hicolor/22x22/apps/im-msn.png
-share/icons/hicolor/22x22/apps/im-mxit.png
-share/icons/hicolor/22x22/apps/im-myspace.png
-share/icons/hicolor/22x22/apps/im-qq.png
-share/icons/hicolor/22x22/apps/im-sametime.png
-share/icons/hicolor/22x22/apps/im-silc.png
-share/icons/hicolor/22x22/apps/im-sip.png
-share/icons/hicolor/22x22/apps/im-yahoo.png
-share/icons/hicolor/22x22/apps/im-zephyr.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-aim.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-ekiga.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-facebook.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-gadugadu.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-gizmo.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-google-talk.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-groupwise.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-icq.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-irc.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-jabber.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-local-xmpp.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-meanwhile.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-msn.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-mxit.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-myspace.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-qq.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-sametime.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-silc.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-sip.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-skype.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-yahoo.png
+%%TELEPATHY%%share/icons/hicolor/22x22/apps/im-zephyr.png
share/icons/hicolor/24x24/apps/goa-account-facebook.png
share/icons/hicolor/24x24/apps/goa-account-flickr.png
share/icons/hicolor/24x24/apps/goa-account-foursquare.png
@@ -93,27 +97,28 @@ share/icons/hicolor/24x24/apps/goa-account-google.png
share/icons/hicolor/24x24/apps/goa-account-msn.png
share/icons/hicolor/24x24/apps/goa-account-owncloud.png
share/icons/hicolor/24x24/apps/goa-account-pocket.png
+share/icons/hicolor/24x24/apps/goa-account-todoist.png
share/icons/hicolor/24x24/apps/goa-account.png
-share/icons/hicolor/24x24/apps/im-aim.png
-share/icons/hicolor/24x24/apps/im-ekiga.png
-share/icons/hicolor/24x24/apps/im-gadugadu.png
-share/icons/hicolor/24x24/apps/im-gizmo.png
-share/icons/hicolor/24x24/apps/im-google-talk.png
-share/icons/hicolor/24x24/apps/im-groupwise.png
-share/icons/hicolor/24x24/apps/im-icq.png
-share/icons/hicolor/24x24/apps/im-irc.png
-share/icons/hicolor/24x24/apps/im-jabber.png
-share/icons/hicolor/24x24/apps/im-local-xmpp.png
-share/icons/hicolor/24x24/apps/im-meanwhile.png
-share/icons/hicolor/24x24/apps/im-msn.png
-share/icons/hicolor/24x24/apps/im-mxit.png
-share/icons/hicolor/24x24/apps/im-myspace.png
-share/icons/hicolor/24x24/apps/im-qq.png
-share/icons/hicolor/24x24/apps/im-sametime.png
-share/icons/hicolor/24x24/apps/im-silc.png
-share/icons/hicolor/24x24/apps/im-sip.png
-share/icons/hicolor/24x24/apps/im-yahoo.png
-share/icons/hicolor/24x24/apps/im-zephyr.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-aim.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-ekiga.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-gadugadu.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-gizmo.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-google-talk.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-groupwise.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-icq.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-irc.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-jabber.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-local-xmpp.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-meanwhile.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-msn.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-mxit.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-myspace.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-qq.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-sametime.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-silc.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-sip.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-yahoo.png
+%%TELEPATHY%%share/icons/hicolor/24x24/apps/im-zephyr.png
share/icons/hicolor/256x256/apps/goa-account.png
share/icons/hicolor/32x32/apps/goa-account-facebook.png
share/icons/hicolor/32x32/apps/goa-account-flickr.png
@@ -122,27 +127,28 @@ share/icons/hicolor/32x32/apps/goa-account-google.png
share/icons/hicolor/32x32/apps/goa-account-msn.png
share/icons/hicolor/32x32/apps/goa-account-owncloud.png
share/icons/hicolor/32x32/apps/goa-account-pocket.png
+share/icons/hicolor/32x32/apps/goa-account-todoist.png
share/icons/hicolor/32x32/apps/goa-account.png
-share/icons/hicolor/32x32/apps/im-aim.png
-share/icons/hicolor/32x32/apps/im-ekiga.png
-share/icons/hicolor/32x32/apps/im-gadugadu.png
-share/icons/hicolor/32x32/apps/im-gizmo.png
-share/icons/hicolor/32x32/apps/im-google-talk.png
-share/icons/hicolor/32x32/apps/im-groupwise.png
-share/icons/hicolor/32x32/apps/im-icq.png
-share/icons/hicolor/32x32/apps/im-irc.png
-share/icons/hicolor/32x32/apps/im-jabber.png
-share/icons/hicolor/32x32/apps/im-local-xmpp.png
-share/icons/hicolor/32x32/apps/im-meanwhile.png
-share/icons/hicolor/32x32/apps/im-msn.png
-share/icons/hicolor/32x32/apps/im-mxit.png
-share/icons/hicolor/32x32/apps/im-myspace.png
-share/icons/hicolor/32x32/apps/im-qq.png
-share/icons/hicolor/32x32/apps/im-sametime.png
-share/icons/hicolor/32x32/apps/im-silc.png
-share/icons/hicolor/32x32/apps/im-sip.png
-share/icons/hicolor/32x32/apps/im-yahoo.png
-share/icons/hicolor/32x32/apps/im-zephyr.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-aim.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-ekiga.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-gadugadu.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-gizmo.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-google-talk.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-groupwise.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-icq.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-irc.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-jabber.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-local-xmpp.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-meanwhile.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-msn.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-mxit.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-myspace.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-qq.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-sametime.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-silc.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-sip.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-yahoo.png
+%%TELEPATHY%%share/icons/hicolor/32x32/apps/im-zephyr.png
share/icons/hicolor/48x48/apps/goa-account-facebook.png
share/icons/hicolor/48x48/apps/goa-account-flickr.png
share/icons/hicolor/48x48/apps/goa-account-foursquare.png
@@ -150,28 +156,30 @@ share/icons/hicolor/48x48/apps/goa-account-google.png
share/icons/hicolor/48x48/apps/goa-account-msn.png
share/icons/hicolor/48x48/apps/goa-account-owncloud.png
share/icons/hicolor/48x48/apps/goa-account-pocket.png
+share/icons/hicolor/48x48/apps/goa-account-todoist.png
share/icons/hicolor/48x48/apps/goa-account.png
-share/icons/hicolor/48x48/apps/im-aim.png
-share/icons/hicolor/48x48/apps/im-ekiga.png
-share/icons/hicolor/48x48/apps/im-facebook.png
-share/icons/hicolor/48x48/apps/im-gadugadu.png
-share/icons/hicolor/48x48/apps/im-gizmo.png
-share/icons/hicolor/48x48/apps/im-google-talk.png
-share/icons/hicolor/48x48/apps/im-groupwise.png
-share/icons/hicolor/48x48/apps/im-icq.png
-share/icons/hicolor/48x48/apps/im-irc.png
-share/icons/hicolor/48x48/apps/im-jabber.png
-share/icons/hicolor/48x48/apps/im-local-xmpp.png
-share/icons/hicolor/48x48/apps/im-meanwhile.png
-share/icons/hicolor/48x48/apps/im-msn.png
-share/icons/hicolor/48x48/apps/im-mxit.png
-share/icons/hicolor/48x48/apps/im-myspace.png
-share/icons/hicolor/48x48/apps/im-qq.png
-share/icons/hicolor/48x48/apps/im-sametime.png
-share/icons/hicolor/48x48/apps/im-silc.png
-share/icons/hicolor/48x48/apps/im-sip.png
-share/icons/hicolor/48x48/apps/im-yahoo.png
-share/icons/hicolor/48x48/apps/im-zephyr.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-aim.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-ekiga.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-facebook.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-gadugadu.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-gizmo.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-google-talk.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-groupwise.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-icq.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-irc.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-jabber.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-local-xmpp.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-meanwhile.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-msn.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-mxit.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-myspace.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-qq.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-sametime.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-silc.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-sip.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-skype.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-yahoo.png
+%%TELEPATHY%%share/icons/hicolor/48x48/apps/im-zephyr.png
share/icons/hicolor/96x96/apps/goa-account-facebook.png
share/icons/hicolor/96x96/apps/goa-account-flickr.png
share/icons/hicolor/96x96/apps/goa-account-foursquare.png
@@ -179,188 +187,189 @@ share/icons/hicolor/96x96/apps/goa-account-google.png
share/icons/hicolor/96x96/apps/goa-account-msn.png
share/icons/hicolor/96x96/apps/goa-account-owncloud.png
share/icons/hicolor/96x96/apps/goa-account-pocket.png
+share/icons/hicolor/96x96/apps/goa-account-todoist.png
share/icons/hicolor/96x96/apps/goa-account.png
-share/icons/hicolor/scalable/apps/im-aim.svg
-share/icons/hicolor/scalable/apps/im-ekiga.svg
-share/icons/hicolor/scalable/apps/im-gadugadu.svg
-share/icons/hicolor/scalable/apps/im-gizmo.svg
-share/icons/hicolor/scalable/apps/im-google-talk.svg
-share/icons/hicolor/scalable/apps/im-groupwise.svg
-share/icons/hicolor/scalable/apps/im-icq.svg
-share/icons/hicolor/scalable/apps/im-irc.svg
-share/icons/hicolor/scalable/apps/im-jabber.svg
-share/icons/hicolor/scalable/apps/im-local-xmpp.svg
-share/icons/hicolor/scalable/apps/im-meanwhile.svg
-share/icons/hicolor/scalable/apps/im-msn.svg
-share/icons/hicolor/scalable/apps/im-mxit.svg
-share/icons/hicolor/scalable/apps/im-myspace.svg
-share/icons/hicolor/scalable/apps/im-qq.svg
-share/icons/hicolor/scalable/apps/im-sametime.svg
-share/icons/hicolor/scalable/apps/im-silc.svg
-share/icons/hicolor/scalable/apps/im-sip.svg
-share/icons/hicolor/scalable/apps/im-yahoo.svg
-share/icons/hicolor/scalable/apps/im-zephyr.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-aim.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-ekiga.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-gadugadu.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-gizmo.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-google-talk.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-groupwise.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-icq.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-irc.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-jabber.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-local-xmpp.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-meanwhile.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-msn.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-mxit.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-myspace.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-qq.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-sametime.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-silc.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-sip.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-yahoo.svg
+%%TELEPATHY%%share/icons/hicolor/scalable/apps/im-zephyr.svg
share/locale/af/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/an/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/an/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/an/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ar/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ar/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ar/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/as/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/as/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/as/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ast/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ast/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ast/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/az/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/be/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/az/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/be/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/be/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/be@latin/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/bg/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/be@latin/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/bg/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/bg/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/bn/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/bn/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/bn_IN/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/bn_IN/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/br/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/bs/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/br/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/bs/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/bs/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ca/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ca/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ca/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ca@valencia/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/crh/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/cs/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/crh/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/cs/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/cs/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/cy/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/da/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/cy/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/da/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/da/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/de/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/de/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/de/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/dz/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/el/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/dz/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/el/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/el/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/en_CA/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/en_GB/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/en@shaw/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/en_CA/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/en_GB/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/en_GB/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/eo/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/eo/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/eo/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/es/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/es/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/es/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/et/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/et/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/et/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/eu/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/eu/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/eu/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/fa/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/fa/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/fa/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/fi/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/fi/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/fi/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/fr/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/fr/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/fr/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/fur/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/fur/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/fur/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ga/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ga/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ga/LC_MESSAGES/gnome-online-accounts.mo
share/locale/gd/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/gl/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/gl/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/gl/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/gu/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/gu/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/gu/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/he/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/he/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/he/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/hi/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/hi/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/hi/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/hr/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/hr/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/hr/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/hu/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/hu/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/hu/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/id/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/id/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/id/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/is/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/is/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/is/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/it/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/it/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/it/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ja/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ja/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ja/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/kk/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/kk/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/kk/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/km/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/km/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/km/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/kn/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/kn/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/kn/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ko/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ko/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ko/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ku/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/lt/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ku/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/lt/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/lt/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/lv/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/lv/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/lv/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/mai/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/mk/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/mai/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/mk/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/mk/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ml/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ml/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ml/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/mr/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/mr/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/mr/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ms/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ms/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ms/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/my/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/nb/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/my/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/nb/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/nb/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ne/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ne/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ne/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/nl/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/nl/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/nl/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/nn/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/oc/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/nn/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/oc/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/oc/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/or/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/or/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/or/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/pa/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/pa/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/pa/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/pl/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/pl/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/pl/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ps/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/pt/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ps/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/pt/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/pt/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/pt_BR/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/pt_BR/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ro/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ro/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ro/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ru/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ru/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ru/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/si/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/sk/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/si/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/sk/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/sk/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/sl/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/sl/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/sl/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/sq/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/sr/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/sq/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/sr/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/sr/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/sr@latin/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/sr@latin/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/sv/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/sv/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/sv/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ta/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ta/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ta/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/te/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/te/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/te/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/tg/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/tg/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/tg/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/th/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/th/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/th/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/tr/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/tr/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/tr/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/ug/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/ug/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ug/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/uk/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/uk/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/uk/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/vi/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/vi/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/vi/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/xh/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/xh/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/zh_CN/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/zh_CN/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/zh_HK/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/zh_HK/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/zh_TW/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/zh_TW/LC_MESSAGES/gnome-online-accounts.mo
-share/locale/zu/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+%%TELEPATHY%%share/locale/zu/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/vala/vapi/goa-1.0.deps
share/vala/vapi/goa-1.0.vapi
diff --git a/net/gnome-online-miners/Makefile b/net/gnome-online-miners/Makefile
index 8bd5a3de7321..7c91bdd36052 100644
--- a/net/gnome-online-miners/Makefile
+++ b/net/gnome-online-miners/Makefile
@@ -2,27 +2,32 @@
# $FreeBSD$
PORTNAME= gnome-online-miners
-PORTVERSION= 3.14.3
-PORTREVISION= 1
+PORTVERSION= 3.26.0
CATEGORIES= net
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Crawls through your online content
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= libgdata.so:devel/libgdata \
- libtracker-control-1.0.so:sysutils/tracker \
+ libjson-glib-1.0.so:devel/json-glib \
+ librest-0.7.so:devel/librest \
+ libsoup-2.4.so:devel/libsoup \
+ libtracker-control-2.0.so:sysutils/tracker \
+ libgoa-1.0.so:net/gnome-online-accounts \
libgfbgraph-0.2.so:net/gfbgraph \
libzapojit-0.0.so:net/libzapojit \
- libgrilo-0.2.so:net/grilo2
+ libgrilo-0.3.so:net/grilo
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= intlhack introspection:build
+USES= gettext gmake libtool localbase pathfix \
+ pkgconfig tar:xz
+USE_GNOME= libxml2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/net/gnome-online-miners/distinfo b/net/gnome-online-miners/distinfo
index 6928152d4717..e4355389cd5f 100644
--- a/net/gnome-online-miners/distinfo
+++ b/net/gnome-online-miners/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome-online-miners-3.14.3.tar.xz) = 907f0c1d2f4fcb762be9e3992d05bcc39d292d9c1246c2aca2b293b04c59ba7d
-SIZE (gnome-online-miners-3.14.3.tar.xz) = 258488
+TIMESTAMP = 1516259445
+SHA256 (gnome-online-miners-3.26.0.tar.xz) = 7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e
+SIZE (gnome-online-miners-3.26.0.tar.xz) = 272576
diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile
index b2f6ed6100c7..c291ebe019c6 100644
--- a/net/grilo-plugins/Makefile
+++ b/net/grilo-plugins/Makefile
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= grilo-plugins
-PORTVERSION= 0.3.4
+PORTVERSION= 0.3.5
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= GNOME
@@ -27,6 +28,7 @@ LIB_DEPENDS= libgrilo-0.3.so:net/grilo \
USES= gettext gmake gnome libtool pathfix pkgconfig sqlite tar:xz
USE_LDCONFIG= yes
USE_GNOME= glib20 intlhack libxml2
+USE_GSTREAMER1= chromaprint
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-lua-factory
INSTALL_TARGET= install-strip
@@ -37,7 +39,7 @@ OPTIONS_DEFAULT= TRACKER
TRACKER_DESC= Tracker support for grilo (used by gnome-music and possibly others)
TRACKER_CONFIGURE_ENABLE= tracker
-TRACKER_LIB_DEPENDS= libtracker-sparql-1.0.so:sysutils/tracker
+TRACKER_LIB_DEPENDS= libtracker-sparql-2.0.so:sysutils/tracker
DMAP_DESC= DMAP (DAAP, DPAP & DACP) support with libdmapsharing
DMAP_CONFIGURE_ENABLE= dmap
diff --git a/net/grilo-plugins/distinfo b/net/grilo-plugins/distinfo
index 366cf2fd9761..5b03348cbbac 100644
--- a/net/grilo-plugins/distinfo
+++ b/net/grilo-plugins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495265445
-SHA256 (grilo-plugins-0.3.4.tar.xz) = 990282a518968c52f6a67b96c6b708e236a59da1c7c920ed45e6316ab49ddeb5
-SIZE (grilo-plugins-0.3.4.tar.xz) = 1879324
+TIMESTAMP = 1506671539
+SHA256 (grilo-plugins-0.3.5.tar.xz) = 2977827b8ecb3e15535236180e57dc35e85058d111349bdb6a1597e62a5068fb
+SIZE (grilo-plugins-0.3.5.tar.xz) = 1881080
diff --git a/net/grilo-plugins/pkg-plist b/net/grilo-plugins/pkg-plist
index 45e2f366fbf7..2db23512e760 100644
--- a/net/grilo-plugins/pkg-plist
+++ b/net/grilo-plugins/pkg-plist
@@ -1,3 +1,4 @@
+lib/grilo-0.3/libgrlchromaprint.so
%%DMAP%%lib/grilo-0.3/libgrldaap.so
lib/grilo-0.3/libgrldleyna.so
%%DMAP%%lib/grilo-0.3/libgrldpap.so
@@ -10,8 +11,7 @@ lib/grilo-0.3/libgrljamendo.so
lib/grilo-0.3/libgrlmagnatune.so
lib/grilo-0.3/libgrlmetadatastore.so
lib/grilo-0.3/libgrlopensubtitles.so
-lib/grilo-0.3/libgrloptical-media.so
-lib/grilo-0.3/libgrlpodcasts.so
+lib/grilo-0.3/libgrlopticalmedia.so
lib/grilo-0.3/libgrlraitv.so
lib/grilo-0.3/libgrlshoutcast.so
lib/grilo-0.3/libgrltmdb.so
@@ -47,6 +47,7 @@ share/locale/lt/LC_MESSAGES/grilo-plugins.mo
share/locale/lv/LC_MESSAGES/grilo-plugins.mo
share/locale/ml/LC_MESSAGES/grilo-plugins.mo
share/locale/nb/LC_MESSAGES/grilo-plugins.mo
+share/locale/ne/LC_MESSAGES/grilo-plugins.mo
share/locale/oc/LC_MESSAGES/grilo-plugins.mo
share/locale/pl/LC_MESSAGES/grilo-plugins.mo
share/locale/pt/LC_MESSAGES/grilo-plugins.mo
diff --git a/net/grilo-plugins2/Makefile b/net/grilo-plugins2/Makefile
deleted file mode 100644
index 8a7d834a9bc0..000000000000
--- a/net/grilo-plugins2/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
-# $FreeBSD$
-
-PORTNAME= grilo-plugins
-PORTVERSION= 0.2.17
-PORTREVISION= 1
-CATEGORIES= net
-MASTER_SITES= GNOME
-PKGNAMESUFFIX= 2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Plugins for net/grilo
-
-BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libgrilo-0.2.so:net/grilo2 \
- libavahi-gobject.so:net/avahi-app \
- libgdata.so:devel/libgdata
-
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
-USE_LDCONFIG= yes
-USE_GNOME= glib20 intlhack libxml2
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-youtube \
- --disable-nls \
- --enable-vimeo \
- --enable-freebox \
- --enable-tmdb
-CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/grilo-0.2/
-LDFLAGS+= -L${LOCALBASE}/lib
-INSTALL_TARGET= install-strip
-
-OPTIONS_SUB= yes
-OPTIONS_DEFINE= TRACKER DLEYNA DMAP METADATA
-OPTIONS_DEFAULT= TRACKER METADATA
-
-TRACKER_DESC= Tracker support for grilo (used by gnome-music and possibly others)
-TRACKER_CONFIGURE_ENABLE= tracker
-TRACKER_LIB_DEPENDS= libtracker-sparql-1.0.so:sysutils/tracker
-DMAP_DESC= DMAP (DAAP, DPAP & DACP) support with libdmapsharing
-DMAP_CONFIGURE_ENABLE= dmap
-DMAP_LIB_DEPENDS= libdmapsharing-3.0.so:net/libdmapsharing
-DLEYNA_DESC= DLNA support for grilo
-DLEYNA_CONFIGURE_ENABLE= dleyna
-DLEYNA_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
-METADATA_DESC= Enable Local-metadata plugin
-METADATA_CONFIGURE_ENABLE= localmetadata
-METADATA_LIB_DEPENDS= libmediaart-2.0.so:multimedia/libmediaart
-
-post-install:
- @${RM} -rf ${STAGEDIR}${PREFIX}/share/help
-
-.include <bsd.port.mk>
diff --git a/net/grilo-plugins2/distinfo b/net/grilo-plugins2/distinfo
deleted file mode 100644
index c75e638e542c..000000000000
--- a/net/grilo-plugins2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (grilo-plugins-0.2.17.tar.xz) = 337669098cddf64a84fa9398aa1d7f994fea84bc5f7f1b348e1288f135713781
-SIZE (grilo-plugins-0.2.17.tar.xz) = 1036308
diff --git a/net/grilo-plugins2/pkg-descr b/net/grilo-plugins2/pkg-descr
deleted file mode 100644
index 0deeead198c9..000000000000
--- a/net/grilo-plugins2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port installs plugins for the net/grilo.
-
-WWW: https://wiki.gnome.org/Grilo
diff --git a/net/grilo-plugins2/pkg-plist b/net/grilo-plugins2/pkg-plist
deleted file mode 100644
index 486cdd2e2013..000000000000
--- a/net/grilo-plugins2/pkg-plist
+++ /dev/null
@@ -1,40 +0,0 @@
-%%DMAP%%lib/grilo-0.2/grl-daap.xml
-%%DMAP%%lib/grilo-0.2/grl-dpap.xml
-%%DLEYNA%%lib/grilo-0.2/grl-dleyna.xml
-lib/grilo-0.2/grl-filesystem.xml
-lib/grilo-0.2/grl-flickr.xml
-lib/grilo-0.2/grl-freebox.xml
-lib/grilo-0.2/grl-gravatar.xml
-lib/grilo-0.2/grl-jamendo.xml
-%%TRACKER%%lib/grilo-0.2/grl-local-metadata.xml
-lib/grilo-0.2/grl-magnatune.xml
-lib/grilo-0.2/grl-metadata-store.xml
-lib/grilo-0.2/grl-opensubtitles.xml
-lib/grilo-0.2/grl-optical-media.xml
-lib/grilo-0.2/grl-podcasts.xml
-lib/grilo-0.2/grl-raitv.xml
-lib/grilo-0.2/grl-shoutcast.xml
-lib/grilo-0.2/grl-tmdb.xml
-%%TRACKER%%lib/grilo-0.2/grl-tracker.xml
-lib/grilo-0.2/grl-vimeo.xml
-lib/grilo-0.2/grl-youtube.xml
-%%DMAP%%lib/grilo-0.2/libgrldaap.so
-%%DMAP%%lib/grilo-0.2/libgrldpap.so
-%%DLEYNA%%lib/grilo-0.2/libgrldleyna.so
-lib/grilo-0.2/libgrlfilesystem.so
-lib/grilo-0.2/libgrlflickr.so
-lib/grilo-0.2/libgrlfreebox.so
-lib/grilo-0.2/libgrlgravatar.so
-lib/grilo-0.2/libgrljamendo.so
-%%TRACKER%%lib/grilo-0.2/libgrllocalmetadata.so
-lib/grilo-0.2/libgrlmagnatune.so
-lib/grilo-0.2/libgrlmetadatastore.so
-lib/grilo-0.2/libgrlopensubtitles.so
-lib/grilo-0.2/libgrloptical-media.so
-lib/grilo-0.2/libgrlpodcasts.so
-lib/grilo-0.2/libgrlraitv.so
-lib/grilo-0.2/libgrlshoutcast.so
-lib/grilo-0.2/libgrltmdb.so
-%%TRACKER%%lib/grilo-0.2/libgrltracker.so
-lib/grilo-0.2/libgrlvimeo.so
-lib/grilo-0.2/libgrlyoutube.so
diff --git a/net/grilo/Makefile b/net/grilo/Makefile
index dfc1b6de608a..02b5b2fb80eb 100644
--- a/net/grilo/Makefile
+++ b/net/grilo/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= grilo
-PORTVERSION= 0.3.3
+PORTVERSION= 0.3.4
CATEGORIES= net
MASTER_SITES= GNOME
@@ -32,6 +32,6 @@ OPTIONS_DEFINE= UI
UI_DESC= Enable testing UI
UI_CONFIGURE_ENABLE=test-ui
-UI_USE= GNOME=gtk30
+UI_USE= GNOME=cairo,gdkpixbuf2,gtk30
.include <bsd.port.mk>
diff --git a/net/grilo/distinfo b/net/grilo/distinfo
index 74a538118fa0..eb7fe66d06b3 100644
--- a/net/grilo/distinfo
+++ b/net/grilo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495273651
-SHA256 (grilo-0.3.3.tar.xz) = 5c874222c7bdf42490cd56765a593c41407247706bb1f24a1bd5d007aa38a0e3
-SIZE (grilo-0.3.3.tar.xz) = 641440
+TIMESTAMP = 1506671082
+SHA256 (grilo-0.3.4.tar.xz) = 7c6964053b42574c2f14715d2392a02ea5cbace955eb73e067c77aa3e43b066e
+SIZE (grilo-0.3.4.tar.xz) = 644616
diff --git a/net/grilo/pkg-plist b/net/grilo/pkg-plist
index 442f33b7bae3..c6dd78c220b8 100644
--- a/net/grilo/pkg-plist
+++ b/net/grilo/pkg-plist
@@ -29,7 +29,7 @@ lib/girepository-1.0/GrlPls-0.3.typelib
lib/libgrilo-0.3.a
lib/libgrilo-0.3.so
lib/libgrilo-0.3.so.0
-lib/libgrilo-0.3.so.0.1.2
+lib/libgrilo-0.3.so.0.1.3
lib/libgrlnet-0.3.a
lib/libgrlnet-0.3.so
lib/libgrlnet-0.3.so.0
@@ -74,6 +74,7 @@ share/locale/lv/LC_MESSAGES/grilo.mo
share/locale/nl/LC_MESSAGES/grilo.mo
share/locale/ml/LC_MESSAGES/grilo.mo
share/locale/nb/LC_MESSAGES/grilo.mo
+share/locale/ne/LC_MESSAGES/grilo.mo
share/locale/oc/LC_MESSAGES/grilo.mo
share/locale/pa/LC_MESSAGES/grilo.mo
share/locale/pl/LC_MESSAGES/grilo.mo
diff --git a/net/grilo2/Makefile b/net/grilo2/Makefile
deleted file mode 100644
index b0badfe06ccb..000000000000
--- a/net/grilo2/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
-# $FreeBSD$
-
-PORTNAME= grilo
-PORTVERSION= 0.2.15
-PORTREVISION= 1
-CATEGORIES= net
-MASTER_SITES= GNOME
-PKGNAMESUFFIX= 2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Grilo is a framework focused on making media discovery and browsing
-
-BUILD_DEPENDS= vapigen:lang/vala
-LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
- liboauth.so:net/liboauth \
- libtotem-plparser.so:multimedia/totem-pl-parser
-
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
-USE_LDCONFIG= yes
-USE_GNOME= glib20 intlhack introspection:build libxml2
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--enable-vala -disable-debug --disable-nls
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-INSTALL_TARGET= install-strip
-
-# --enable-debug include debug symbols
-CONFIGURE_ARGS+=--enable-tests # build unit tests
-
-OPTIONS_SUB= yes
-OPTIONS_DEFINE= UI
-
-UI_DESC= Enable testing UI
-UI_CONFIGURE_ENABLE=test-ui
-UI_USE= GNOME=gtk30
-
-.include <bsd.port.mk>
diff --git a/net/grilo2/distinfo b/net/grilo2/distinfo
deleted file mode 100644
index 559c417120c2..000000000000
--- a/net/grilo2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (grilo-0.2.15.tar.xz) = 6f5d2583250a68e76d281edaa08adb880d5a78ed46f9ecd22ae4715f1dd66815
-SIZE (grilo-0.2.15.tar.xz) = 627196
diff --git a/net/grilo2/pkg-descr b/net/grilo2/pkg-descr
deleted file mode 100644
index 1f4cc3269eb9..000000000000
--- a/net/grilo2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Grilo is a framework focused on making media discovery and browsing easy for application developers.
-
-WWW: https://wiki.gnome.org/Grilo
diff --git a/net/grilo2/pkg-plist b/net/grilo2/pkg-plist
deleted file mode 100644
index 7770200f66ec..000000000000
--- a/net/grilo2/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-%%UI%%bin/grilo-test-ui-0.2
-bin/grl-inspect-0.2
-bin/grl-launch-0.2
-include/grilo-0.2/grilo.h
-include/grilo-0.2/grl-caps.h
-include/grilo-0.2/grl-config.h
-include/grilo-0.2/grl-data.h
-include/grilo-0.2/grl-definitions.h
-include/grilo-0.2/grl-error.h
-include/grilo-0.2/grl-log.h
-include/grilo-0.2/grl-media-audio.h
-include/grilo-0.2/grl-media-box.h
-include/grilo-0.2/grl-media-image.h
-include/grilo-0.2/grl-media-video.h
-include/grilo-0.2/grl-media.h
-include/grilo-0.2/grl-metadata-key.h
-include/grilo-0.2/grl-multiple.h
-include/grilo-0.2/grl-operation-options.h
-include/grilo-0.2/grl-operation.h
-include/grilo-0.2/grl-plugin.h
-include/grilo-0.2/grl-range-value.h
-include/grilo-0.2/grl-registry.h
-include/grilo-0.2/grl-related-keys.h
-include/grilo-0.2/grl-source.h
-include/grilo-0.2/grl-util.h
-include/grilo-0.2/grl-value-helper.h
-include/grilo-0.2/net/grl-net-wc.h
-include/grilo-0.2/net/grl-net.h
-include/grilo-0.2/pls/grl-pls.h
-lib/girepository-1.0/Grl-0.2.typelib
-lib/girepository-1.0/GrlNet-0.2.typelib
-lib/girepository-1.0/GrlPls-0.2.typelib
-lib/libgrilo-0.2.a
-lib/libgrilo-0.2.so
-lib/libgrilo-0.2.so.1
-lib/libgrilo-0.2.so.1.10.0
-lib/libgrlnet-0.2.a
-lib/libgrlnet-0.2.so
-lib/libgrlnet-0.2.so.0
-lib/libgrlnet-0.2.so.0.1.10
-lib/libgrlpls-0.2.a
-lib/libgrlpls-0.2.so
-lib/libgrlpls-0.2.so.0
-lib/libgrlpls-0.2.so.0.0.5
-libdata/pkgconfig/grilo-0.2.pc
-libdata/pkgconfig/grilo-net-0.2.pc
-libdata/pkgconfig/grilo-pls-0.2.pc
-man/man1/grl-inspect-0.2.1.gz
-man/man1/grl-launch-0.2.1.gz
-%%UI%%man/man1/grilo-test-ui-0.2.1.gz
-share/gir-1.0/Grl-0.2.gir
-share/gir-1.0/GrlNet-0.2.gir
-share/gir-1.0/GrlPls-0.2.gir
-share/vala/vapi/grilo-0.2.deps
-share/vala/vapi/grilo-0.2.vapi
-share/vala/vapi/grilo-net-0.2.deps
-share/vala/vapi/grilo-net-0.2.vapi
diff --git a/net/libdmapsharing/Makefile b/net/libdmapsharing/Makefile
index 09f5795be60a..3b7ca782d11e 100644
--- a/net/libdmapsharing/Makefile
+++ b/net/libdmapsharing/Makefile
@@ -1,10 +1,8 @@
# Created by: Gustau Perez <gustau.perez@gmail.com>
# $FreeBSD$
-# $MCom: ports/trunk/net/libdmapsharing/Makefile 19962 2014-10-15 14:57:24Z gusi $
PORTNAME= libdmapsharing
-PORTVERSION= 2.9.24
-PORTREVISION= 2
+PORTVERSION= 2.9.39
CATEGORIES= net gnome
MASTER_SITES= https://www.flyn.org/projects/libdmapsharing/
DIST_SUBDIR= gnome3
@@ -12,12 +10,15 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME music playing application
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libgee-0.8.so:devel/libgee
-BUILD_DEPENDS= vapigen:lang/vala
-USES= gettext gmake libtool pathfix pkgconfig
-USE_GNOME= gnomeprefix gtk20 introspection:build
+USES= gettext gnome gmake libtool pathfix pkgconfig
+USE_GNOME= cairo gdkpixbuf2 gnomeprefix gtk30 introspection:build
USE_GSTREAMER1= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-introspection \
diff --git a/net/libdmapsharing/distinfo b/net/libdmapsharing/distinfo
index aa029cc45815..9ee05c84927b 100644
--- a/net/libdmapsharing/distinfo
+++ b/net/libdmapsharing/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/libdmapsharing-2.9.24.tar.gz) = 8d323707a4e6baea9000b5886ba8ea717966ef11fd3e464b77e675a9c49fee36
-SIZE (gnome3/libdmapsharing-2.9.24.tar.gz) = 728305
+TIMESTAMP = 1506671823
+SHA256 (gnome3/libdmapsharing-2.9.39.tar.gz) = a90dc0681ae81700e46efc539f70edb6edd936b782a9a695434bea660a43a5ef
+SIZE (gnome3/libdmapsharing-2.9.39.tar.gz) = 757492
diff --git a/net/libdmapsharing/pkg-plist b/net/libdmapsharing/pkg-plist
index bc5133a267e0..26363baafb27 100644
--- a/net/libdmapsharing/pkg-plist
+++ b/net/libdmapsharing/pkg-plist
@@ -24,14 +24,14 @@ include/libdmapsharing-3.0/libdmapsharing/dpap-record.h
include/libdmapsharing-3.0/libdmapsharing/dpap-share.h
lib/libdmapsharing-3.0.so
lib/libdmapsharing-3.0.so.2
-lib/libdmapsharing-3.0.so.2.9.24
+lib/libdmapsharing-3.0.so.2.9.39
libdata/pkgconfig/libdmapsharing-3.0.pc
%%DOCSDIR%%-3.0/api-index-full.html
%%DOCSDIR%%-3.0/ch01.html
%%DOCSDIR%%-3.0/deprecated-api-index.html
%%DOCSDIR%%-3.0/home.png
%%DOCSDIR%%-3.0/index.html
-%%DOCSDIR%%-3.0/index.sgml
+%%DOCSDIR%%-3.0/left-insensitive.png
%%DOCSDIR%%-3.0/left.png
%%DOCSDIR%%-3.0/libdmapsharing-3.0-DAAPRecord.html
%%DOCSDIR%%-3.0/libdmapsharing-3.0-DACPPlayer.html
@@ -56,6 +56,9 @@ libdata/pkgconfig/libdmapsharing-3.0.pc
%%DOCSDIR%%-3.0/libdmapsharing-3.0-dpap-share.html
%%DOCSDIR%%-3.0/libdmapsharing-3.0.devhelp2
%%DOCSDIR%%-3.0/object-tree.html
+%%DOCSDIR%%-3.0/right-insensitive.png
%%DOCSDIR%%-3.0/right.png
%%DOCSDIR%%-3.0/style.css
+%%DOCSDIR%%-3.0/up-insensitive.png
%%DOCSDIR%%-3.0/up.png
+share/vala/vapi/libdmapsharing-3.0.vapi
diff --git a/net/libgrss/Makefile b/net/libgrss/Makefile
new file mode 100644
index 000000000000..25bb9e912241
--- /dev/null
+++ b/net/libgrss/Makefile
@@ -0,0 +1,26 @@
+# Created by: Gustau Perez <gustau.perez@gmail.com>
+# $FreeBSD$
+
+PORTNAME= libgrss
+PORTVERSION= 0.7.0
+CATEGORIES= net gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome3
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Library for easy management of RSS/Atom/Pie feeds
+
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
+ libxml2.so:textproc/libxml2
+
+USES= gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
+USE_GNOME= glib20 intlhack introspection:build
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-gtk-doc
+INSTALL_TARGET= install-strip
+
+.include <bsd.port.mk>
diff --git a/net/libgrss/distinfo b/net/libgrss/distinfo
new file mode 100644
index 000000000000..d3dde2d4cfa5
--- /dev/null
+++ b/net/libgrss/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1538308500
+SHA256 (gnome3/libgrss-0.7.0.tar.xz) = 6709c0f630a915ea7d5f1ac88ac173ef974d8d7406f43bd4be70d3e71fd554d9
+SIZE (gnome3/libgrss-0.7.0.tar.xz) = 362360
diff --git a/net/libgrss/files/patch-src_feeds-subscriber.c b/net/libgrss/files/patch-src_feeds-subscriber.c
new file mode 100644
index 000000000000..863aef85d420
--- /dev/null
+++ b/net/libgrss/files/patch-src_feeds-subscriber.c
@@ -0,0 +1,13 @@
+--- src/feeds-subscriber.c.orig 2015-07-15 20:59:07 UTC
++++ src/feeds-subscriber.c
+@@ -18,6 +18,10 @@
+ * Boston, MA 02110-1301, USA.
+ */
+
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++
+ #include "feeds-subscriber.h"
+ #include "feeds-subscriber-handler.h"
+ #include "feeds-pubsubhubbub-subscriber.h"
diff --git a/net/libgrss/files/patch-src_utils.c b/net/libgrss/files/patch-src_utils.c
new file mode 100644
index 000000000000..b82d7b38aa19
--- /dev/null
+++ b/net/libgrss/files/patch-src_utils.c
@@ -0,0 +1,13 @@
+--- src/utils.c.orig 2015-07-15 20:59:07 UTC
++++ src/utils.c
+@@ -28,6 +28,10 @@
+
+ #include "utils.h"
+
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++
+ typedef struct {
+ gchar *data;
+ gint length;
diff --git a/net/libgrss/pkg-descr b/net/libgrss/pkg-descr
new file mode 100644
index 000000000000..99ea830ef287
--- /dev/null
+++ b/net/libgrss/pkg-descr
@@ -0,0 +1,9 @@
+libgweather is a library to access weather information from online
+services for numerous locations.
+
+libgweather isn't supported in the devel platform, which means OS vendors
+won't guarantee the API/ABI long-term, but authors of open source apps
+should feel free to use libgweather as users can always recompile against
+a new version.
+
+WWW: http://www.gnome.org/
diff --git a/net/libgrss/pkg-plist b/net/libgrss/pkg-plist
new file mode 100644
index 000000000000..90ee2c206fbc
--- /dev/null
+++ b/net/libgrss/pkg-plist
@@ -0,0 +1,69 @@
+include/libgrss/feed-atom-formatter.h
+include/libgrss/feed-channel.h
+include/libgrss/feed-enclosure.h
+include/libgrss/feed-formatter.h
+include/libgrss/feed-item.h
+include/libgrss/feed-parser.h
+include/libgrss/feed-rss-formatter.h
+include/libgrss/feeds-group.h
+include/libgrss/feeds-pool.h
+include/libgrss/feeds-publisher.h
+include/libgrss/feeds-store.h
+include/libgrss/feeds-subscriber.h
+include/libgrss/libgrss.h
+include/libgrss/person.h
+lib/girepository-1.0/Grss-0.7.typelib
+lib/libgrss.so
+lib/libgrss.so.0
+lib/libgrss.so.0.700.0
+libdata/pkgconfig/libgrss.pc
+share/gir-1.0/Grss-0.7.gir
+share/gtk-doc/html/libgrss/FeedAtomHandler.html
+share/gtk-doc/html/libgrss/FeedHandler.html
+share/gtk-doc/html/libgrss/FeedPieHandler.html
+share/gtk-doc/html/libgrss/FeedRssHandler.html
+share/gtk-doc/html/libgrss/FeedsOpmlGroupHandler.html
+share/gtk-doc/html/libgrss/FeedsXbelGroupHandler.html
+share/gtk-doc/html/libgrss/FeedsXoxoGroupHandler.html
+share/gtk-doc/html/libgrss/GrssFeedAtomFormatter.html
+share/gtk-doc/html/libgrss/GrssFeedChannel.html
+share/gtk-doc/html/libgrss/GrssFeedEnclosure.html
+share/gtk-doc/html/libgrss/GrssFeedFormatter.html
+share/gtk-doc/html/libgrss/GrssFeedItem.html
+share/gtk-doc/html/libgrss/GrssFeedParser.html
+share/gtk-doc/html/libgrss/GrssFeedRssFormatter.html
+share/gtk-doc/html/libgrss/GrssFeedsGroup.html
+share/gtk-doc/html/libgrss/GrssFeedsGroupHandler.html
+share/gtk-doc/html/libgrss/GrssFeedsPool.html
+share/gtk-doc/html/libgrss/GrssFeedsPublisher.html
+share/gtk-doc/html/libgrss/GrssFeedsPubsubhubbubSubscriber.html
+share/gtk-doc/html/libgrss/GrssFeedsRsscloudSubscriber.html
+share/gtk-doc/html/libgrss/GrssFeedsStore.html
+share/gtk-doc/html/libgrss/GrssFeedsSubscriber.html
+share/gtk-doc/html/libgrss/GrssFeedsSubscriberHandler.html
+share/gtk-doc/html/libgrss/GrssPerson.html
+share/gtk-doc/html/libgrss/NSHandler.html
+share/gtk-doc/html/libgrss/annotation-glossary.html
+share/gtk-doc/html/libgrss/ch01.html
+share/gtk-doc/html/libgrss/home.png
+share/gtk-doc/html/libgrss/index.html
+share/gtk-doc/html/libgrss/index.sgml
+share/gtk-doc/html/libgrss/ix01.html
+share/gtk-doc/html/libgrss/ix02.html
+share/gtk-doc/html/libgrss/ix03.html
+share/gtk-doc/html/libgrss/left-insensitive.png
+share/gtk-doc/html/libgrss/left.png
+share/gtk-doc/html/libgrss/libgrss-base.html
+share/gtk-doc/html/libgrss/libgrss-essentials.html
+share/gtk-doc/html/libgrss/libgrss-feed-marshal.html
+share/gtk-doc/html/libgrss/libgrss-feeds-subscriber-private.html
+share/gtk-doc/html/libgrss/libgrss-useful.html
+share/gtk-doc/html/libgrss/libgrss-utils.html
+share/gtk-doc/html/libgrss/libgrss.devhelp2
+share/gtk-doc/html/libgrss/libgrss.html
+share/gtk-doc/html/libgrss/license.html
+share/gtk-doc/html/libgrss/right-insensitive.png
+share/gtk-doc/html/libgrss/right.png
+share/gtk-doc/html/libgrss/style.css
+share/gtk-doc/html/libgrss/up-insensitive.png
+share/gtk-doc/html/libgrss/up.png
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 5a5d1cdc9796..5883aff90188 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= libgweather
-PORTVERSION= 3.24.1
+PORTVERSION= 3.28.2
CATEGORIES= net gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library to access online weather information
@@ -19,15 +19,15 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
-USE_GNOME= cairo gtk30 intltool introspection:build libxml2
+USES= gettext gnome localbase meson pkgconfig python:3.6+,build tar:xz
+USE_GNOME= gtk30 introspection:build libxml2
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--disable-glade-catalog
-INSTALL_TARGET= install-strip
+MESON_ARGS= -Dglade_catalog=false
GLIB_SCHEMAS= org.gnome.GWeather.enums.xml \
org.gnome.GWeather.gschema.xml
+BINARY_ALIAS= python3=${PYTHON_VERSION}
+
.include <bsd.port.mk>
diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo
index 3c51aece2ab2..c5ef8580356e 100644
--- a/net/libgweather/distinfo
+++ b/net/libgweather/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496644082
-SHA256 (gnome3/libgweather-3.24.1.tar.xz) = 1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c
-SIZE (gnome3/libgweather-3.24.1.tar.xz) = 3350680
+TIMESTAMP = 1529610418
+SHA256 (gnome/libgweather-3.28.2.tar.xz) = 081ce81653afc614e12641c97a8dd9577c524528c63772407ae2dbcde12bde75
+SIZE (gnome/libgweather-3.28.2.tar.xz) = 2810852
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
index ffe90b4fa695..bdf7ef4900ed 100644
--- a/net/libgweather/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -9,29 +9,10 @@ include/libgweather-3.0/libgweather/gweather-weather.h
include/libgweather-3.0/libgweather/gweather.h
lib/girepository-1.0/GWeather-3.0.typelib
lib/libgweather-3.so
-lib/libgweather-3.so.6
-lib/libgweather-3.so.6.7.0
+lib/libgweather-3.so.15
+lib/libgweather-3.so.15.0.0
libdata/pkgconfig/gweather-3.0.pc
share/gir-1.0/GWeather-3.0.gir
-share/gtk-doc/html/libgweather-3.0/GWeatherInfo.html
-share/gtk-doc/html/libgweather-3.0/GWeatherLocation.html
-share/gtk-doc/html/libgweather-3.0/GWeatherLocationEntry.html
-share/gtk-doc/html/libgweather-3.0/GWeatherTimezoneMenu.html
-share/gtk-doc/html/libgweather-3.0/api-index-full.html
-share/gtk-doc/html/libgweather-3.0/ch01.html
-share/gtk-doc/html/libgweather-3.0/home.png
-share/gtk-doc/html/libgweather-3.0/index.html
-share/gtk-doc/html/libgweather-3.0/left-insensitive.png
-share/gtk-doc/html/libgweather-3.0/left.png
-share/gtk-doc/html/libgweather-3.0/libgweather-3.0.devhelp2
-share/gtk-doc/html/libgweather-3.0/libgweather-Versioning-information.html
-share/gtk-doc/html/libgweather-3.0/libgweather-gweathertimezone.html
-share/gtk-doc/html/libgweather-3.0/object-tree.html
-share/gtk-doc/html/libgweather-3.0/right-insensitive.png
-share/gtk-doc/html/libgweather-3.0/right.png
-share/gtk-doc/html/libgweather-3.0/style.css
-share/gtk-doc/html/libgweather-3.0/up-insensitive.png
-share/gtk-doc/html/libgweather-3.0/up.png
%%DATADIR%%/Locations.xml
%%DATADIR%%/locations.dtd
share/locale/af/LC_MESSAGES/libgweather-3.0.mo
@@ -173,7 +154,6 @@ share/locale/ms/LC_MESSAGES/libgweather-3.0.mo
share/locale/ms/LC_MESSAGES/libgweather-locations.mo
share/locale/nb/LC_MESSAGES/libgweather-3.0.mo
share/locale/nb/LC_MESSAGES/libgweather-locations.mo
-share/locale/nds/LC_MESSAGES/libgweather-3.0.mo
share/locale/nds/LC_MESSAGES/libgweather-locations.mo
share/locale/ne/LC_MESSAGES/libgweather-3.0.mo
share/locale/ne/LC_MESSAGES/libgweather-locations.mo
@@ -235,4 +215,5 @@ share/locale/zh_HK/LC_MESSAGES/libgweather-3.0.mo
share/locale/zh_HK/LC_MESSAGES/libgweather-locations.mo
share/locale/zh_TW/LC_MESSAGES/libgweather-3.0.mo
share/locale/zh_TW/LC_MESSAGES/libgweather-locations.mo
+share/vala/vapi/gweather-3.0.deps
share/vala/vapi/gweather-3.0.vapi
diff --git a/net/samba47/files/patch-source3__wscript b/net/samba47/files/patch-source3__wscript
index 5333b2d39012..ab905dc7b6f7 100644
--- a/net/samba47/files/patch-source3__wscript
+++ b/net/samba47/files/patch-source3__wscript
@@ -1,5 +1,5 @@
---- source3/wscript.orig 2017-07-04 10:05:26 UTC
-+++ source3/wscript
+--- source3/wscript.orig 2018-04-17 09:35:02.000000000 +0200
++++ source3/wscript 2018-07-11 22:55:06.353523000 +0200
@@ -47,6 +47,7 @@ def set_options(opt):
opt.SAMBA3_ADD_OPTION('sendfile-support')
opt.SAMBA3_ADD_OPTION('utmp')
@@ -8,7 +8,7 @@
opt.SAMBA3_ADD_OPTION('iconv')
opt.SAMBA3_ADD_OPTION('acl-support')
opt.SAMBA3_ADD_OPTION('dnsupdate')
-@@ -868,6 +869,17 @@ msg.msg_accrightslen = sizeof(fd);
+@@ -872,6 +873,17 @@ msg.msg_accrightslen = sizeof(fd);
conf.SET_TARGET_TYPE('avahi-common', 'EMPTY')
conf.SET_TARGET_TYPE('avahi-client', 'EMPTY')
@@ -26,13 +26,22 @@
if Options.options.with_iconv:
conf.env.with_iconv = True
if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
-@@ -1748,9 +1760,6 @@ main() {
+@@ -1669,7 +1681,7 @@ main() {
+ if not conf.env['FLEX']:
+ conf.fatal("Spotlight support requested but flex missing")
+ conf.CHECK_COMMAND('%s --version' % conf.env['FLEX'], msg='Using flex version', define=None, on_target=False)
+- versions = ['1.0', '0.16', '0.14']
++ versions = ['2.0', '1.0', '0.16', '0.14']
+ for version in versions:
+ testlib = 'tracker-sparql-' + version
+ if conf.CHECK_CFG(package=testlib,
+@@ -1762,9 +1774,6 @@ main() {
+
if conf.CONFIG_SET('HAVE_VXFS'):
default_shared_modules.extend(TO_LIST('vfs_vxfs'))
-
+-
- if conf.CONFIG_SET('HAVE_DBUS'):
- default_shared_modules.extend(TO_LIST('vfs_snapper'))
--
+
explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
-
diff --git a/net/samba48/files/patch-source3__wscript b/net/samba48/files/patch-source3__wscript
index fb468518e731..f990623d8e00 100644
--- a/net/samba48/files/patch-source3__wscript
+++ b/net/samba48/files/patch-source3__wscript
@@ -1,5 +1,5 @@
---- source3/wscript.orig 2018-03-02 12:18:10 UTC
-+++ source3/wscript
+--- source3/wscript.orig 2018-06-26 16:42:46.000000000 +0200
++++ source3/wscript 2018-08-07 20:55:38.331688000 +0200
@@ -47,6 +47,7 @@ def set_options(opt):
opt.SAMBA3_ADD_OPTION('sendfile-support')
opt.SAMBA3_ADD_OPTION('utmp')
@@ -79,13 +79,22 @@
if Options.options.with_iconv:
conf.env.with_iconv = True
if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
-@@ -1730,9 +1748,6 @@ main() {
+@@ -1637,7 +1655,7 @@ main() {
+ if not conf.env['FLEX']:
+ conf.fatal("Spotlight support requested but flex missing")
+ conf.CHECK_COMMAND('%s --version' % conf.env['FLEX'], msg='Using flex version', define=None, on_target=False)
+- versions = ['1.0', '0.16', '0.14']
++ versions = ['2.0', '1.0', '0.16', '0.14']
+ for version in versions:
+ testlib = 'tracker-sparql-' + version
+ if conf.CHECK_CFG(package=testlib,
+@@ -1729,9 +1747,6 @@ main() {
+
if conf.CONFIG_SET('HAVE_VXFS'):
default_shared_modules.extend(TO_LIST('vfs_vxfs'))
-
+-
- if conf.CONFIG_SET('HAVE_DBUS'):
- default_shared_modules.extend(TO_LIST('vfs_snapper'))
--
+
explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
-
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 4f67b051eaac..0280e6cdb7b9 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= vinagre
-PORTVERSION= 3.18.2
-PORTREVISION= 7
+PORTVERSION= 3.22.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -19,20 +18,25 @@ BUILD_DEPENDS= appstream-glib>=0:devel/appstream-glib \
gnome-autogen.sh:devel/gnome-common \
yelp-tools>=0:textproc/yelp-tools
LIB_DEPENDS= libgtk-vnc-2.0.so:net/gtk-vnc \
+ libfribidi.so:converters/fribidi \
libgdbm.so:databases/gdbm \
- libsecret-1.so:security/libsecret
+ libsecret-1.so:security/libsecret \
+ libdbus-1.so:devel/dbus \
+ libpcre2-8.so:devel/pcre2 \
+ libgnutls.so:security/gnutls \
+ libavahi-common.so:net/avahi-app
RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme
PORTSCOUT= limitw:1,even
-USES= autoreconf desktop-file-utils gettext gmake gnome pathfix \
- pkgconfig shared-mime-info tar:xz
-USE_GNOME= gtk30 intlhack libxml2 vte3
+USES= autoreconf desktop-file-utils gettext gmake gnome localbase \
+ pathfix pkgconfig shared-mime-info tar:xz
+USE_GNOME= cairo gtk30 intlhack libxml2 vte3
+USE_XORG= x11
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --enable-ssh
-CPPFLAGS+= -I${LOCALBASE}/include -Wno-format-nonliteral
-LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -Wno-format-nonliteral
GLIB_SCHEMAS= org.gnome.Vinagre.gschema.xml
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index 1aa5692245de..b2e43f8fd6e7 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/vinagre-3.18.2.tar.xz) = 65b81299de0b75a9433e5654d5314f347895d5efb7acd3b111e5e8c03f48fbc4
-SIZE (gnome3/vinagre-3.18.2.tar.xz) = 819820
+TIMESTAMP = 1477167144
+SHA256 (gnome3/vinagre-3.22.0.tar.xz) = cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82
+SIZE (gnome3/vinagre-3.22.0.tar.xz) = 1574984
diff --git a/net/vinagre/files/patch-configure b/net/vinagre/files/patch-configure
new file mode 100644
index 000000000000..e1a707a1810a
--- /dev/null
+++ b/net/vinagre/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig 2016-12-30 22:32:44.767904000 +0100
++++ configure 2016-12-30 22:33:30.909853000 +0100
+@@ -4747,7 +4747,7 @@
+
+
+ # Whether to enable support for RDP.
+-RDP_DEPS="freerdp x11"
++RDP_DEPS="freerdp2 x11"
+ # Check whether --enable-rdp was given.
+ if test "${enable_rdp+set}" = set; then :
+ enableval=$enable_rdp;
+@@ -4763,8 +4763,8 @@
+ test $ac_status = 0; }; then
+ have_rdp=yes
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp >= 1.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "freerdp >= 1.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freerdp2 >= 1.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "freerdp2 >= 1.1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
diff --git a/net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c b/net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c
index d218be2d9493..3f0f4d72b80b 100644
--- a/net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c
+++ b/net/vinagre/files/patch-plugins_rdp_vinagre-rdp-tab.c
@@ -1,5 +1,7 @@
---- plugins/rdp/vinagre-rdp-tab.c.orig 2015-10-06 15:40:06 UTC
-+++ plugins/rdp/vinagre-rdp-tab.c
+https://bugzilla.gnome.org/show_bug.cgi?id=775616
+
+--- plugins/rdp/vinagre-rdp-tab.c.orig 2016-12-30 22:55:41.353490000 +0100
++++ plugins/rdp/vinagre-rdp-tab.c 2016-12-30 22:55:49.312382000 +0100
@@ -476,16 +476,18 @@ frdp_drawing_area_draw (GtkWidget *area,
return TRUE;
}
@@ -45,15 +47,15 @@
FREERDP_VERSION_MINOR >= 2))
- CLRBUF_24BPP,
+ CLRBUF_24BPP, NULL
- #else
-- CLRBUF_32BPP,
++#else
+#ifdef CLRBUF_32BPP
+ CLRBUF_32BPP, NULL
-+#else
+ #else
+- CLRBUF_32BPP,
+ PIXEL_FORMAT_BGRA32
-+#endif
#endif
- NULL);
++#endif
+ );
gdi = instance->context->gdi;
@@ -108,12 +110,3 @@
{
VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
GtkBuilder *builder;
-@@ -1108,7 +1107,7 @@ open_freerdp (VinagreRdpTab *rdp_tab)
- settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
- #endif
- #include <freerdp/version.h>
--#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1)
-+#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) || (FREERDP_VERSION_MAJOR == 2)
- settings->UseRdpSecurityLayer = FALSE;
- #else
- settings->DisableEncryption = FALSE;
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index febf00f266d1..f13da539e41a 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -1,7 +1,6 @@
bin/vinagre
man/man1/vinagre.1.gz
share/GConf/gsettings/org.gnome.Vinagre.convert
-share/appdata/vinagre.appdata.xml
share/applications/vinagre-file.desktop
share/applications/vinagre.desktop
%%TELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
@@ -205,6 +204,19 @@ share/help/sl/vinagre/legal.xml
share/help/sl/vinagre/scaling.page
share/help/sl/vinagre/take-screenshot.page
share/help/sl/vinagre/view-only.page
+share/help/sv/vinagre/connect-file.page
+share/help/sv/vinagre/connect-reverse.page
+share/help/sv/vinagre/connect.page
+share/help/sv/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/sv/vinagre/figures/vinagre-connected-3-16.png
+share/help/sv/vinagre/fullscreen.page
+share/help/sv/vinagre/index.page
+share/help/sv/vinagre/introduction.page
+share/help/sv/vinagre/keyboard-shortcuts.page
+share/help/sv/vinagre/legal.xml
+share/help/sv/vinagre/scaling.page
+share/help/sv/vinagre/take-screenshot.page
+share/help/sv/vinagre/view-only.page
share/help/zh_CN/vinagre/connect-file.page
share/help/zh_CN/vinagre/connect-reverse.page
share/help/zh_CN/vinagre/connect.page
@@ -258,6 +270,7 @@ share/locale/eu/LC_MESSAGES/vinagre.mo
share/locale/fa/LC_MESSAGES/vinagre.mo
share/locale/fi/LC_MESSAGES/vinagre.mo
share/locale/fr/LC_MESSAGES/vinagre.mo
+share/locale/fur/LC_MESSAGES/vinagre.mo
share/locale/ga/LC_MESSAGES/vinagre.mo
share/locale/gl/LC_MESSAGES/vinagre.mo
share/locale/gu/LC_MESSAGES/vinagre.mo
@@ -309,6 +322,7 @@ share/locale/vi/LC_MESSAGES/vinagre.mo
share/locale/zh_CN/LC_MESSAGES/vinagre.mo
share/locale/zh_HK/LC_MESSAGES/vinagre.mo
share/locale/zh_TW/LC_MESSAGES/vinagre.mo
+share/metainfo/vinagre.appdata.xml
share/mime/packages/vinagre-mime.xml
%%TELEPATHY%%share/telepathy/clients/Vinagre.client
%%DATADIR%%/vinagre-ui.xml
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 81ac0d45c60a..dd5025a02864 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= vino
-PORTVERSION= 3.18.1
-PORTREVISION= 2
+PORTVERSION= 3.22.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,24 +10,33 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= VNC server that allows for remote access to your GNOME desktop
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= libgnutls.so:security/gnutls \
libtelepathy-glib.so:net-im/telepathy-glib \
libdbus-glib-1.so:devel/dbus-glib \
libsecret-1.so:security/libsecret \
+ libgpg-error.so:security/libgpg-error \
+ libgcrypt.so:security/libgcrypt \
+ libdbus-1.so:devel/dbus \
libsoup-2.4.so:devel/libsoup \
libnotify.so:devel/libnotify \
libavahi-glib.so:net/avahi-app
PORTSCOUT= limitw:1,even
-USES= cpe gettext gmake gnome pathfix pkgconfig tar:xz
+USES= cpe gettext gmake gnome jpeg localbase pathfix \
+ pkgconfig tar:xz
CPE_VENDOR= david_king
-USE_GNOME= gtk30 intlhack
-USE_XORG= xdamage xfixes xtst
+USE_GNOME= cairo gtk30 intlhack
+USE_XORG= ice x11 xdamage xext xfixes sm xtst
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include -Wno-format-nonliteral
-LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -Wno-format-nonliteral
GLIB_SCHEMAS= org.gnome.Vino.enums.xml org.gnome.Vino.gschema.xml
+post-install:
+ @${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd/
+
.include <bsd.port.mk>
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 6fc9554ce440..74486ce6a66f 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/vino-3.18.1.tar.xz) = 07ec6e78bbecd4ee3fce873eb26932fdda9c7642bb09d17ac36483b996fafe5a
-SIZE (gnome3/vino-3.18.1.tar.xz) = 766944
+TIMESTAMP = 1476568217
+SHA256 (gnome3/vino-3.22.0.tar.xz) = 2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab
+SIZE (gnome3/vino-3.22.0.tar.xz) = 768716
diff --git a/net/vino/pkg-descr b/net/vino/pkg-descr
index 812e0b21a988..000d0d234d1b 100644
--- a/net/vino/pkg-descr
+++ b/net/vino/pkg-descr
@@ -1,4 +1,4 @@
Vino is a VNC server for GNOME - it allows someone to remotely connect
to your desktop session using the RFB protocol.
-WWW: http://www.gnome.org/
+WWW: https://wiki.gnome.org/Projects/Vino
diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index ae3218ce42a6..3fab3274ed37 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gcr
-PORTVERSION= 3.18.0
+PORTVERSION= 3.28.0
CATEGORIES= security gnome
MASTER_SITES= GNOME
@@ -12,14 +12,14 @@ COMMENT= Library for bits of crypto UI and parsing
BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc \
vapigen:lang/vala
LIB_DEPENDS= libdbus-1.so:devel/dbus \
- libtasn1.so:security/libtasn1 \
+ libgpg-error.so:security/libgpg-error \
libp11-kit.so:security/p11-kit \
libgcrypt.so:security/libgcrypt
CONFLICTS= gnome-keyring-2.[0-9]*
PORTSCOUT= limitw:1,even
-USE_GNOME= gtk30 intlhack introspection:build
+USE_GNOME= cairo gtk30 intlhack introspection:build
USES= desktop-file-utils gettext gmake gnome libtool pathfix \
pkgconfig shared-mime-info tar:xz
GNU_CONFIGURE= yes
diff --git a/security/gcr/distinfo b/security/gcr/distinfo
index 9bb07708f56c..7948168c9120 100644
--- a/security/gcr/distinfo
+++ b/security/gcr/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gcr-3.18.0.tar.xz) = d4d16da5af55148a694055835ccd07ad34daf0ad03bdad929bf7cad15637ce00
-SIZE (gcr-3.18.0.tar.xz) = 1311368
+TIMESTAMP = 1525382004
+SHA256 (gcr-3.28.0.tar.xz) = 15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b
+SIZE (gcr-3.28.0.tar.xz) = 1329044
diff --git a/security/gcr/pkg-plist b/security/gcr/pkg-plist
index cc719343216d..99447d5f026c 100644
--- a/security/gcr/pkg-plist
+++ b/security/gcr/pkg-plist
@@ -29,6 +29,7 @@ include/gcr-3/gcr/gcr-secret-exchange.h
include/gcr-3/gcr/gcr-secure-memory.h
include/gcr-3/gcr/gcr-simple-certificate.h
include/gcr-3/gcr/gcr-simple-collection.h
+include/gcr-3/gcr/gcr-ssh-askpass.h
include/gcr-3/gcr/gcr-system-prompt.h
include/gcr-3/gcr/gcr-system-prompter.h
include/gcr-3/gcr/gcr-trust.h
@@ -78,14 +79,13 @@ libdata/pkgconfig/gcr-3.pc
libdata/pkgconfig/gcr-base-3.pc
libdata/pkgconfig/gcr-ui-3.pc
libexec/gcr-prompter
+libexec/gcr-ssh-askpass
share/GConf/gsettings/org.gnome.crypto.pgp.convert
share/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert
share/applications/gcr-prompter.desktop
share/applications/gcr-viewer.desktop
share/dbus-1/services/org.gnome.keyring.PrivatePrompter.service
share/dbus-1/services/org.gnome.keyring.SystemPrompter.service
-share/gcr-3/ui/gcr-pkcs11-import-dialog.ui
-share/gcr-3/ui/gcr-unlock-options-widget.ui
share/gir-1.0/Gck-1.gir
share/gir-1.0/Gcr-3.gir
share/gir-1.0/GcrUi-3.gir
@@ -106,7 +106,6 @@ share/gtk-doc/html/gck/gck-PKCS11-URIs.html
share/gtk-doc/html/gck/gck.devhelp2
share/gtk-doc/html/gck/home.png
share/gtk-doc/html/gck/index.html
-share/gtk-doc/html/gck/index.sgml
share/gtk-doc/html/gck/left-insensitive.png
share/gtk-doc/html/gck/left.png
share/gtk-doc/html/gck/pkcs11-links.html
@@ -151,6 +150,7 @@ share/gtk-doc/html/gcr-3/gcr-3.devhelp2
share/gtk-doc/html/gcr-3/gcr-GcrCertificateRequest.html
share/gtk-doc/html/gcr-3/gcr-GcrColumn.html
share/gtk-doc/html/gcr-3/gcr-GcrImportInteraction.html
+share/gtk-doc/html/gcr-3/gcr-GcrSshAskpass.html
share/gtk-doc/html/gcr-3/gcr-Key-Fingerprints.html
share/gtk-doc/html/gcr-3/gcr-Library-PKCS#11.html
share/gtk-doc/html/gcr-3/gcr-Library-Utilities.html
@@ -159,7 +159,6 @@ share/gtk-doc/html/gcr-3/gcr-Trust-Storage-and-Lookups.html
share/gtk-doc/html/gcr-3/home.png
share/gtk-doc/html/gcr-3/import-button.png
share/gtk-doc/html/gcr-3/index.html
-share/gtk-doc/html/gcr-3/index.sgml
share/gtk-doc/html/gcr-3/key-widget.png
share/gtk-doc/html/gcr-3/left-insensitive.png
share/gtk-doc/html/gcr-3/left.png
@@ -232,6 +231,7 @@ share/locale/eu/LC_MESSAGES/gcr.mo
share/locale/fa/LC_MESSAGES/gcr.mo
share/locale/fi/LC_MESSAGES/gcr.mo
share/locale/fr/LC_MESSAGES/gcr.mo
+share/locale/fur/LC_MESSAGES/gcr.mo
share/locale/ga/LC_MESSAGES/gcr.mo
share/locale/gl/LC_MESSAGES/gcr.mo
share/locale/gu/LC_MESSAGES/gcr.mo
@@ -278,8 +278,8 @@ share/locale/sr@latin/LC_MESSAGES/gcr.mo
share/locale/sv/LC_MESSAGES/gcr.mo
share/locale/ta/LC_MESSAGES/gcr.mo
share/locale/te/LC_MESSAGES/gcr.mo
-share/locale/th/LC_MESSAGES/gcr.mo
share/locale/tg/LC_MESSAGES/gcr.mo
+share/locale/th/LC_MESSAGES/gcr.mo
share/locale/tr/LC_MESSAGES/gcr.mo
share/locale/ug/LC_MESSAGES/gcr.mo
share/locale/uk/LC_MESSAGES/gcr.mo
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index e0281470e6a2..333e9f168619 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-keyring
-PORTVERSION= 3.18.3
-PORTREVISION= 5
+PORTVERSION= 3.28.2
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -15,6 +14,7 @@ BUILD_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
docbook-xsl>=0:textproc/docbook-xsl \
gcr>=3.5.3:security/gcr
LIB_DEPENDS= libdbus-1.so:devel/dbus \
+ libgpg-error.so:security/libgpg-error \
libgcr-3.so:security/gcr \
libtasn1.so:security/libtasn1 \
libp11-kit.so:security/p11-kit \
@@ -24,16 +24,14 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
PORTSCOUT= limitw:1,even
-USE_GNOME= gtk30 intlhack libxslt:build
-USES= compiler:c11 cpe gettext gmake gnome libtool pathfix \
- pkgconfig tar:xz
+USE_GNOME= cairo gtk30 intlhack libxslt:build
+USES= compiler:c11 cpe gettext gmake gnome libtool localbase \
+ pathfix pkgconfig tar:xz
CPE_VENDOR= gnome
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib"
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.crypto.cache.gschema.xml
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 36b0dffae8b2..2db8975d7511 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-keyring-3.18.3.tar.xz) = 3f670dd61789bdda75b9c9e31e289bf7b1d23ba012433474790081ba7dc0ed98
-SIZE (gnome3/gnome-keyring-3.18.3.tar.xz) = 1205108
+TIMESTAMP = 1525963189
+SHA256 (gnome3/gnome-keyring-3.28.2.tar.xz) = 81171b7d07211b216b4c9bb79bf2deb3deca18fe8d56d46dda1c4549b4a2646a
+SIZE (gnome3/gnome-keyring-3.28.2.tar.xz) = 1322108
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 7fcd0829df77..d1e8dcdd5044 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -45,6 +45,7 @@ share/locale/eu/LC_MESSAGES/gnome-keyring.mo
share/locale/fa/LC_MESSAGES/gnome-keyring.mo
share/locale/fi/LC_MESSAGES/gnome-keyring.mo
share/locale/fr/LC_MESSAGES/gnome-keyring.mo
+share/locale/fur/LC_MESSAGES/gnome-keyring.mo
share/locale/ga/LC_MESSAGES/gnome-keyring.mo
share/locale/gd/LC_MESSAGES/gnome-keyring.mo
share/locale/gl/LC_MESSAGES/gnome-keyring.mo
@@ -103,4 +104,3 @@ share/locale/xh/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
-share/p11-kit/modules/gnome-keyring.module
diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index c7257a78d908..67590bf08378 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libsecret
PORTVERSION= 0.18.6
+POIRTREVISION= 1
CATEGORIES= security gnome
MASTER_SITES= GNOME
@@ -13,7 +14,8 @@ LICENSE= LGPL21
BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \
vala:lang/vala
-LIB_DEPENDS= libgcrypt.so:security/libgcrypt
+LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
+ libgpg-error.so:security/libgpg-error
USES= gettext gmake gnome libtool localbase pkgconfig tar:xz
USE_GNOME= glib20 libxslt:build intltool \
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 176c7430ab1b..2c21d64b287f 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= seahorse
-PORTVERSION= 3.18.0
-PORTREVISION= 1
+PORTVERSION= 3.20.0
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -24,12 +23,11 @@ PORTSCOUT= limitw:1,even
USE_XORG= sm
USE_LDCONFIG= yes
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USES= gettext gmake gnome libtool localbase pathfix \
+ pkgconfig tar:xz
USE_GNOME= intlhack gnomeprefix gtk30
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.seahorse.gschema.xml \
org.gnome.seahorse.manager.gschema.xml \
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index ace27727003d..786dfd93e885 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/seahorse-3.18.0.tar.xz) = 530c889a01c4cad25df4c9ab58ab95d24747875789bc6116bef529d60fc1b667
-SIZE (gnome3/seahorse-3.18.0.tar.xz) = 1555384
+TIMESTAMP = 1538308567
+SHA256 (gnome3/seahorse-3.20.0.tar.xz) = e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df
+SIZE (gnome3/seahorse-3.20.0.tar.xz) = 1556556
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 191b79751e67..0cda9bd999f3 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -393,6 +393,7 @@ share/locale/eu/LC_MESSAGES/seahorse.mo
share/locale/fi/LC_MESSAGES/seahorse.mo
share/locale/fr/LC_MESSAGES/seahorse.mo
share/locale/ga/LC_MESSAGES/seahorse.mo
+share/locale/gd/LC_MESSAGES/seahorse.mo
share/locale/gl/LC_MESSAGES/seahorse.mo
share/locale/gu/LC_MESSAGES/seahorse.mo
share/locale/he/LC_MESSAGES/seahorse.mo
@@ -400,6 +401,7 @@ share/locale/hi/LC_MESSAGES/seahorse.mo
share/locale/hr/LC_MESSAGES/seahorse.mo
share/locale/hu/LC_MESSAGES/seahorse.mo
share/locale/id/LC_MESSAGES/seahorse.mo
+share/locale/is/LC_MESSAGES/seahorse.mo
share/locale/it/LC_MESSAGES/seahorse.mo
share/locale/ja/LC_MESSAGES/seahorse.mo
share/locale/kk/LC_MESSAGES/seahorse.mo
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 4028206c8b90..a1eef3d2d14e 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1302,6 +1302,7 @@
SUBDIR += torque
SUBDIR += toshctl
SUBDIR += tracker
+ SUBDIR += tracker-miners
SUBDIR += tree
SUBDIR += tren
SUBDIR += trueos-libqt5
diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index 3f48d5dc7177..28a760318bf7 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= accountsservice
-PORTVERSION= 0.6.40
+PORTVERSION= 0.6.42
CATEGORIES= sysutils devel
MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/
@@ -23,6 +23,12 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-systemd --localstatedir=/var/
INSTALL_TARGET= install-strip
+# XXX HACK! this file isn't present on the pristine jails of the builders
+# and configure breaks without it. Beter solutions welcome.
+.if defined(PACKAGE_BUILDING)
+CONFIGURE_ENV+= ac_cv_file__var_log_utx_log=yes
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|/etc/gdm/custom.conf|${LOCALBASE}/etc/gdm/custom.conf|g' \
${WRKSRC}/src/daemon.c
diff --git a/sysutils/accountsservice/distinfo b/sysutils/accountsservice/distinfo
index 3eed1db051cb..c933d57be71f 100644
--- a/sysutils/accountsservice/distinfo
+++ b/sysutils/accountsservice/distinfo
@@ -1,2 +1,3 @@
-SHA256 (accountsservice-0.6.40.tar.xz) = f04f756600cbab558671658ab8e77212de2a000c07bc0469e7b51541871fcb2b
-SIZE (accountsservice-0.6.40.tar.xz) = 367772
+TIMESTAMP = 1468052689
+SHA256 (accountsservice-0.6.42.tar.xz) = e56494c2f18627900b57234e5628923cc16a37bf8fd16b06c46118d6ae9c007e
+SIZE (accountsservice-0.6.42.tar.xz) = 380500
diff --git a/sysutils/accountsservice/pkg-plist b/sysutils/accountsservice/pkg-plist
index 7172c7208c1a..cb362dad0f43 100644
--- a/sysutils/accountsservice/pkg-plist
+++ b/sysutils/accountsservice/pkg-plist
@@ -21,7 +21,6 @@ share/gtk-doc/html/libaccountsservice/api-index-full.html
share/gtk-doc/html/libaccountsservice/ch01.html
share/gtk-doc/html/libaccountsservice/home.png
share/gtk-doc/html/libaccountsservice/index.html
-share/gtk-doc/html/libaccountsservice/index.sgml
share/gtk-doc/html/libaccountsservice/left-insensitive.png
share/gtk-doc/html/libaccountsservice/left.png
share/gtk-doc/html/libaccountsservice/libaccountsservice.devhelp2
diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index ab1d3f931fab..07dc45a08083 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS= \
gksu:sysutils/gksu
BUILD_DEPENDS= ${RUN_DEPENDS}
-USES= desktop-file-utils python:2.7 tar:bz2
+USES= desktop-file-utils gettext-tools gnome python:2.7 tar:bz2
+NO_ARCH= yes
USE_PYTHON= distutils
USE_GNOME= gtk30 intltool pygobject3
diff --git a/sysutils/consolekit2/Makefile b/sysutils/consolekit2/Makefile
index 9ae15b4f7b2b..e9895cc1d7fe 100644
--- a/sysutils/consolekit2/Makefile
+++ b/sysutils/consolekit2/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= consolekit
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1
CATEGORIES= sysutils gnome
MASTER_SITES= https://github.com/ConsoleKit2/ConsoleKit2/releases/download/${PORTVERSION}/
PKGNAMESUFFIX= 2
diff --git a/sysutils/consolekit2/distinfo b/sysutils/consolekit2/distinfo
index 684d815a613c..015c84f0835c 100644
--- a/sysutils/consolekit2/distinfo
+++ b/sysutils/consolekit2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501417547
-SHA256 (ConsoleKit2-1.2.0.tar.bz2) = d6ea13b306557a76519388de39bf7f1a1ea9010af147fad4fb3131ce634bd8b3
-SIZE (ConsoleKit2-1.2.0.tar.bz2) = 1125402
+TIMESTAMP = 1516458395
+SHA256 (ConsoleKit2-1.2.1.tar.bz2) = 9af223096ece88b217bcd3fe85093390a8d1527b6492124b0e90ea7688ec934b
+SIZE (ConsoleKit2-1.2.1.tar.bz2) = 1182946
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 1e88db370186..acab83da349b 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-control-center
-PORTVERSION= 3.18.2
-PORTREVISION= 12
+PORTVERSION= 3.28.2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -15,58 +14,57 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
- gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas \
- docbook-xsl>=0:textproc/docbook-xsl \
- iso-codes>=0:misc/iso-codes
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+ gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas #\
+# docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS= libcanberra.so:audio/libcanberra \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+ libcups.so:print/cups \
+ libpulse.so:audio/pulseaudio \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libupower-glib.so:sysutils/upower \
libaccountsservice.so:sysutils/accountsservice \
libcolord.so:graphics/colord \
libcolord-gtk.so:graphics/colord-gtk \
libibus-1.0.so:textproc/ibus \
+ libsoup-2.4.so:devel/libsoup \
libgoa-1.0.so:net/gnome-online-accounts \
- libsocialweb.so:www/libsocialweb \
libpwquality.so:security/libpwquality \
libgtop-2.0.so:devel/libgtop \
- libdbus-glib-1.so:devel/dbus-glib \
- libgrilo-0.2.so:net/grilo2 \
+ libgrilo-0.3.so:net/grilo \
libpolkit-gobject-1.so:sysutils/polkit
-RUN_DEPENDS= gnome-eject:sysutils/gnome-mount \
- gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
+RUN_DEPENDS= gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas \
- iso-codes>=0:misc/iso-codes \
- glxinfo:graphics/mesa-demos \
- apg:security/apg \
+ cantarell-fonts>=0:x11-fonts/cantarell-fonts \
gcm-calibrate:graphics/gnome-color-manager
-CONFLICTS= gnome-media-2.[0-9]*
PORTSCOUT= limitw:1,even
-USES= compiler:c++11-lib gettext gmake gnome localbase:ldflags pathfix pkgconfig tar:xz
-USE_GNOME= gnomedesktop3 intltool libxml2
-USE_XORG= xscrnsaver x11 xxf86misc xorgproto xi
-GNU_CONFIGURE= yes
+USES= compiler:c++11-lib gettext gnome localbase:ldflags meson \
+ pkgconfig python:3.6+,build samba:lib tar:xz
+USE_GNOME= cairo gnomedesktop3 libxml2
+USE_XORG= x11 xi
+#USE_GSTREAMER1= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
+BINARY_ALIAS= python3=${PYTHON_VERSION}
+
+GLIB_SCHEMAS= org.gnome.ControlCenter.gschema.xml
OPTIONS_SUB= yes
-OPTIONS_DEFINE= CUPS
-OPTIONS_DEFAULT=CUPS
-CUPS_DESC= Cups (printing) support
-CHEESE_DESC= Cheese webcam support
+
+OPTIONS_DEFINE= WAYLAND
OPTIONS_DEFINE_i386= CHEESE
OPTIONS_DEFAULT_i386= CHEESE
OPTIONS_DEFINE_amd64= CHEESE
OPTIONS_DEFAULT_amd64= CHEESE
-CUPS_LIB_DEPENDS= libcups.so:print/cups
-CUPS_USES= samba:lib
-CUPS_CONFIGURE_ENABLE= cups
+
+CHEESE_DESC= Cheese webcam support
CHEESE_LIB_DEPENDS= libcheese.so:multimedia/cheese
-CHEESE_CONFIGURE_WITH= cheese
+CHEESE_MESON_TRUE= cheese
-post-patch:
- @${REINPLACE_CMD} -e 's|datetime wacom|datetime|g' \
- ${WRKSRC}/panels/Makefile.in
+WAYLAND_MESON_TRUE= wayland
+WAYLAND_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev
.include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 76d67713faf4..64d6c7827f17 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-control-center-3.18.2.tar.xz) = 36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad
-SIZE (gnome3/gnome-control-center-3.18.2.tar.xz) = 7113676
+TIMESTAMP = 1527916911
+SHA256 (gnome3/gnome-control-center-3.28.2.tar.xz) = ff9e3d7c1693c6004c8a337eb84452d517259b52330081b6b226a8ac5793d734
+SIZE (gnome3/gnome-control-center-3.28.2.tar.xz) = 5857128
diff --git a/sysutils/gnome-control-center/files/patch-panels_datetime_Makefile.in b/sysutils/gnome-control-center/files/patch-panels_datetime_Makefile.in
deleted file mode 100644
index cc0e27ec5bd3..000000000000
--- a/sysutils/gnome-control-center/files/patch-panels_datetime_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- panels/datetime/Makefile.in.orig 2012-06-13 19:23:42.000000000 -0500
-+++ panels/datetime/Makefile.in 2012-06-13 19:24:01.000000000 -0500
-@@ -1149,10 +1149,10 @@
- fi; \
- done
- check-am: all-am
-- $(MAKE) $(AM_MAKEFLAGS) check-local
-+ $(MAKE) $(AM_MAKEFLAGS)
- check: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) all-local
-+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(ccpanelsdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(iconsscalabledir)" "$(DESTDIR)$(tzdatadir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(polkitdir)"; do \
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
new file mode 100644
index 000000000000..738b2a56f29d
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-panels_info_info-overview.ui
@@ -0,0 +1,11 @@
+--- 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_info_info.ui b/sysutils/gnome-control-center/files/patch-panels_info_info.ui
deleted file mode 100644
index f566f32f4c42..000000000000
--- a/sysutils/gnome-control-center/files/patch-panels_info_info.ui
+++ /dev/null
@@ -1,13 +0,0 @@
-Disable check for updates button
-
---- panels/info/info.ui.orig 2015-09-01 11:14:23.676754000 +0200
-+++ panels/info/info.ui 2015-09-01 11:14:39.051974000 +0200
-@@ -551,7 +551,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
new file mode 100644
index 000000000000..484780b78c19
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-panels_keyboard_meson.build
@@ -0,0 +1,11 @@
+--- 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 @@
+ input: pc + '.in',
+ output: pc,
+ install: true,
+- install_dir: join_paths(control_center_datadir, 'pkgconfig'),
++ install_dir: join_paths(control_center_prefix, 'libdata/pkgconfig'),
+ configuration: pc_conf
+ )
+
diff --git a/sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c b/sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c
deleted file mode 100644
index bc3112887c0b..000000000000
--- a/sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c
+++ /dev/null
@@ -1,29 +0,0 @@
-From 66c69759423124f0bd661b28ceaaaab361a1c3e5 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Fri, 20 Nov 2015 18:42:44 +0100
-Subject: region: Silence a CRITICAL
-
-Fall out from abb0592866515ac43ed1ac3c9ecc0b229960011f
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758417
----
- panels/region/cc-region-panel.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
-index 8436b68..6cd5b85 100644
---- panels/region/cc-region-panel.c
-+++ panels/region/cc-region-panel.c
-@@ -166,7 +166,8 @@ cc_region_panel_finalize (GObject *object)
- g_free (priv->system_region);
-
- chooser = g_object_get_data (G_OBJECT (self), "input-chooser");
-- gtk_widget_destroy (chooser);
-+ if (chooser)
-+ gtk_widget_destroy (chooser);
-
- G_OBJECT_CLASS (cc_region_panel_parent_class)->finalize (object);
- }
---
-cgit v0.11.2
-
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
new file mode 100644
index 000000000000..b9d53de1e79e
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-panels_user-accounts_meson.build
@@ -0,0 +1,12 @@
+--- 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 @@
+ )
+
+ # Kerberos support
+-krb_dep = dependency('krb5', required: false)
++#krb_dep = dependency('krb5', required: false)
++krb_dep = cc.find_library('krb5')
+ assert(krb_dep.found(), 'kerberos libraries not found in your path')
+
+ deps = common_deps + [
diff --git a/sysutils/gnome-control-center/files/patch-shell_meson.build b/sysutils/gnome-control-center/files/patch-shell_meson.build
new file mode 100644
index 000000000000..b49f9d60e32b
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-shell_meson.build
@@ -0,0 +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'
+ )
+
+ # 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 0eabc6063d84..a7f6f9299c3c 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -2,22 +2,22 @@ bin/gnome-control-center
libdata/pkgconfig/gnome-keybindings.pc
libexec/cc-remote-login-helper
libexec/gnome-control-center-search-provider
-man/man1/gnome-control-center.1.gz
-share/appdata/gnome-control-center.appdata.xml
share/applications/gnome-background-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-display-panel.desktop
-share/applications/gnome-info-panel.desktop
+share/applications/gnome-info-overview-panel.desktop
share/applications/gnome-keyboard-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
-%%CUPS%%share/applications/gnome-printers-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
@@ -26,6 +26,10 @@ share/applications/gnome-user-accounts-panel.desktop
share/bash-completion/completions/gnome-control-center
share/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
share/dbus-1/services/org.gnome.ControlCenter.service
+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
@@ -45,24 +49,28 @@ share/dbus-1/services/org.gnome.ControlCenter.service
%%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-speaker-center-back-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
+%%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
@@ -72,6 +80,7 @@ share/dbus-1/services/org.gnome.ControlCenter.service
%%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
@@ -86,6 +95,7 @@ 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
@@ -95,6 +105,7 @@ 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
@@ -102,13 +113,15 @@ 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/48x48/devices/audio-headset.svg
+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/preferences-color.svg
share/icons/hicolor/scalable/apps/preferences-desktop-display.svg
@@ -175,6 +188,7 @@ share/locale/fr/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/fr/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/fur/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/gd/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/gl/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/gu/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
@@ -290,29 +304,69 @@ share/locale/zh_HK/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/metainfo/gnome-control-center.appdata.xml
share/pixmaps/faces/astronaut.jpg
share/pixmaps/faces/baseball.png
+share/pixmaps/faces/bicycle.jpg
+share/pixmaps/faces/book.jpg
share/pixmaps/faces/butterfly.png
+share/pixmaps/faces/calculator.jpg
share/pixmaps/faces/cat-eye.jpg
+share/pixmaps/faces/cat.jpg
share/pixmaps/faces/chess.jpg
share/pixmaps/faces/coffee.jpg
+share/pixmaps/faces/coffee2.jpg
share/pixmaps/faces/dice.jpg
share/pixmaps/faces/energy-arc.jpg
share/pixmaps/faces/fish.jpg
share/pixmaps/faces/flake.jpg
share/pixmaps/faces/flower.jpg
+share/pixmaps/faces/flower2.jpg
+share/pixmaps/faces/gamepad.jpg
share/pixmaps/faces/grapes.jpg
share/pixmaps/faces/guitar.jpg
+share/pixmaps/faces/guitar2.jpg
+share/pixmaps/faces/headphones.jpg
+share/pixmaps/faces/hummingbird.jpg
share/pixmaps/faces/launch.jpg
share/pixmaps/faces/leaf.jpg
+share/pixmaps/faces/legacy/astronaut.jpg
+share/pixmaps/faces/legacy/baseball.png
+share/pixmaps/faces/legacy/butterfly.png
+share/pixmaps/faces/legacy/cat-eye.jpg
+share/pixmaps/faces/legacy/chess.jpg
+share/pixmaps/faces/legacy/coffee.jpg
+share/pixmaps/faces/legacy/dice.jpg
+share/pixmaps/faces/legacy/energy-arc.jpg
+share/pixmaps/faces/legacy/fish.jpg
+share/pixmaps/faces/legacy/flake.jpg
+share/pixmaps/faces/legacy/flower.jpg
+share/pixmaps/faces/legacy/grapes.jpg
+share/pixmaps/faces/legacy/guitar.jpg
+share/pixmaps/faces/legacy/launch.jpg
+share/pixmaps/faces/legacy/leaf.jpg
+share/pixmaps/faces/legacy/lightning.jpg
+share/pixmaps/faces/legacy/penguin.jpg
+share/pixmaps/faces/legacy/puppy.jpg
+share/pixmaps/faces/legacy/sky.jpg
+share/pixmaps/faces/legacy/soccerball.png
+share/pixmaps/faces/legacy/sunflower.jpg
+share/pixmaps/faces/legacy/sunset.jpg
+share/pixmaps/faces/legacy/tennis-ball.png
+share/pixmaps/faces/legacy/yellow-rose.jpg
share/pixmaps/faces/lightning.jpg
+share/pixmaps/faces/mountain.jpg
share/pixmaps/faces/penguin.jpg
+share/pixmaps/faces/plane.jpg
share/pixmaps/faces/puppy.jpg
share/pixmaps/faces/sky.jpg
share/pixmaps/faces/soccerball.png
share/pixmaps/faces/sunflower.jpg
share/pixmaps/faces/sunset.jpg
+share/pixmaps/faces/surfer.jpg
share/pixmaps/faces/tennis-ball.png
+share/pixmaps/faces/tomatoes.jpg
+share/pixmaps/faces/tree.jpg
share/pixmaps/faces/yellow-rose.jpg
share/polkit-1/actions/org.gnome.controlcenter.datetime.policy
share/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 0c95c86e1fbf..c432a908f0b8 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-power-manager
-PORTVERSION= 3.18.0
+PORTVERSION= 3.26.0
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -10,19 +10,18 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Power management system for the GNOME Desktop
-LICENSE= GPLv2+
+LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+BUILD_DEPENDS= appstream-builder:devel/appstream-glib
LIB_DEPENDS= libupower-glib.so:sysutils/upower
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig tar:xz
+USES= gettext gnome localbase:ldflags meson pathfix pkgconfig tar:xz
INSTALLS_ICONS= yes
-USE_GNOME= gtk30 intlhack
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \
- --disable-docbook-docs
+USE_GNOME= cairo gtk30 intlhack
+MESON_ARGS= -Denable-tests=false
GLIB_SCHEMAS= org.gnome.power-manager.gschema.xml
@@ -33,7 +32,12 @@ MANPAGES_BUILD_DEPENDS= docbook2html:textproc/docbook-utils \
docbook-sgml>0:textproc/docbook-sgml
post-patch-MANPAGES-off:
- @${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \
- s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e "s|subdir('man')||g" \
+ ${WRKSRC}/meson.build
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|share/man/man1|man/man1|g' \
+ ${WRKSRC}/man/meson.build
.include <bsd.port.mk>
+
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
index b77e9949fd68..64fe79100130 100644
--- a/sysutils/gnome-power-manager/distinfo
+++ b/sysutils/gnome-power-manager/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-power-manager-3.18.0.tar.xz) = afe5921a4313d15757f39f6ff4ec6f7c9e9cbb9b2aaa0b8a290e1cd7557e28f0
-SIZE (gnome3/gnome-power-manager-3.18.0.tar.xz) = 433960
+TIMESTAMP = 1517748052
+SHA256 (gnome3/gnome-power-manager-3.26.0.tar.xz) = 20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e
+SIZE (gnome3/gnome-power-manager-3.26.0.tar.xz) = 381644
diff --git a/sysutils/gnome-power-manager/files/patch-configure b/sysutils/gnome-power-manager/files/patch-configure
deleted file mode 100644
index eab43da9b627..000000000000
--- a/sysutils/gnome-power-manager/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig 2011-09-18 12:34:50.000000000 +0200
-+++ configure 2011-09-18 12:37:22.000000000 +0200
-@@ -12669,17 +12669,10 @@
- WARNINGFLAGS="$WARNINGFLAGS -Wreturn-type"
- WARNINGFLAGS="$WARNINGFLAGS -Wformat-nonliteral"
- WARNINGFLAGS="$WARNINGFLAGS -Wformat-security"
-- WARNINGFLAGS="$WARNINGFLAGS -Wmissing-include-dirs"
- WARNINGFLAGS="$WARNINGFLAGS -Wmissing-format-attribute"
-- WARNINGFLAGS="$WARNINGFLAGS -Wclobbered"
-- WARNINGFLAGS="$WARNINGFLAGS -Wempty-body"
-- WARNINGFLAGS="$WARNINGFLAGS -Wignored-qualifiers"
-- WARNINGFLAGS="$WARNINGFLAGS -Wtype-limits"
- WARNINGFLAGS="$WARNINGFLAGS -Wdeclaration-after-statement"
- WARNINGFLAGS="$WARNINGFLAGS -Wshadow"
- WARNINGFLAGS="$WARNINGFLAGS -Winline"
-- WARNINGFLAGS="$WARNINGFLAGS -Wmissing-parameter-type"
-- WARNINGFLAGS="$WARNINGFLAGS -Woverride-init"
- WARNINGFLAGS="$WARNINGFLAGS -Wno-strict-aliasing"
- else
- WARNINGFLAGS=""
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
index 04ce6ae8ee24..a26034e85ad4 100644
--- a/sysutils/gnome-power-manager/pkg-plist
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -1,14 +1,13 @@
bin/gnome-power-statistics
%%MANPAGES%%man/man1/gnome-power-statistics.1.gz
-share/appdata/gnome-power-statistics.appdata.xml
-share/applications/gnome-power-statistics.desktop
-share/icons/hicolor/16x16/apps/gnome-power-statistics.png
-share/icons/hicolor/22x22/apps/gnome-power-statistics.png
-share/icons/hicolor/24x24/apps/gnome-power-statistics.png
-share/icons/hicolor/32x32/apps/gnome-power-statistics.png
-share/icons/hicolor/48x48/apps/gnome-power-statistics.png
-share/icons/hicolor/scalable/apps/gnome-power-statistics.svg
-share/icons/hicolor/symbolic/apps/gnome-power-statistics-symbolic.svg
+share/applications/org.gnome.PowerStats.desktop
+share/icons/hicolor/16x16/apps/org.gnome.PowerStats.png
+share/icons/hicolor/22x22/apps/org.gnome.PowerStats.png
+share/icons/hicolor/24x24/apps/org.gnome.PowerStats.png
+share/icons/hicolor/32x32/apps/org.gnome.PowerStats.png
+share/icons/hicolor/48x48/apps/org.gnome.PowerStats.png
+share/icons/hicolor/scalable/apps/org.gnome.PowerStats.svg
+share/icons/hicolor/symbolic/apps/org.gnome.PowerStats-symbolic.svg
share/locale/af/LC_MESSAGES/gnome-power-manager.mo
share/locale/ar/LC_MESSAGES/gnome-power-manager.mo
share/locale/as/LC_MESSAGES/gnome-power-manager.mo
@@ -37,6 +36,7 @@ share/locale/eu/LC_MESSAGES/gnome-power-manager.mo
share/locale/fa/LC_MESSAGES/gnome-power-manager.mo
share/locale/fi/LC_MESSAGES/gnome-power-manager.mo
share/locale/fr/LC_MESSAGES/gnome-power-manager.mo
+share/locale/fur/LC_MESSAGES/gnome-power-manager.mo
share/locale/ga/LC_MESSAGES/gnome-power-manager.mo
share/locale/gd/LC_MESSAGES/gnome-power-manager.mo
share/locale/gl/LC_MESSAGES/gnome-power-manager.mo
@@ -90,3 +90,4 @@ share/locale/vi/LC_MESSAGES/gnome-power-manager.mo
share/locale/zh_CN/LC_MESSAGES/gnome-power-manager.mo
share/locale/zh_HK/LC_MESSAGES/gnome-power-manager.mo
share/locale/zh_TW/LC_MESSAGES/gnome-power-manager.mo
+share/metainfo/org.gnome.PowerStats.appdata.xml
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 6fde0ebaed8c..14ebaa7d3407 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-settings-daemon
-PORTVERSION= 3.18.2
-PORTREVISION= 3
+PORTVERSION= 3.28.1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -14,67 +13,63 @@ COMMENT= GNOME 3 settings daemon
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= gnome-session>=0:x11/gnome-session \
- geoclue>=0:net/geoclue \
- docbook-xsl>=0:textproc/docbook-xsl \
- gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+LIB_DEPENDS= libcanberra.so:audio/libcanberra \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libpolkit-gobject-1.so:sysutils/polkit \
- libibus-1.0.so:textproc/ibus \
- libdbus-1.so:devel/dbus \
+ libfontconfig.so:x11-fonts/fontconfig \
libcolord.so:graphics/colord \
liblcms2.so:graphics/lcms2 \
libpulse.so:audio/pulseaudio \
- libgdbm.so:databases/gdbm \
libnotify.so:devel/libnotify \
+ libgeoclue-2.so:net/geoclue \
+ libupower-glib.so:sysutils/upower \
libgeocode-glib.so:net/geocode-glib \
libgweather-3.so:net/libgweather
-RUN_DEPENDS= gnome-session>=0:x11/gnome-session \
- geoclue>=0:net/geoclue \
- gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
PORTSCOUT= limitw:1,even
-USE_XORG= xxf86misc
-USE_GNOME= gnomedesktop3 intltool libxslt
-USES= gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig tar:xz
-GNU_CONFIGURE= yes
+USE_XORG= x11 xext xi xtst
+USE_GNOME= cairo gnomedesktop3 gtk30
+USES= gettext gnome localbase:ldflags meson \
+ pkgconfig python:3.6+,build tar:xz
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --disable-gudev \
- --with-nssdb=${LOCALBASE}/share/certs/ca-root-nss.crt \
- --disable-wayland \
- --disable-rfkill \
- --disable-network-manager
-INSTALL_TARGET= install-strip
+# -Dnssdb_dir=${LOCALBASE}/share/certs/ca-root-nss.crt
+MESON_ARGS= -Dnssdb_dir=${LOCALBASE}/share/certs/ \
+ -Dalsa=false \
+ -Drfkill=false \
+ -Dnetwork_manager=false
+BINARY_ALIAS= python3=${PYTHON_VERSION}
OPTIONS_SUB= yes
OPTIONS_DEFINE= CUPS SMARTCARD
OPTIONS_DEFAULT=CUPS SMARTCARD
-SMARTCARD_DESC= Smartcard support
-CUPS_CONFIGURE_ENABLE= cups
+
+CUPS_MESON_TRUE= cups
CUPS_LIB_DEPENDS= libcups.so:print/cups
-SMARTCARD_CONFIGURE_ENABLE= smartcard-support
-SMARTCARD_LIB_DEPENDS= libnss3.so:security/nss
+
+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
+#WAYLAND_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev \
+# libwayland-client.so:graphics/wayland
GLIB_SCHEMAS= org.gnome.settings-daemon.enums.xml \
org.gnome.settings-daemon.peripherals.gschema.xml \
+ org.gnome.settings-daemon.peripherals.wacom.gschema.xml \
org.gnome.settings-daemon.plugins.color.gschema.xml \
- org.gnome.settings-daemon.plugins.datetime.gschema.xml \
org.gnome.settings-daemon.plugins.gschema.xml \
org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
- org.gnome.settings-daemon.plugins.keyboard.gschema.xml \
org.gnome.settings-daemon.plugins.media-keys.gschema.xml \
org.gnome.settings-daemon.plugins.power.gschema.xml \
org.gnome.settings-daemon.plugins.power.gschema.xml.override \
- org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \
org.gnome.settings-daemon.plugins.sharing.gschema.xml \
- org.gnome.settings-daemon.plugins.xrandr.gschema.xml \
org.gnome.settings-daemon.plugins.xsettings.gschema.xml
-post-patch:
- @${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \
- ${WRKSRC}/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
-
post-install:
${INSTALL_DATA} ${FILESDIR}/org.gnome.settings-daemon.plugins.power.gschema.xml.override \
${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 0c8ea22f7742..839c6110bf7c 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-settings-daemon-3.18.2.tar.xz) = 3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f
-SIZE (gnome3/gnome-settings-daemon-3.18.2.tar.xz) = 1626400
+TIMESTAMP = 1524858563
+SHA256 (gnome3/gnome-settings-daemon-3.28.1.tar.xz) = 594f78e194eb42a6f77785d1a92a4cb9cda54b8c3af6ca0c315b4570d38d2d7d
+SIZE (gnome3/gnome-settings-daemon-3.28.1.tar.xz) = 1362420
diff --git a/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in b/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in
deleted file mode 100644
index f6e2da97e939..000000000000
--- a/sysutils/gnome-settings-daemon/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- data/Makefile.in.orig 2015-03-24 18:08:17.310107000 +0100
-+++ data/Makefile.in 2015-03-24 18:08:17.365424000 +0100
-@@ -108,10 +108,8 @@
- org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in \
- org.gnome.settings-daemon.peripherals.gschema.xml.in \
- org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in \
-- org.gnome.settings-daemon.plugins.orientation.gschema.xml.in \
- org.gnome.settings-daemon.plugins.sharing.gschema.xml.in \
- org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in \
-- org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in \
- org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in
- CONFIG_CLEAN_VPATH_FILES =
- AM_V_P = $(am__v_P_@AM_V@)
-@@ -423,9 +421,7 @@
- org.gnome.settings-daemon.plugins.xsettings.gschema.xml \
- org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
- org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \
-- org.gnome.settings-daemon.plugins.xrandr.gschema.xml \
-- org.gnome.settings-daemon.plugins.orientation.gschema.xml \
-- org.gnome.settings-daemon.peripherals.wacom.gschema.xml
-+ org.gnome.settings-daemon.plugins.xrandr.gschema.xml
-
- convertdir = $(datadir)/GConf/gsettings
- convert_DATA = gnome-settings-daemon.convert
-@@ -508,14 +504,10 @@
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--org.gnome.settings-daemon.plugins.orientation.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- org.gnome.settings-daemon.plugins.sharing.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
diff --git a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in
deleted file mode 100644
index 15a841b75ee8..000000000000
--- a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.orig 2014-09-22 18:02:18.000000000 +0200
-+++ data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2014-10-16 08:02:07.945478208 +0200
-@@ -15,12 +15,10 @@
- <child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
- <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/>
- <child name="datetime" schema="org.gnome.settings-daemon.plugins.datetime"/>
-- <child name="gsdwacom" schema="org.gnome.settings-daemon.plugins.gsdwacom"/>
- <child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
- <child name="keyboard" schema="org.gnome.settings-daemon.plugins.keyboard"/>
- <child name="media-keys" schema="org.gnome.settings-daemon.plugins.media-keys"/>
- <child name="mouse" schema="org.gnome.settings-daemon.plugins.mouse"/>
-- <child name="orientation" schema="org.gnome.settings-daemon.plugins.orientation"/>
- <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
- <child name="print-notifications" schema="org.gnome.settings-daemon.plugins.print-notifications"/>
- <child name="screensaver-proxy" schema="org.gnome.settings-daemon.plugins.screensaver-proxy"/>
diff --git a/sysutils/gnome-settings-daemon/files/patch-meson.build b/sysutils/gnome-settings-daemon/files/patch-meson.build
new file mode 100644
index 000000000000..ee32689ddd99
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/patch-meson.build
@@ -0,0 +1,25 @@
+$OpenBSD: patch-meson_build,v 1.1 2018/04/23 15:37:34 ajacoutot Exp $
+
+XXX #define FOOBAR 0 does not do what you think it does...
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -131,7 +131,7 @@ if enable_wayland
+ assert(enable_gudev, 'GUDev support is required for wayland support.')
+ wayland_client_dep = dependency('wayland-client')
+ endif
+-config_h.set10('HAVE_WAYLAND', enable_wayland)
++config_h.set('HAVE_WAYLAND', enable_wayland)
+
+ # wacom (disabled for s390/s390x and non Linux platforms)
+ enable_wacom = host_is_linux_not_s390
+@@ -139,7 +139,7 @@ if enable_wacom
+ assert(enable_gudev, 'GUDev support is required for wacom support.')
+ libwacom_dep = dependency('libwacom', version: '>= 0.7')
+ endif
+-config_h.set10('HAVE_WACOM', enable_wacom)
++config_h.set('HAVE_WACOM', enable_wacom)
+
+ # smartcard section
+ enable_smartcard = get_option('smartcard')
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index b4a21ba94056..4a19270aeb44 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -1,91 +1,44 @@
-etc/xdg/autostart/gnome-settings-daemon.desktop
-include/gnome-settings-daemon-3.0/gnome-settings-daemon/gnome-settings-plugin.h
+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
+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.Wacom.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/a11y-keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/a11y-settings.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/color.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/datetime.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/liba11y-keyboard.a
-lib/gnome-settings-daemon-3.0/liba11y-keyboard.so
-lib/gnome-settings-daemon-3.0/liba11y-settings.a
-lib/gnome-settings-daemon-3.0/liba11y-settings.so
-lib/gnome-settings-daemon-3.0/libclipboard.a
-lib/gnome-settings-daemon-3.0/libclipboard.so
-lib/gnome-settings-daemon-3.0/libcolor.a
-lib/gnome-settings-daemon-3.0/libcolor.so
-lib/gnome-settings-daemon-3.0/libdatetime.a
-lib/gnome-settings-daemon-3.0/libdatetime.so
-lib/gnome-settings-daemon-3.0/libgsd.a
lib/gnome-settings-daemon-3.0/libgsd.so
-lib/gnome-settings-daemon-3.0/libhousekeeping.a
-lib/gnome-settings-daemon-3.0/libhousekeeping.so
-lib/gnome-settings-daemon-3.0/libkeyboard.a
-lib/gnome-settings-daemon-3.0/libkeyboard.so
-lib/gnome-settings-daemon-3.0/libmedia-keys.a
-lib/gnome-settings-daemon-3.0/libmedia-keys.so
-lib/gnome-settings-daemon-3.0/libmouse.a
-lib/gnome-settings-daemon-3.0/libmouse.so
-lib/gnome-settings-daemon-3.0/liborientation.a
-lib/gnome-settings-daemon-3.0/liborientation.so
-lib/gnome-settings-daemon-3.0/orientation.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/libpower.a
-lib/gnome-settings-daemon-3.0/libpower.so
-%%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.a
-%%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.so
-lib/gnome-settings-daemon-3.0/libscreensaver-proxy.a
-lib/gnome-settings-daemon-3.0/libscreensaver-proxy.so
-lib/gnome-settings-daemon-3.0/libsharing.a
-lib/gnome-settings-daemon-3.0/libsharing.so
-%%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.a
-%%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.so
-lib/gnome-settings-daemon-3.0/libsound.a
-lib/gnome-settings-daemon-3.0/libsound.so
-lib/gnome-settings-daemon-3.0/libxrandr.a
-lib/gnome-settings-daemon-3.0/libxrandr.so
-lib/gnome-settings-daemon-3.0/libxsettings.a
-lib/gnome-settings-daemon-3.0/libxsettings.so
-lib/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/power.gnome-settings-plugin
-%%CUPS%%lib/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/screensaver-proxy.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/sharing.gnome-settings-plugin
-%%SMARTCARD%%lib/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin
libdata/pkgconfig/gnome-settings-daemon.pc
-libexec/gnome-settings-daemon
-libexec/gnome-settings-daemon-localeexec
+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-test-a11y-keyboard
-libexec/gsd-test-a11y-settings
+libexec/gsd-screensaver-proxy
+libexec/gsd-sharing
+%%SMARTCARD%%libexec/gsd-smartcard
+libexec/gsd-sound
libexec/gsd-test-input-helper
-libexec/gsd-test-datetime
-libexec/gsd-test-housekeeping
-libexec/gsd-test-keyboard
-libexec/gsd-test-media-keys
-libexec/gsd-test-mouse
-libexec/gsd-test-orientation
-%%CUPS%%libexec/gsd-test-print-notifications
-%%SMARTCARD%%libexec/gsd-test-smartcard
-libexec/gsd-test-sound
-libexec/gsd-test-screensaver-proxy
-libexec/gsd-test-xrandr
-libexec/gsd-test-xsettings
-man/man1/gnome-settings-daemon.1.gz
+libexec/gsd-xsettings
share/GConf/gsettings/gnome-settings-daemon.convert
%%DATADIR%%/datetime/backward
-share/gnome-settings-daemon-3.0/input-device-example.sh
-share/icons/hicolor/16x16/apps/gsd-xrandr.png
-share/icons/hicolor/22x22/apps/gsd-xrandr.png
-share/icons/hicolor/24x24/apps/gsd-xrandr.png
-share/icons/hicolor/32x32/apps/gsd-xrandr.png
-share/icons/hicolor/scalable/apps/gsd-xrandr.svg
share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo
@@ -118,9 +71,10 @@ share/locale/eu/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/fa/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/fi/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/fr/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/fur/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/ga/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/gl/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/gd/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/gl/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/gu/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/he/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/hi/LC_MESSAGES/gnome-settings-daemon.mo
@@ -181,4 +135,3 @@ share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
-share/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 64c5632d9147..0886fad0ad9c 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-system-monitor
-PORTVERSION= 3.16.0
-PORTREVISION= 2
+PORTVERSION= 3.28.2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,18 +10,21 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 3 system monitor program
-BUILD_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \
- itstool:textproc/itstool
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgtop-2.0.so:devel/libgtop
-RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme
PORTSCOUT= limitw:1,even
USES= alias compiler:c++11-lang gettext gmake localbase pathfix pkgconfig tar:xz
USE_CXXSTD= c++11
-USE_GNOME= gtkmm30 intlhack librsvg2 libwnck3
+USE_GNOME= gtkmm30 intlhack librsvg2 libxml2
+USE_GNOME+= glib20
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
+CONFIGURE_ARGS= --disable-systemd
GLIB_SCHEMAS= org.gnome.gnome-system-monitor.enums.xml \
org.gnome.gnome-system-monitor.gschema.xml
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index ad466f9d2fb2..12a7ad109b41 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-system-monitor-3.16.0.tar.xz) = 00936e8b5d29fc01cd6daf6c119242877d81b2dcca33fb0ee9ce4adec8675391
-SIZE (gnome3/gnome-system-monitor-3.16.0.tar.xz) = 856044
+TIMESTAMP = 1525954413
+SHA256 (gnome3/gnome-system-monitor-3.28.2.tar.xz) = eb87863f2505ae4ad693b3b6fe79817b6a9d57f6ed7de98bb2dbf95610b29198
+SIZE (gnome3/gnome-system-monitor-3.28.2.tar.xz) = 1209156
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index a4779ed6f444..cb811c258d04 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -1,13 +1,14 @@
bin/gnome-system-monitor
libexec/gnome-system-monitor/gsm-kill
libexec/gnome-system-monitor/gsm-renice
-share/appdata/gnome-system-monitor.appdata.xml
share/applications/gnome-system-monitor-kde.desktop
share/applications/gnome-system-monitor.desktop
+%%DATADIR%%/gsm.gresource
share/help/C/gnome-system-monitor/commandline.page
share/help/C/gnome-system-monitor/cpu-check.page
share/help/C/gnome-system-monitor/cpu-mem-normal.page
share/help/C/gnome-system-monitor/cpu-multicore.page
+share/help/C/gnome-system-monitor/figures/monitorlogo.png
share/help/C/gnome-system-monitor/fs-device.page
share/help/C/gnome-system-monitor/fs-diskusage.page
share/help/C/gnome-system-monitor/fs-info.page
@@ -33,6 +34,7 @@ share/help/cs/gnome-system-monitor/commandline.page
share/help/cs/gnome-system-monitor/cpu-check.page
share/help/cs/gnome-system-monitor/cpu-mem-normal.page
share/help/cs/gnome-system-monitor/cpu-multicore.page
+share/help/cs/gnome-system-monitor/figures/monitorlogo.png
share/help/cs/gnome-system-monitor/fs-device.page
share/help/cs/gnome-system-monitor/fs-diskusage.page
share/help/cs/gnome-system-monitor/fs-info.page
@@ -58,6 +60,7 @@ share/help/de/gnome-system-monitor/commandline.page
share/help/de/gnome-system-monitor/cpu-check.page
share/help/de/gnome-system-monitor/cpu-mem-normal.page
share/help/de/gnome-system-monitor/cpu-multicore.page
+share/help/de/gnome-system-monitor/figures/monitorlogo.png
share/help/de/gnome-system-monitor/fs-device.page
share/help/de/gnome-system-monitor/fs-diskusage.page
share/help/de/gnome-system-monitor/fs-info.page
@@ -83,6 +86,7 @@ share/help/el/gnome-system-monitor/commandline.page
share/help/el/gnome-system-monitor/cpu-check.page
share/help/el/gnome-system-monitor/cpu-mem-normal.page
share/help/el/gnome-system-monitor/cpu-multicore.page
+share/help/el/gnome-system-monitor/figures/monitorlogo.png
share/help/el/gnome-system-monitor/fs-device.page
share/help/el/gnome-system-monitor/fs-diskusage.page
share/help/el/gnome-system-monitor/fs-info.page
@@ -108,6 +112,7 @@ share/help/es/gnome-system-monitor/commandline.page
share/help/es/gnome-system-monitor/cpu-check.page
share/help/es/gnome-system-monitor/cpu-mem-normal.page
share/help/es/gnome-system-monitor/cpu-multicore.page
+share/help/es/gnome-system-monitor/figures/monitorlogo.png
share/help/es/gnome-system-monitor/fs-device.page
share/help/es/gnome-system-monitor/fs-diskusage.page
share/help/es/gnome-system-monitor/fs-info.page
@@ -133,6 +138,7 @@ share/help/fr/gnome-system-monitor/commandline.page
share/help/fr/gnome-system-monitor/cpu-check.page
share/help/fr/gnome-system-monitor/cpu-mem-normal.page
share/help/fr/gnome-system-monitor/cpu-multicore.page
+share/help/fr/gnome-system-monitor/figures/monitorlogo.png
share/help/fr/gnome-system-monitor/fs-device.page
share/help/fr/gnome-system-monitor/fs-diskusage.page
share/help/fr/gnome-system-monitor/fs-info.page
@@ -158,6 +164,7 @@ share/help/hu/gnome-system-monitor/commandline.page
share/help/hu/gnome-system-monitor/cpu-check.page
share/help/hu/gnome-system-monitor/cpu-mem-normal.page
share/help/hu/gnome-system-monitor/cpu-multicore.page
+share/help/hu/gnome-system-monitor/figures/monitorlogo.png
share/help/hu/gnome-system-monitor/fs-device.page
share/help/hu/gnome-system-monitor/fs-diskusage.page
share/help/hu/gnome-system-monitor/fs-info.page
@@ -179,10 +186,115 @@ share/help/hu/gnome-system-monitor/process-status.page
share/help/hu/gnome-system-monitor/process-update-speed.page
share/help/hu/gnome-system-monitor/solaris-mode.page
share/help/hu/gnome-system-monitor/units.page
+share/help/ko/gnome-system-monitor/commandline.page
+share/help/ko/gnome-system-monitor/cpu-check.page
+share/help/ko/gnome-system-monitor/cpu-mem-normal.page
+share/help/ko/gnome-system-monitor/cpu-multicore.page
+share/help/ko/gnome-system-monitor/figures/monitorlogo.png
+share/help/ko/gnome-system-monitor/fs-device.page
+share/help/ko/gnome-system-monitor/fs-diskusage.page
+share/help/ko/gnome-system-monitor/fs-info.page
+share/help/ko/gnome-system-monitor/fs-showall.page
+share/help/ko/gnome-system-monitor/index.page
+share/help/ko/gnome-system-monitor/legal.xml
+share/help/ko/gnome-system-monitor/mem-check.page
+share/help/ko/gnome-system-monitor/mem-swap.page
+share/help/ko/gnome-system-monitor/memory-map-use.page
+share/help/ko/gnome-system-monitor/net-bits.page
+share/help/ko/gnome-system-monitor/process-explain.page
+share/help/ko/gnome-system-monitor/process-files.page
+share/help/ko/gnome-system-monitor/process-identify-file.page
+share/help/ko/gnome-system-monitor/process-identify-hog.page
+share/help/ko/gnome-system-monitor/process-kill.page
+share/help/ko/gnome-system-monitor/process-many.page
+share/help/ko/gnome-system-monitor/process-priority-change.page
+share/help/ko/gnome-system-monitor/process-status.page
+share/help/ko/gnome-system-monitor/process-update-speed.page
+share/help/ko/gnome-system-monitor/solaris-mode.page
+share/help/ko/gnome-system-monitor/units.page
+share/help/pl/gnome-system-monitor/commandline.page
+share/help/pl/gnome-system-monitor/cpu-check.page
+share/help/pl/gnome-system-monitor/cpu-mem-normal.page
+share/help/pl/gnome-system-monitor/cpu-multicore.page
+share/help/pl/gnome-system-monitor/figures/monitorlogo.png
+share/help/pl/gnome-system-monitor/fs-device.page
+share/help/pl/gnome-system-monitor/fs-diskusage.page
+share/help/pl/gnome-system-monitor/fs-info.page
+share/help/pl/gnome-system-monitor/fs-showall.page
+share/help/pl/gnome-system-monitor/index.page
+share/help/pl/gnome-system-monitor/legal.xml
+share/help/pl/gnome-system-monitor/mem-check.page
+share/help/pl/gnome-system-monitor/mem-swap.page
+share/help/pl/gnome-system-monitor/memory-map-use.page
+share/help/pl/gnome-system-monitor/net-bits.page
+share/help/pl/gnome-system-monitor/process-explain.page
+share/help/pl/gnome-system-monitor/process-files.page
+share/help/pl/gnome-system-monitor/process-identify-file.page
+share/help/pl/gnome-system-monitor/process-identify-hog.page
+share/help/pl/gnome-system-monitor/process-kill.page
+share/help/pl/gnome-system-monitor/process-many.page
+share/help/pl/gnome-system-monitor/process-priority-change.page
+share/help/pl/gnome-system-monitor/process-status.page
+share/help/pl/gnome-system-monitor/process-update-speed.page
+share/help/pl/gnome-system-monitor/solaris-mode.page
+share/help/pl/gnome-system-monitor/units.page
+share/help/pt/gnome-system-monitor/commandline.page
+share/help/pt/gnome-system-monitor/cpu-check.page
+share/help/pt/gnome-system-monitor/cpu-mem-normal.page
+share/help/pt/gnome-system-monitor/cpu-multicore.page
+share/help/pt/gnome-system-monitor/figures/monitorlogo.png
+share/help/pt/gnome-system-monitor/fs-device.page
+share/help/pt/gnome-system-monitor/fs-diskusage.page
+share/help/pt/gnome-system-monitor/fs-info.page
+share/help/pt/gnome-system-monitor/fs-showall.page
+share/help/pt/gnome-system-monitor/index.page
+share/help/pt/gnome-system-monitor/legal.xml
+share/help/pt/gnome-system-monitor/mem-check.page
+share/help/pt/gnome-system-monitor/mem-swap.page
+share/help/pt/gnome-system-monitor/memory-map-use.page
+share/help/pt/gnome-system-monitor/net-bits.page
+share/help/pt/gnome-system-monitor/process-explain.page
+share/help/pt/gnome-system-monitor/process-files.page
+share/help/pt/gnome-system-monitor/process-identify-file.page
+share/help/pt/gnome-system-monitor/process-identify-hog.page
+share/help/pt/gnome-system-monitor/process-kill.page
+share/help/pt/gnome-system-monitor/process-many.page
+share/help/pt/gnome-system-monitor/process-priority-change.page
+share/help/pt/gnome-system-monitor/process-status.page
+share/help/pt/gnome-system-monitor/process-update-speed.page
+share/help/pt/gnome-system-monitor/solaris-mode.page
+share/help/pt/gnome-system-monitor/units.page
+share/help/pt_BR/gnome-system-monitor/commandline.page
+share/help/pt_BR/gnome-system-monitor/cpu-check.page
+share/help/pt_BR/gnome-system-monitor/cpu-mem-normal.page
+share/help/pt_BR/gnome-system-monitor/cpu-multicore.page
+share/help/pt_BR/gnome-system-monitor/figures/monitorlogo.png
+share/help/pt_BR/gnome-system-monitor/fs-device.page
+share/help/pt_BR/gnome-system-monitor/fs-diskusage.page
+share/help/pt_BR/gnome-system-monitor/fs-info.page
+share/help/pt_BR/gnome-system-monitor/fs-showall.page
+share/help/pt_BR/gnome-system-monitor/index.page
+share/help/pt_BR/gnome-system-monitor/legal.xml
+share/help/pt_BR/gnome-system-monitor/mem-check.page
+share/help/pt_BR/gnome-system-monitor/mem-swap.page
+share/help/pt_BR/gnome-system-monitor/memory-map-use.page
+share/help/pt_BR/gnome-system-monitor/net-bits.page
+share/help/pt_BR/gnome-system-monitor/process-explain.page
+share/help/pt_BR/gnome-system-monitor/process-files.page
+share/help/pt_BR/gnome-system-monitor/process-identify-file.page
+share/help/pt_BR/gnome-system-monitor/process-identify-hog.page
+share/help/pt_BR/gnome-system-monitor/process-kill.page
+share/help/pt_BR/gnome-system-monitor/process-many.page
+share/help/pt_BR/gnome-system-monitor/process-priority-change.page
+share/help/pt_BR/gnome-system-monitor/process-status.page
+share/help/pt_BR/gnome-system-monitor/process-update-speed.page
+share/help/pt_BR/gnome-system-monitor/solaris-mode.page
+share/help/pt_BR/gnome-system-monitor/units.page
share/help/ro/gnome-system-monitor/commandline.page
share/help/ro/gnome-system-monitor/cpu-check.page
share/help/ro/gnome-system-monitor/cpu-mem-normal.page
share/help/ro/gnome-system-monitor/cpu-multicore.page
+share/help/ro/gnome-system-monitor/figures/monitorlogo.png
share/help/ro/gnome-system-monitor/fs-device.page
share/help/ro/gnome-system-monitor/fs-diskusage.page
share/help/ro/gnome-system-monitor/fs-info.page
@@ -204,6 +316,32 @@ share/help/ro/gnome-system-monitor/process-status.page
share/help/ro/gnome-system-monitor/process-update-speed.page
share/help/ro/gnome-system-monitor/solaris-mode.page
share/help/ro/gnome-system-monitor/units.page
+share/help/sv/gnome-system-monitor/commandline.page
+share/help/sv/gnome-system-monitor/cpu-check.page
+share/help/sv/gnome-system-monitor/cpu-mem-normal.page
+share/help/sv/gnome-system-monitor/cpu-multicore.page
+share/help/sv/gnome-system-monitor/figures/monitorlogo.png
+share/help/sv/gnome-system-monitor/fs-device.page
+share/help/sv/gnome-system-monitor/fs-diskusage.page
+share/help/sv/gnome-system-monitor/fs-info.page
+share/help/sv/gnome-system-monitor/fs-showall.page
+share/help/sv/gnome-system-monitor/index.page
+share/help/sv/gnome-system-monitor/legal.xml
+share/help/sv/gnome-system-monitor/mem-check.page
+share/help/sv/gnome-system-monitor/mem-swap.page
+share/help/sv/gnome-system-monitor/memory-map-use.page
+share/help/sv/gnome-system-monitor/net-bits.page
+share/help/sv/gnome-system-monitor/process-explain.page
+share/help/sv/gnome-system-monitor/process-files.page
+share/help/sv/gnome-system-monitor/process-identify-file.page
+share/help/sv/gnome-system-monitor/process-identify-hog.page
+share/help/sv/gnome-system-monitor/process-kill.page
+share/help/sv/gnome-system-monitor/process-many.page
+share/help/sv/gnome-system-monitor/process-priority-change.page
+share/help/sv/gnome-system-monitor/process-status.page
+share/help/sv/gnome-system-monitor/process-update-speed.page
+share/help/sv/gnome-system-monitor/solaris-mode.page
+share/help/sv/gnome-system-monitor/units.page
share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
share/locale/an/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
@@ -234,6 +372,7 @@ share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/fur/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
share/locale/gd/LC_MESSAGES/gnome-system-monitor.mo
share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
@@ -243,6 +382,7 @@ share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo
share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/is/LC_MESSAGES/gnome-system-monitor.mo
share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ka/LC_MESSAGES/gnome-system-monitor.mo
@@ -295,4 +435,5 @@ share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
+share/metainfo/gnome-system-monitor.appdata.xml
share/polkit-1/actions/org.gnome.gnome-system-monitor.policy
diff --git a/sysutils/hoz/Makefile b/sysutils/hoz/Makefile
index c9a7e14c909b..ad739e0d91f3 100644
--- a/sysutils/hoz/Makefile
+++ b/sysutils/hoz/Makefile
@@ -41,15 +41,15 @@ PLIST_FILES+= bin/ghoz
.endif
.if ${PORT_OPTIONS:MLANG_ES}
-MAKE_ENV+= LANG="-DHOZ_LANG_ES"
+MAKE_ENV+= HOZ_LANG="-DHOZ_LANG_ES"
.endif
.if ${PORT_OPTIONS:MLANG_EN}
-MAKE_ENV+= LANG="-DHOZ_LANG_EN"
+MAKE_ENV+= HOZ_LANG="-DHOZ_LANG_EN"
.endif
.if ${PORT_OPTIONS:MLANG_FR}
-MAKE_ENV+= LANG="-DHOZ_LANG_FR"
+MAKE_ENV+= HOZ_LANG="-DHOZ_LANG_FR"
.endif
do-install:
diff --git a/sysutils/hoz/files/patch-src_Makefile b/sysutils/hoz/files/patch-src_Makefile
index 96157fa03adb..d029ccbfa02b 100644
--- a/sysutils/hoz/files/patch-src_Makefile
+++ b/sysutils/hoz/files/patch-src_Makefile
@@ -1,6 +1,6 @@
---- Makefile 2004-01-12 11:23:38.000000000 -0500
-+++ Makefile 2013-10-09 16:05:16.000000000 -0500
-@@ -4,14 +4,13 @@
+--- Makefile.orig 2004-01-12 17:23:38.000000000 +0100
++++ Makefile 2018-09-22 10:12:26.859259000 +0200
+@@ -4,15 +4,14 @@
OBJ = hoz.o hozgtk.o hozgtk_c.o hozgtk_i.o hozgtk_s.o hozcli.o
LINKOBJ = hoz.o hozcli.o
GLINKOBJ = hoz.o hozgtk.o hozgtk_c.o hozgtk_i.o hozgtk_s.o
@@ -14,38 +14,39 @@
-BIN = /usr/bin/hoz
-GBIN = /usr/bin/ghoz
+ -DGDK_PIXBUF_DISABLE_DEPRECATED
-+
+
+BIN = hoz
+GBIN = ghoz
-
++
GTK_COMP = `pkg-config gtk+-2.0 --cflags`
GTK_LINK = `pkg-config gtk+-2.0 --libs`
+
@@ -34,26 +33,26 @@
rm -f $(OBJ) ${BIN} ${GBIN}
hoz.o: hoz.c
- $(CC) -c hoz.c -o hoz.o $(CFLAGS) ${LANG}
-+ $(CC) -c hoz.c -o hoz.o $(CFLAGS) ${CPPFLAGS} ${LANG}
++ $(CC) -c hoz.c -o hoz.o $(CFLAGS) ${CPPFLAGS} ${HOZ_LANG}
hozgtk.o: hozgtk.c
- $(CC) -c hozgtk.c -o hozgtk.o $(CFLAGS) $(GTK_COMP) ${LANG}
-+ $(CC) -c hozgtk.c -o hozgtk.o $(CFLAGS) ${CPPFLAGS} $(GTK_COMP) ${LANG}
++ $(CC) -c hozgtk.c -o hozgtk.o $(CFLAGS) ${CPPFLAGS} $(GTK_COMP) ${HOZ_LANG}
hozgtk_c.o: hozgtk_c.c
- $(CC) -c hozgtk_c.c -o hozgtk_c.o $(CFLAGS) $(GTK_COMP) ${LANG}
-+ $(CC) -c hozgtk_c.c -o hozgtk_c.o $(CFLAGS) ${CPPFLAGS} $(GTK_COMP) ${LANG}
++ $(CC) -c hozgtk_c.c -o hozgtk_c.o $(CFLAGS) ${CPPFLAGS} $(GTK_COMP) ${HOZ_LANG}
hozgtk_i.o: hozgtk_i.c
- $(CC) -c hozgtk_i.c -o hozgtk_i.o $(CFLAGS) $(GTK_COMP) ${LANG}
-+ $(CC) -c hozgtk_i.c -o hozgtk_i.o $(CFLAGS) ${CPPFLAGS} $(GTK_COMP) ${LANG}
++ $(CC) -c hozgtk_i.c -o hozgtk_i.o $(CFLAGS) ${CPPFLAGS} $(GTK_COMP) ${HOZ_LANG}
hozgtk_s.o: hozgtk_s.c
- $(CC) -c hozgtk_s.c -o hozgtk_s.o $(CFLAGS) $(GTK_COMP) ${LANG}
-+ $(CC) -c hozgtk_s.c -o hozgtk_s.o $(CFLAGS) ${CPPFLAGS} $(GTK_COMP) ${LANG}
++ $(CC) -c hozgtk_s.c -o hozgtk_s.o $(CFLAGS) ${CPPFLAGS} $(GTK_COMP) ${HOZ_LANG}
hozcli.o: hozcli.c
- $(CC) -c hozcli.c -o hozcli.o $(CFLAGS) ${LANG}
-+ $(CC) -c hozcli.c -o hozcli.o $(CFLAGS) ${CPPFLAGS} ${LANG}
++ $(CC) -c hozcli.c -o hozcli.o $(CFLAGS) ${CPPFLAGS} ${HOZ_LANG}
$(BIN): $(LINKOBJ)
- $(CC) $(LINKOBJ) -o $(BIN) $(LIBS)
diff --git a/sysutils/tracker-miners/Makefile b/sysutils/tracker-miners/Makefile
new file mode 100644
index 000000000000..923db131cc16
--- /dev/null
+++ b/sysutils/tracker-miners/Makefile
@@ -0,0 +1,72 @@
+# Created by: Michael Johnson <ahze@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= tracker-miners
+PORTVERSION= 2.0.5
+CATEGORIES= sysutils gnome
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Miners for tracker2
+
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING.LGPL
+
+BUILD_DEPENDS= valac:lang/vala
+LIB_DEPENDS= libicuuc.so:devel/icu \
+ libupower-glib.so:sysutils/upower \
+ libexempi.so:textproc/exempi \
+ libcue.so:textproc/libcue \
+ libiptcdata.so:graphics/libiptcdata \
+ libFLAC.so:audio/flac \
+ libtotem-plparser.so:multimedia/totem-pl-parser \
+ libpoppler-glib.so:graphics/poppler-glib \
+ libpng16.so:graphics/png \
+ libtag.so:audio/taglib \
+ libtiff.so:graphics/tiff \
+ libgif.so:graphics/giflib \
+ libvorbisfile.so:audio/libvorbis \
+ libgxps.so:graphics/libgxps \
+ libexif.so:graphics/libexif \
+ libgexiv2.so:graphics/gexiv2 \
+ libtracker-miner-2.0.so:sysutils/tracker
+# libhal.so:sysutils/hal \
+
+PORTSCOUT= limitw:1,even
+
+USES= gettext gnome jpeg localbase:ldflags meson \
+ pathfix pkgconfig python:3.4+,build shebangfix sqlite tar:xz
+USE_GNOME= cairo intltool libgsf libxml2
+USE_LDCONFIG= yes
+INSTALLS_ICONS= yes
+GLIB_SCHEMAS= org.freedesktop.Tracker.Extract.gschema.xml \
+ org.freedesktop.Tracker.Miner.Files.gschema.xml \
+ org.freedesktop.Tracker.Writeback.gschema.xml \
+ org.freedesktop.TrackerMiners.enums.xml
+SHEBANG_FILES= tests/tracker-writeback/01-writeback.py
+
+MESON_ARGS= -Dsystemd_user_services=no \
+ -Dcharset_detenction=icu \
+ -Dunicode_support=icu \
+ -Dstemmer=no
+# -Dbattery_detection=hal
+
+OPTIONS_SUB= yes
+OPTIONS_DEFINE= GSTREAMER RSS
+OPTIONS_DEFAULT= GSTREAMER RSS
+
+GSTREAMER_MESON_ON= -Dgeneric_media_extractor=gstreamer
+GSTREAMER_MESON_OFF= -Dgeneric_media_extractor=none
+GSTREAMER_USE= gstreamer1=yes
+
+
+RSS_DESC= Tracker RSS miner
+RSS_MESON_TRUE= miner_rss
+RSS_LIB_DEPENDS= libgrss.so:net/libgrss
+
+PLIST_SUB= LIBVER=0.2.0
+
+#post-install:
+# ${RM} -rf ${STAGEDIR}/${PREFIX}/lib/systemd
+
+.include <bsd.port.mk>
diff --git a/sysutils/tracker-miners/distinfo b/sysutils/tracker-miners/distinfo
new file mode 100644
index 000000000000..050ca4ab0b60
--- /dev/null
+++ b/sysutils/tracker-miners/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1530382725
+SHA256 (tracker-miners-2.0.5.tar.xz) = 6499c083761631b14ad58d463c4af1d69bca842d9a3d11a6c456ced5d0b26802
+SIZE (tracker-miners-2.0.5.tar.xz) = 3652280
diff --git a/sysutils/tracker-miners/pkg-descr b/sysutils/tracker-miners/pkg-descr
new file mode 100644
index 000000000000..f83e9d3539bc
--- /dev/null
+++ b/sysutils/tracker-miners/pkg-descr
@@ -0,0 +1,3 @@
+Data miners for sysutils/tracker.
+
+WWW: https://wiki.gnome.org/Projects/Tracker
diff --git a/sysutils/tracker-miners/pkg-plist b/sysutils/tracker-miners/pkg-plist
new file mode 100644
index 000000000000..32e5de780f36
--- /dev/null
+++ b/sysutils/tracker-miners/pkg-plist
@@ -0,0 +1,140 @@
+etc/xdg/autostart/tracker-extract.desktop
+etc/xdg/autostart/tracker-miner-apps.desktop
+etc/xdg/autostart/tracker-miner-fs.desktop
+%%RSS%%etc/xdg/autostart/tracker-miner-rss.desktop
+lib/tracker-miners-2.0/extract-modules/libextract-abw.so
+lib/tracker-miners-2.0/extract-modules/libextract-bmp.so
+lib/tracker-miners-2.0/extract-modules/libextract-dummy.so
+lib/tracker-miners-2.0/extract-modules/libextract-dvi.so
+lib/tracker-miners-2.0/extract-modules/libextract-epub.so
+lib/tracker-miners-2.0/extract-modules/libextract-flac.so
+lib/tracker-miners-2.0/extract-modules/libextract-gif.so
+%%GSTREAMER%%lib/tracker-miners-2.0/extract-modules/libextract-gstreamer.so
+lib/tracker-miners-2.0/extract-modules/libextract-html.so
+lib/tracker-miners-2.0/extract-modules/libextract-icon.so
+lib/tracker-miners-2.0/extract-modules/libextract-jpeg.so
+lib/tracker-miners-2.0/extract-modules/libextract-mp3.so
+lib/tracker-miners-2.0/extract-modules/libextract-msoffice-xml.so
+lib/tracker-miners-2.0/extract-modules/libextract-msoffice.so
+lib/tracker-miners-2.0/extract-modules/libextract-oasis.so
+lib/tracker-miners-2.0/extract-modules/libextract-pdf.so
+lib/tracker-miners-2.0/extract-modules/libextract-playlist.so
+lib/tracker-miners-2.0/extract-modules/libextract-png.so
+lib/tracker-miners-2.0/extract-modules/libextract-ps.so
+lib/tracker-miners-2.0/extract-modules/libextract-raw.so
+lib/tracker-miners-2.0/extract-modules/libextract-text.so
+lib/tracker-miners-2.0/extract-modules/libextract-tiff.so
+lib/tracker-miners-2.0/extract-modules/libextract-vorbis.so
+lib/tracker-miners-2.0/extract-modules/libextract-xmp.so
+lib/tracker-miners-2.0/extract-modules/libextract-xps.so
+lib/tracker-miners-2.0/libtracker-extract.so
+lib/tracker-miners-2.0/libtracker-miners-common.so
+lib/tracker-miners-2.0/writeback-modules/libwriteback-taglib.so
+lib/tracker-miners-2.0/writeback-modules/libwriteback-xmp.so
+libexec/tracker-extract
+libexec/tracker-miner-apps
+libexec/tracker-miner-fs
+%%RSS%%libexec/tracker-miner-rss
+libexec/tracker-writeback
+man/man1/tracker-extract.1.gz
+man/man1/tracker-miner-fs.1.gz
+%%RSS%%man/man1/tracker-miner-rss.1.gz
+man/man1/tracker-writeback.1.gz
+share/dbus-1/services/org.freedesktop.Tracker1.Miner.Applications.service
+share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service
+share/dbus-1/services/org.freedesktop.Tracker1.Miner.Files.service
+%%RSS%%share/dbus-1/services/org.freedesktop.Tracker1.Miner.RSS.service
+share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service
+share/locale/ar/LC_MESSAGES/tracker-miners.mo
+share/locale/as/LC_MESSAGES/tracker-miners.mo
+share/locale/be@latin/LC_MESSAGES/tracker-miners.mo
+share/locale/bg/LC_MESSAGES/tracker-miners.mo
+share/locale/bs/LC_MESSAGES/tracker-miners.mo
+share/locale/ca/LC_MESSAGES/tracker-miners.mo
+share/locale/ca@valencia/LC_MESSAGES/tracker-miners.mo
+share/locale/cs/LC_MESSAGES/tracker-miners.mo
+share/locale/da/LC_MESSAGES/tracker-miners.mo
+share/locale/de/LC_MESSAGES/tracker-miners.mo
+share/locale/dz/LC_MESSAGES/tracker-miners.mo
+share/locale/el/LC_MESSAGES/tracker-miners.mo
+share/locale/en_GB/LC_MESSAGES/tracker-miners.mo
+share/locale/eo/LC_MESSAGES/tracker-miners.mo
+share/locale/es/LC_MESSAGES/tracker-miners.mo
+share/locale/et/LC_MESSAGES/tracker-miners.mo
+share/locale/eu/LC_MESSAGES/tracker-miners.mo
+share/locale/fi/LC_MESSAGES/tracker-miners.mo
+share/locale/fr/LC_MESSAGES/tracker-miners.mo
+share/locale/fur/LC_MESSAGES/tracker-miners.mo
+share/locale/gl/LC_MESSAGES/tracker-miners.mo
+share/locale/he/LC_MESSAGES/tracker-miners.mo
+share/locale/hu/LC_MESSAGES/tracker-miners.mo
+share/locale/hr/LC_MESSAGES/tracker-miners.mo
+share/locale/id/LC_MESSAGES/tracker-miners.mo
+share/locale/it/LC_MESSAGES/tracker-miners.mo
+share/locale/ja/LC_MESSAGES/tracker-miners.mo
+share/locale/kk/LC_MESSAGES/tracker-miners.mo
+share/locale/ko/LC_MESSAGES/tracker-miners.mo
+share/locale/lt/LC_MESSAGES/tracker-miners.mo
+share/locale/lv/LC_MESSAGES/tracker-miners.mo
+share/locale/mk/LC_MESSAGES/tracker-miners.mo
+share/locale/ml/LC_MESSAGES/tracker-miners.mo
+share/locale/nb/LC_MESSAGES/tracker-miners.mo
+share/locale/nds/LC_MESSAGES/tracker-miners.mo
+share/locale/ne/LC_MESSAGES/tracker-miners.mo
+share/locale/nl/LC_MESSAGES/tracker-miners.mo
+share/locale/oc/LC_MESSAGES/tracker-miners.mo
+share/locale/pa/LC_MESSAGES/tracker-miners.mo
+share/locale/pl/LC_MESSAGES/tracker-miners.mo
+share/locale/pt/LC_MESSAGES/tracker-miners.mo
+share/locale/pt_BR/LC_MESSAGES/tracker-miners.mo
+share/locale/ro/LC_MESSAGES/tracker-miners.mo
+share/locale/ru/LC_MESSAGES/tracker-miners.mo
+share/locale/sk/LC_MESSAGES/tracker-miners.mo
+share/locale/sl/LC_MESSAGES/tracker-miners.mo
+share/locale/sr/LC_MESSAGES/tracker-miners.mo
+share/locale/sr@latin/LC_MESSAGES/tracker-miners.mo
+share/locale/sv/LC_MESSAGES/tracker-miners.mo
+share/locale/te/LC_MESSAGES/tracker-miners.mo
+share/locale/tg/LC_MESSAGES/tracker-miners.mo
+share/locale/th/LC_MESSAGES/tracker-miners.mo
+share/locale/tr/LC_MESSAGES/tracker-miners.mo
+share/locale/uk/LC_MESSAGES/tracker-miners.mo
+share/locale/vi/LC_MESSAGES/tracker-miners.mo
+share/locale/zh_CN/LC_MESSAGES/tracker-miners.mo
+share/locale/zh_HK/LC_MESSAGES/tracker-miners.mo
+share/locale/zh_TW/LC_MESSAGES/tracker-miners.mo
+%%DATADIR%%/extract-rules/10-abw.rule
+%%DATADIR%%/extract-rules/10-bmp.rule
+%%DATADIR%%/extract-rules/10-comics.rule
+%%DATADIR%%/extract-rules/10-dvi.rule
+%%DATADIR%%/extract-rules/10-ebooks.rule
+%%DATADIR%%/extract-rules/10-epub.rule
+%%DATADIR%%/extract-rules/10-flac.rule
+%%DATADIR%%/extract-rules/10-gif.rule
+%%DATADIR%%/extract-rules/10-html.rule
+%%DATADIR%%/extract-rules/10-ico.rule
+%%DATADIR%%/extract-rules/10-jpeg.rule
+%%DATADIR%%/extract-rules/10-mp3.rule
+%%DATADIR%%/extract-rules/10-msoffice.rule
+%%DATADIR%%/extract-rules/10-oasis.rule
+%%DATADIR%%/extract-rules/10-pdf.rule
+%%DATADIR%%/extract-rules/10-png.rule
+%%DATADIR%%/extract-rules/10-ps.rule
+%%DATADIR%%/extract-rules/10-raw.rule
+%%GSTREAMER%%%%DATADIR%%/extract-rules/10-svg.rule
+%%DATADIR%%/extract-rules/10-tiff.rule
+%%DATADIR%%/extract-rules/10-vorbis.rule
+%%DATADIR%%/extract-rules/10-xmp.rule
+%%DATADIR%%/extract-rules/10-xps.rule
+%%DATADIR%%/extract-rules/11-msoffice-xml.rule
+%%GSTREAMER%%%%DATADIR%%/extract-rules/15-gstreamer-guess.rule
+%%DATADIR%%/extract-rules/15-playlist.rule
+%%DATADIR%%/extract-rules/15-source-code.rule
+%%GSTREAMER%%%%DATADIR%%/extract-rules/90-gstreamer-audio-generic.rule
+%%GSTREAMER%%%%DATADIR%%/extract-rules/90-gstreamer-image-generic.rule
+%%GSTREAMER%%%%DATADIR%%/extract-rules/90-gstreamer-video-generic.rule
+%%DATADIR%%/extract-rules/90-text-generic.rule
+share/tracker/miners/org.freedesktop.Tracker1.Miner.Applications.service
+share/tracker/miners/org.freedesktop.Tracker1.Miner.Extract.service
+share/tracker/miners/org.freedesktop.Tracker1.Miner.Files.service
+%%RSS%%share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index b41739908eb7..d9971788cbc5 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -2,109 +2,46 @@
# $FreeBSD$
PORTNAME= tracker
-PORTVERSION= 1.6.1
-PORTREVISION= 14
+PORTVERSION= 2.0.4
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Object database, tag/metadata database, search tool and indexer
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libgmime-2.6.so:mail/gmime26 \
- libhal.so:sysutils/hal \
- libraptor.so:textproc/raptor \
- libuuid.so:misc/e2fsprogs-libuuid \
- libicutu.so:devel/icu \
- libmediaart-2.0.so:multimedia/libmediaart \
- librest-0.7.so:devel/librest
-RUN_DEPENDS= xdg-desktop-icon:devel/xdg-utils \
- o3totxt:converters/o3read \
- pdftotext:graphics/poppler-utils \
- w3m:www/w3m
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING.LGPL
+
+BUILD_DEPENDS= valac:lang/vala
+LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+ libsoup-2.4.so:devel/libsoup \
+ libjson-glib-1.0.so:devel/json-glib \
+ libicutu.so:devel/icu
PORTSCOUT= limitw:1,even
-USES= compiler:c++11-lib desktop-file-utils gettext gmake gnome \
- libarchive libtool pathfix pkgconfig python:run shebangfix \
- sqlite tar:xz
-USE_GNOME= gtk30 intltool introspection:build libxslt:build
+USES= compiler:c++11-lib gettext gmake gnome libtool localbase \
+ pathfix pkgconfig python:3.4+,build shebangfix sqlite tar:xz
+USE_GNOME= glib20 intltool introspection:build libxml2
USE_LDCONFIG= yes
-USE_GSTREAMER1= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \
- --disable-libiptcdata --enable-miner-fs \
- --disable-meegotouch \
- --enable-icu-charset-detection \
+CONFIGURE_ARGS= --disable-static \
--disable-network-manager \
- --disable-enca \
- --enable-tracker-preferences \
- --disable-libosinfo \
- --enable-generic-media-extractor=gstreamer
-# disable evolution miner until tracker fixes the dep
-CONFIGURE_ARGS+= --disable-miner-evolution
-CONFIGURE_ENV+= enable_miner_evolution=no \
- DATADIRNAME=share
+ --with-bash-completion-dir=no
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.freedesktop.Tracker.DB.gschema.xml \
- org.freedesktop.Tracker.Extract.gschema.xml \
org.freedesktop.Tracker.FTS.gschema.xml \
- org.freedesktop.Tracker.Miner.Files.gschema.xml \
- org.freedesktop.Tracker.Needle.gschema.xml \
org.freedesktop.Tracker.Store.gschema.xml \
- org.freedesktop.Tracker.Writeback.gschema.xml \
org.freedesktop.Tracker.enums.xml \
org.freedesktop.Tracker.gschema.xml
-SHEBANG_FILES= tests/tracker-writeback/01-writeback.py
-
-PLIST_SUB= TRACKER_VER="1.0" LIBVER=601
-
-OPTIONS_DEFINE= AUDIO_MINERS DOCUMENT_MINERS GRAPHIC_MINERS \
- WEB_MINERS
-OPTIONS_DEFAULT= AUDIO_MINERS DOCUMENT_MINERS GRAPHIC_MINERS
-OPTIONS_SUB=yes
-WEB_MINERS_DESC= Support for Firefox, Thunderbird
-# and Evolution
-AUDIO_MINERS_DESC= Support for audio formats
-DOCUMENT_MINERS_DESC= Support for some sort of documents (pdf, ps, xps, office)
-GRAPHIC_MINERS_DESC= Support for some graphic formats (gif, png, tiff)
-NAUTILUS_DESC= Support for nautilus tagging
-
-WEB_MINERS_CONFIGURE_ENABLE= miner-firefox miner-thunderbird
-# miner-evolution
-WEB_MINERS_BUILD_DEPENDS= firefox>=0:www/firefox \
- thunderbird>=0:mail/thunderbird
-WEB_MINERS_RUN_DEPENDS= firefox>=0:www/firefox \
- thunderbird>=0:mail/thunderbird
-
-AUDIO_MINERS_CONFIGURE_ENABLE= libvorbis libflac taglib mp3 libcue playlist
-AUDIO_MINERS_LIB_DEPENDS= libtotem-plparser.so:multimedia/totem-pl-parser \
- libFLAC.so:audio/flac \
- libvorbis.so:audio/libvorbis \
- libcue.so:textproc/libcue \
- libogg.so:audio/libogg \
- libtag.so:audio/taglib
-
-DOCUMENT_MINERS_CONFIGURE_ENABLE= libgxps poppler libxml2 libgsf \
- abiword dvi ps exempi text
-DOCUMENT_MINERS_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib \
- libgxps.so:graphics/libgxps \
- libgsf-1.so:devel/libgsf \
- libexempi.so:textproc/exempi \
- libwv.so:textproc/wv
+SHEBANG_FILES= utils/g-ir-merge/g-ir-merge
-GRAPHIC_MINERS_CONFIGURE_ENABLE= libexif libgif libjpeg libtiff icon libpng
-GRAPHIC_MINERS_LIB_DEPENDS= libexif.so:graphics/libexif \
- libgif.so:graphics/giflib \
- libpng.so:graphics/png \
- libtiff.so:graphics/tiff
+PLIST_SUB= LIBVER=0.4.0
-# cirular dependancy tracker -> nautilus -> tracker
-CONFIGURE_ARGS= --disable-nautilus-extension
-#NAUTILUS_CONFIGURE_ENABLE= nautilus-extension
-#NAUTILUS_USE= GNOME=nautilus3
+# force regen of this file, so the correct tracker version is embedded
+# https://bugzilla.gnome.org/show_bug.cgi?id=792691
+post-patch:
+ @${RM} ${WRKSRC}/src/libtracker-sparql/tracker-sparql.vapi
.include <bsd.port.mk>
diff --git a/sysutils/tracker/distinfo b/sysutils/tracker/distinfo
index 5f32f9890baf..902d3d06461c 100644
--- a/sysutils/tracker/distinfo
+++ b/sysutils/tracker/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tracker-1.6.1.tar.xz) = 653ed73f4f454b836df56bec1f1141c7a8d77cbeba97ea1e38df9f60a5f0c1ed
-SIZE (tracker-1.6.1.tar.xz) = 4905544
+TIMESTAMP = 1530382221
+SHA256 (tracker-2.0.4.tar.xz) = ce2f0db52666592d313a04ce14663110eafa8ab08dc213b53e790281362dccd5
+SIZE (tracker-2.0.4.tar.xz) = 2607728
diff --git a/sysutils/tracker/files/patch-configure b/sysutils/tracker/files/patch-configure
deleted file mode 100644
index 5c395589562a..000000000000
--- a/sysutils/tracker/files/patch-configure
+++ /dev/null
@@ -1,128 +0,0 @@
---- configure.orig 2015-07-21 23:39:50.000000000 +0200
-+++ configure 2015-08-14 14:37:54.000000000 +0200
-@@ -21334,8 +21334,6 @@
- # First test for 3_3_5
- TRACKER_MINER_EVOLUTION_3_3_5_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
- evolution-shell-3.0 >= 3.1
-- evolution-plugin-3.0
-- libemail-utils
- libemail-engine
- evolution-data-server-1.2 >= $EDS_REQUIRED
- camel-1.2 >= $CAMEL_REQUIRED"
-@@ -21429,7 +21427,6 @@
- # Second test for 3_2
- TRACKER_MINER_EVOLUTION_3_2_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
- evolution-shell-3.0 >= 3.1
-- evolution-plugin-3.0
- evolution-data-server-1.2 >= $EDS_REQUIRED
- camel-1.2 >= $CAMEL_REQUIRED"
-
-@@ -21519,7 +21516,6 @@
- # Third test for 2_91
- TRACKER_MINER_EVOLUTION_2_91_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
- evolution-shell-3.0
-- evolution-plugin-3.0
- evolution-data-server-1.2 >= $EDS_REQUIRED
- camel-1.2 >= $CAMEL_REQUIRED"
-
-@@ -21605,7 +21601,6 @@
- # Fourth test others (do we really want support for anything < 3.2)?
- TRACKER_MINER_EVOLUTION_LAST_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
- evolution-shell >= $EVO_SHELL_REQUIRED
-- evolution-plugin >= $EVO_REQUIRED
- evolution-data-server-1.2 >= $EDS_REQUIRED
- camel-1.2 >= $CAMEL_REQUIRED"
-
-@@ -24247,14 +24242,14 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED
-- hal >= \$HAL_REQUIRED\""; } >&5
-+ hal >= \$HAL_REQUIRED dbus-glib-1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED
-- hal >= $HAL_REQUIRED") 2>&5
-+ hal >= $HAL_REQUIRED dbus-glib-1"; ) >&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_REQUIRED
-- hal >= $HAL_REQUIRED" 2>/dev/null`
-+ hal >= $HAL_REQUIRED dbus-glib-1" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -24267,14 +24262,16 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED
-- hal >= \$HAL_REQUIRED\""; } >&5
-+ hal >= \$HAL_REQUIRED dbus-glib-1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED
-- hal >= $HAL_REQUIRED") 2>&5
-+ hal >= $HAL_REQUIRED
-+ dbus-glib-1") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "dbus-1 >= $DBUS_REQUIRED
-- hal >= $HAL_REQUIRED" 2>/dev/null`
-+ hal >= $HAL_REQUIRED
-+ dbus-glib-1" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -24296,10 +24293,12 @@
- fi
- if test $_pkg_short_errors_supported = yes; then
- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= $DBUS_REQUIRED
-- hal >= $HAL_REQUIRED" 2>&1`
-+ hal >= $HAL_REQUIRED
-+ dbus-glib-1" 2>&1`
- else
- HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= $DBUS_REQUIRED
-- hal >= $HAL_REQUIRED" 2>&1`
-+ hal >= $HAL_REQUIRED
-+ dbus-glib-1" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$HAL_PKG_ERRORS" >&5
-@@ -25497,7 +25496,6 @@
- if test "${with_evolution_plugin_dir+set}" = set; then :
- withval=$with_evolution_plugin_dir;
- fi
--,
- tracker_miner_evolution_install_dir=$withval,
- tracker_miner_evolution_install_dir=`$PKG_CONFIG $evolution_plugin_name --variable=plugindir`,
-
-@@ -27296,7 +27294,6 @@
- OLD_LDFLAGS="$LDFLAGS"
- OLD_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
-
- # Check whether --enable-libgif was given.
-@@ -27406,7 +27403,6 @@
- OLD_LDFLAGS="$LDFLAGS"
- OLD_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
-
- # Check whether --enable-libjpeg was given.
-@@ -27516,7 +27512,6 @@
- OLD_LDFLAGS="$LDFLAGS"
- OLD_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
-
- # Check whether --enable-libtiff was given.
-@@ -27626,7 +27621,6 @@
- OLD_LDFLAGS="$LDFLAGS"
- OLD_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
-
- # Check whether --enable-libpng was given.
diff --git a/sysutils/tracker/files/patch-src_tracker-extract_tracker-cue-sheet.c b/sysutils/tracker/files/patch-src_tracker-extract_tracker-cue-sheet.c
deleted file mode 100644
index a297efe1d016..000000000000
--- a/sysutils/tracker/files/patch-src_tracker-extract_tracker-cue-sheet.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/tracker-extract/tracker-cue-sheet.c.orig 2014-10-01 21:11:49 UTC
-+++ src/tracker-extract/tracker-cue-sheet.c
-@@ -30,7 +30,7 @@
- #include <gst/tag/tag.h>
-
- #if defined(HAVE_LIBCUE)
--#include <libcue/libcue.h>
-+#include <libcue.h>
- #endif
-
- #include <libtracker-common/tracker-file-utils.h>
-@@ -93,7 +93,7 @@ add_cdtext_string_tag (Cdtext *cd_t
-
- static void
- add_cdtext_comment_date_tag (Rem *cd_comments,
-- enum Cmt index,
-+ enum RemType index,
- GstTagList *tag_list,
- const gchar *tag)
- {
-@@ -116,7 +116,7 @@ add_cdtext_comment_date_tag (Rem
-
- static void
- add_cdtext_comment_double_tag (Rem *cd_comments,
-- enum Cmt index,
-+ enum RemType index,
- GstTagList *tag_list,
- const gchar *tag)
- {
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index 981b0477df85..82936a12347a 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -1,134 +1,51 @@
bin/tracker
-bin/tracker-control
-bin/tracker-import
-bin/tracker-info
-bin/tracker-needle
-bin/tracker-preferences
-bin/tracker-search
-bin/tracker-sparql
-bin/tracker-stats
-bin/tracker-tag
-etc/xdg/autostart/tracker-extract.desktop
-etc/xdg/autostart/tracker-miner-apps.desktop
-etc/xdg/autostart/tracker-miner-fs.desktop
-etc/xdg/autostart/tracker-miner-user-guides.desktop
etc/xdg/autostart/tracker-store.desktop
-include/tracker-%%TRACKER_VER%%/libtracker-control/tracker-control.h
-include/tracker-%%TRACKER_VER%%/libtracker-control/tracker-miner-manager.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-data-provider.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-decorator-fs.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-decorator.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-enumerator.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-indexing-tree.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-enum-types.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-enums.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-fs.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-object.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner-online.h
-include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner.h
-include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-generated.h
-include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-ontologies.h
-include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-sparql.h
-include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-version.h
-%%WEB_MINERS%%lib/firefox-addons/extensions/trackerfox@bustany.org
-%%WEB_MINERS%%lib/thunderbird-addons/extensions/trackerbird@bustany.org
-lib/girepository-%%TRACKER_VER%%/Tracker-1.0.typelib
-lib/girepository-%%TRACKER_VER%%/TrackerControl-1.0.typelib
-lib/girepository-%%TRACKER_VER%%/TrackerMiner-1.0.typelib
-lib/libtracker-control-%%TRACKER_VER%%.a
-lib/libtracker-control-%%TRACKER_VER%%.so
-lib/libtracker-control-%%TRACKER_VER%%.so.0
-lib/libtracker-control-%%TRACKER_VER%%.so.0.%%LIBVER%%.0
-lib/libtracker-miner-%%TRACKER_VER%%.a
-lib/libtracker-miner-%%TRACKER_VER%%.so
-lib/libtracker-miner-%%TRACKER_VER%%.so.0
-lib/libtracker-miner-%%TRACKER_VER%%.so.0.%%LIBVER%%.0
-lib/libtracker-sparql-%%TRACKER_VER%%.a
-lib/libtracker-sparql-%%TRACKER_VER%%.so
-lib/libtracker-sparql-%%TRACKER_VER%%.so.0
-lib/libtracker-sparql-%%TRACKER_VER%%.so.0.%%LIBVER%%.0
-@comment %%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-tracker-tags.a
-@comment %%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-tracker-tags.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-bmp.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-bmp.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dvi.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dvi.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dummy.a
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-dummy.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-epub.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-epub.so
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-flac.a
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-flac.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gif.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gif.so
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gstreamer.a
-lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-gstreamer.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-html.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-html.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-icon.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-icon.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-jpeg.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-jpeg.so
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-mp3.a
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-mp3.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice-xml.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice-xml.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-msoffice.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-oasis.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-oasis.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-pdf.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-pdf.so
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-playlist.a
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-playlist.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-png.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-png.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-ps.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-ps.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-text.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-text.so
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-tiff.a
-%%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-tiff.so
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-vorbis.a
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-vorbis.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xmp.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xmp.so
-lib/tracker-%%TRACKER_VER%%/libtracker-common.a
-lib/tracker-%%TRACKER_VER%%/libtracker-common.so
-lib/tracker-%%TRACKER_VER%%/libtracker-common.so.0
-lib/tracker-%%TRACKER_VER%%/libtracker-common.so.0.0.0
-lib/tracker-%%TRACKER_VER%%/libtracker-data.a
-lib/tracker-%%TRACKER_VER%%/libtracker-data.so
-lib/tracker-%%TRACKER_VER%%/libtracker-data.so.0
-lib/tracker-%%TRACKER_VER%%/libtracker-data.so.0.0.0
-lib/tracker-%%TRACKER_VER%%/libtracker-extract.a
-lib/tracker-%%TRACKER_VER%%/libtracker-extract.so
-lib/tracker-%%TRACKER_VER%%/libtracker-extract.so.0
-lib/tracker-%%TRACKER_VER%%/libtracker-extract.so.0.0.0
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-taglib.a
-%%AUDIO_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-taglib.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xps.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-xps.so
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-xmp.a
-%%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/writeback-modules/libwriteback-xmp.so
-libdata/pkgconfig/tracker-control-%%TRACKER_VER%%.pc
-libdata/pkgconfig/tracker-miner-%%TRACKER_VER%%.pc
-libdata/pkgconfig/tracker-sparql-%%TRACKER_VER%%.pc
-libexec/tracker-extract
-libexec/tracker-miner-apps
-libexec/tracker-miner-fs
-libexec/tracker-miner-user-guides
+include/tracker-2.0/libtracker-control/tracker-control.h
+include/tracker-2.0/libtracker-control/tracker-miner-manager.h
+include/tracker-2.0/libtracker-miner/tracker-data-provider.h
+include/tracker-2.0/libtracker-miner/tracker-decorator-fs.h
+include/tracker-2.0/libtracker-miner/tracker-decorator.h
+include/tracker-2.0/libtracker-miner/tracker-indexing-tree.h
+include/tracker-2.0/libtracker-miner/tracker-miner-enum-types.h
+include/tracker-2.0/libtracker-miner/tracker-miner-enums.h
+include/tracker-2.0/libtracker-miner/tracker-miner-fs.h
+include/tracker-2.0/libtracker-miner/tracker-miner-object.h
+include/tracker-2.0/libtracker-miner/tracker-miner-online.h
+include/tracker-2.0/libtracker-miner/tracker-miner-proxy.h
+include/tracker-2.0/libtracker-miner/tracker-miner.h
+include/tracker-2.0/libtracker-sparql/tracker-generated.h
+include/tracker-2.0/libtracker-sparql/tracker-namespace-manager.h
+include/tracker-2.0/libtracker-sparql/tracker-notifier.h
+include/tracker-2.0/libtracker-sparql/tracker-ontologies.h
+include/tracker-2.0/libtracker-sparql/tracker-resource.h
+include/tracker-2.0/libtracker-sparql/tracker-sparql.h
+include/tracker-2.0/libtracker-sparql/tracker-version.h
+lib/girepository-1.0/Tracker-2.0.typelib
+lib/girepository-1.0/TrackerControl-2.0.typelib
+lib/girepository-1.0/TrackerMiner-2.0.typelib
+lib/libtracker-control-2.0.so
+lib/libtracker-control-2.0.so.0
+lib/libtracker-control-2.0.so.%%LIBVER%%
+lib/libtracker-miner-2.0.so
+lib/libtracker-miner-2.0.so.0
+lib/libtracker-miner-2.0.so.%%LIBVER%%
+lib/libtracker-sparql-2.0.so
+lib/libtracker-sparql-2.0.so.0
+lib/libtracker-sparql-2.0.so.%%LIBVER%%
+@comment lib/systemd/user/tracker-store.service
+lib/tracker-2.0/libtracker-common.so
+lib/tracker-2.0/libtracker-common.so.0
+lib/tracker-2.0/libtracker-common.so.0.0.0
+lib/tracker-2.0/libtracker-data.so
+lib/tracker-2.0/libtracker-data.so.0
+lib/tracker-2.0/libtracker-data.so.0.0.0
+libdata/pkgconfig/tracker-control-2.0.pc
+libdata/pkgconfig/tracker-miner-2.0.pc
+libdata/pkgconfig/tracker-sparql-2.0.pc
libexec/tracker-store
-libexec/tracker-writeback
man/man1/tracker-daemon.1.gz
-man/man1/tracker-extract.1.gz
man/man1/tracker-index.1.gz
man/man1/tracker-info.1.gz
-man/man1/tracker-miner-fs.1.gz
-man/man1/tracker-needle.1.gz
-man/man1/tracker-preferences.1.gz
man/man1/tracker-reset.1.gz
man/man1/tracker-search.1.gz
man/man1/tracker-sparql.1.gz
@@ -136,105 +53,125 @@ man/man1/tracker-sql.1.gz
man/man1/tracker-status.1.gz
man/man1/tracker-store.1.gz
man/man1/tracker-tag.1.gz
-man/man1/tracker-writeback.1.gz
-man/man5/tracker-db.cfg.5.gz
-man/man5/tracker-extract.cfg.5.gz
-man/man5/tracker-fts.cfg.5.gz
-man/man5/tracker-miner-fs.cfg.5.gz
-man/man5/tracker-store.cfg.5.gz
-man/man5/tracker-writeback.cfg.5.gz
-share/appdata/tracker-needle.appdata.xml
-share/appdata/tracker-preferences.appdata.xml
-share/applications/tracker-needle.desktop
-share/applications/tracker-preferences.desktop
-%%WEB_MINERS%%share/applications/trackerbird-launcher.desktop
-share/bash-completion/completions/tracker
-share/dbus-1/services/org.freedesktop.Tracker1.Miner.Applications.service
-share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service
-share/dbus-1/services/org.freedesktop.Tracker1.Miner.Files.service
-share/dbus-1/services/org.freedesktop.Tracker1.Miner.Userguides.service
-share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service
share/dbus-1/services/org.freedesktop.Tracker1.service
-share/gir-%%TRACKER_VER%%/Tracker-1.0.gir
-share/gir-%%TRACKER_VER%%/TrackerControl-1.0.gir
-share/gir-%%TRACKER_VER%%/TrackerMiner-1.0.gir
-share/gtk-doc/html/libtracker-control/libtracker-miner-reference.html
-share/gtk-doc/html/libtracker-control/home.png
-share/gtk-doc/html/libtracker-control/ch01.html
-share/gtk-doc/html/libtracker-control/style.css
-share/gtk-doc/html/libtracker-control/right-insensitive.png
-share/gtk-doc/html/libtracker-control/up.png
-share/gtk-doc/html/libtracker-control/libtracker-control.devhelp2
-share/gtk-doc/html/libtracker-control/up-insensitive.png
-share/gtk-doc/html/libtracker-control/left-insensitive.png
+share/gir-1.0/Tracker-2.0.gir
+share/gir-1.0/TrackerControl-2.0.gir
+share/gir-1.0/TrackerMiner-2.0.gir
share/gtk-doc/html/libtracker-control/TrackerMinerManager.html
-share/gtk-doc/html/libtracker-control/right.png
-share/gtk-doc/html/libtracker-control/left.png
share/gtk-doc/html/libtracker-control/annotation-glossary.html
+share/gtk-doc/html/libtracker-control/ch01.html
+share/gtk-doc/html/libtracker-control/home.png
share/gtk-doc/html/libtracker-control/index.html
-share/gtk-doc/html/libtracker-miner/libtracker-miner-TrackerFileEnumerator.html
-share/gtk-doc/html/libtracker-miner/libtracker-miner-TrackerEnumerator.html
-share/gtk-doc/html/libtracker-miner/up-insensitive.png
+share/gtk-doc/html/libtracker-control/left-insensitive.png
+share/gtk-doc/html/libtracker-control/left.png
+share/gtk-doc/html/libtracker-control/libtracker-control.devhelp2
+share/gtk-doc/html/libtracker-control/libtracker-miner-reference.html
+share/gtk-doc/html/libtracker-control/right-insensitive.png
+share/gtk-doc/html/libtracker-control/right.png
+share/gtk-doc/html/libtracker-control/style.css
+share/gtk-doc/html/libtracker-control/tracker-migrating-1-to-2.html
+share/gtk-doc/html/libtracker-control/up-insensitive.png
+share/gtk-doc/html/libtracker-control/up.png
+share/gtk-doc/html/libtracker-miner/TrackerDataProvider.html
share/gtk-doc/html/libtracker-miner/TrackerDecorator.html
-share/gtk-doc/html/libtracker-miner/libtracker-miner-TrackerFileDataProvider.html
+share/gtk-doc/html/libtracker-miner/TrackerDecoratorFS.html
+share/gtk-doc/html/libtracker-miner/TrackerIndexingTree.html
+share/gtk-doc/html/libtracker-miner/TrackerMiner.html
+share/gtk-doc/html/libtracker-miner/TrackerMinerFS.html
+share/gtk-doc/html/libtracker-miner/TrackerMinerOnline.html
+share/gtk-doc/html/libtracker-miner/TrackerMinerProxy.html
+share/gtk-doc/html/libtracker-miner/annotation-glossary.html
share/gtk-doc/html/libtracker-miner/ch02.html
-share/gtk-doc/html/libtracker-miner/left-insensitive.png
-share/gtk-doc/html/libtracker-miner/libtracker-miner-reference.html
-share/gtk-doc/html/libtracker-miner/home.png
-share/gtk-doc/html/libtracker-miner/libtracker-miner-TrackerThumbnailer.html
share/gtk-doc/html/libtracker-miner/ch03.html
+share/gtk-doc/html/libtracker-miner/ch04.html
+share/gtk-doc/html/libtracker-miner/ch05s02.html
+share/gtk-doc/html/libtracker-miner/ch05s03.html
+share/gtk-doc/html/libtracker-miner/ch05s04.html
+share/gtk-doc/html/libtracker-miner/ch05s05.html
+share/gtk-doc/html/libtracker-miner/ch05s06.html
+share/gtk-doc/html/libtracker-miner/ch05s07.html
+share/gtk-doc/html/libtracker-miner/home.png
share/gtk-doc/html/libtracker-miner/index.html
-share/gtk-doc/html/libtracker-miner/right.png
-share/gtk-doc/html/libtracker-miner/libtracker-miner-Media-art-management.html
+share/gtk-doc/html/libtracker-miner/left-insensitive.png
+share/gtk-doc/html/libtracker-miner/left.png
share/gtk-doc/html/libtracker-miner/libtracker-miner-Enumerations.html
+share/gtk-doc/html/libtracker-miner/libtracker-miner-TrackerFileDataProvider.html
+share/gtk-doc/html/libtracker-miner/libtracker-miner-reference.html
+share/gtk-doc/html/libtracker-miner/libtracker-miner.devhelp2
share/gtk-doc/html/libtracker-miner/right-insensitive.png
-share/gtk-doc/html/libtracker-miner/ch05.html
+share/gtk-doc/html/libtracker-miner/right.png
share/gtk-doc/html/libtracker-miner/style.css
+share/gtk-doc/html/libtracker-miner/tracker-migrating-1-to-2.html
share/gtk-doc/html/libtracker-miner/tracker-overview-compiling.html
-share/gtk-doc/html/libtracker-miner/TrackerMiner.html
-share/gtk-doc/html/libtracker-miner/left.png
-share/gtk-doc/html/libtracker-miner/TrackerMinerFS.html
-share/gtk-doc/html/libtracker-miner/annotation-glossary.html
-share/gtk-doc/html/libtracker-miner/libtracker-miner.devhelp2
-share/gtk-doc/html/libtracker-miner/TrackerMinerOnline.html
share/gtk-doc/html/libtracker-miner/tracker-overview.html
-share/gtk-doc/html/libtracker-miner/ch04.html
-share/gtk-doc/html/libtracker-miner/TrackerDecoratorFS.html
+share/gtk-doc/html/libtracker-miner/up-insensitive.png
share/gtk-doc/html/libtracker-miner/up.png
-share/gtk-doc/html/libtracker-miner/TrackerIndexingTree.html
-share/gtk-doc/html/libtracker-miner/TrackerDataProvider.html
-share/gtk-doc/html/libtracker-sparql/tracker-examples-readonly.html
+share/gtk-doc/html/libtracker-sparql/TrackerNotifier.html
+share/gtk-doc/html/libtracker-sparql/TrackerResource.html
+share/gtk-doc/html/libtracker-sparql/TrackerSparqlBuilder.html
+share/gtk-doc/html/libtracker-sparql/TrackerSparqlConnection.html
+share/gtk-doc/html/libtracker-sparql/TrackerSparqlCursor.html
+share/gtk-doc/html/libtracker-sparql/accompanying-metadata.html
+share/gtk-doc/html/libtracker-sparql/annotation-glossary.html
+share/gtk-doc/html/libtracker-sparql/base-ontology.html
+share/gtk-doc/html/libtracker-sparql/ch18s02.html
+share/gtk-doc/html/libtracker-sparql/ch18s03.html
+share/gtk-doc/html/libtracker-sparql/creating-ontology.html
+share/gtk-doc/html/libtracker-sparql/dc-ontology.html
+share/gtk-doc/html/libtracker-sparql/defining-cardinality.html
+share/gtk-doc/html/libtracker-sparql/defining-classes.html
+share/gtk-doc/html/libtracker-sparql/defining-fts-indexes.html
+share/gtk-doc/html/libtracker-sparql/defining-indexes.html
+share/gtk-doc/html/libtracker-sparql/defining-properties.html
+share/gtk-doc/html/libtracker-sparql/defining-uniqueness.html
+share/gtk-doc/html/libtracker-sparql/home.png
+share/gtk-doc/html/libtracker-sparql/index.html
share/gtk-doc/html/libtracker-sparql/left-insensitive.png
-share/gtk-doc/html/libtracker-sparql/tracker-examples-builder.html
-share/gtk-doc/html/libtracker-sparql/up.png
-share/gtk-doc/html/libtracker-sparql/tracker-overview-compiling.html
-share/gtk-doc/html/libtracker-sparql/tracker-examples.html
share/gtk-doc/html/libtracker-sparql/left.png
-share/gtk-doc/html/libtracker-sparql/libtracker-sparql-Version-Information.html
-share/gtk-doc/html/libtracker-sparql/tracker-overview-environment-variables.html
-share/gtk-doc/html/libtracker-sparql/style.css
-share/gtk-doc/html/libtracker-sparql/tracker-overview-connection-methods.html
-share/gtk-doc/html/libtracker-sparql/index.html
-share/gtk-doc/html/libtracker-sparql/tracker-examples-writeonly-with-blank-nodes.html
-share/gtk-doc/html/libtracker-sparql/TrackerSparqlBuilder.html
+share/gtk-doc/html/libtracker-sparql/libtracker-sparql-TrackerNamespaceManager.html
share/gtk-doc/html/libtracker-sparql/libtracker-sparql-Utilities.html
-share/gtk-doc/html/libtracker-sparql/annotation-glossary.html
-share/gtk-doc/html/libtracker-sparql/TrackerSparqlCursor.html
-share/gtk-doc/html/libtracker-sparql/right.png
-share/gtk-doc/html/libtracker-sparql/up-insensitive.png
+share/gtk-doc/html/libtracker-sparql/libtracker-sparql-Version-Information.html
share/gtk-doc/html/libtracker-sparql/libtracker-sparql-reference.html
-share/gtk-doc/html/libtracker-sparql/home.png
+share/gtk-doc/html/libtracker-sparql/libtracker-sparql.devhelp2
+share/gtk-doc/html/libtracker-sparql/nao-Tag.html
+share/gtk-doc/html/libtracker-sparql/nao-ontology.html
+share/gtk-doc/html/libtracker-sparql/nrl-InverseFunctionalProperty.html
+share/gtk-doc/html/libtracker-sparql/nrl-ontology.html
+share/gtk-doc/html/libtracker-sparql/predefined-elements.html
+share/gtk-doc/html/libtracker-sparql/private-daemons.html
+share/gtk-doc/html/libtracker-sparql/rdf-Property.html
+share/gtk-doc/html/libtracker-sparql/rdf-ontology.html
+share/gtk-doc/html/libtracker-sparql/rdfs-Class.html
+share/gtk-doc/html/libtracker-sparql/rdfs-Literal.html
+share/gtk-doc/html/libtracker-sparql/rdfs-Resource.html
+share/gtk-doc/html/libtracker-sparql/recommendations.html
share/gtk-doc/html/libtracker-sparql/right-insensitive.png
-share/gtk-doc/html/libtracker-sparql/tracker-overview.html
-share/gtk-doc/html/libtracker-sparql/TrackerSparqlConnection.html
+share/gtk-doc/html/libtracker-sparql/right.png
+share/gtk-doc/html/libtracker-sparql/style.css
+share/gtk-doc/html/libtracker-sparql/tracker-Namespace.html
+share/gtk-doc/html/libtracker-sparql/tracker-Ontology.html
+share/gtk-doc/html/libtracker-sparql/tracker-examples-builder.html
+share/gtk-doc/html/libtracker-sparql/tracker-examples-readonly.html
+share/gtk-doc/html/libtracker-sparql/tracker-examples-writeonly-with-blank-nodes.html
share/gtk-doc/html/libtracker-sparql/tracker-examples-writeonly.html
-share/gtk-doc/html/libtracker-sparql/libtracker-sparql.devhelp2
-share/icons/hicolor/16x16/apps/tracker.png
-share/icons/hicolor/22x22/apps/tracker.png
-share/icons/hicolor/24x24/apps/tracker.png
-share/icons/hicolor/32x32/apps/tracker.png
-share/icons/hicolor/48x48/apps/tracker.png
-share/icons/hicolor/scalable/apps/tracker.svg
+share/gtk-doc/html/libtracker-sparql/tracker-examples.html
+share/gtk-doc/html/libtracker-sparql/tracker-migrating-1-to-2.html
+share/gtk-doc/html/libtracker-sparql/tracker-ontologies.html
+share/gtk-doc/html/libtracker-sparql/tracker-overview-compiling.html
+share/gtk-doc/html/libtracker-sparql/tracker-overview-connection-methods.html
+share/gtk-doc/html/libtracker-sparql/tracker-overview-environment-variables.html
+share/gtk-doc/html/libtracker-sparql/tracker-overview.html
+share/gtk-doc/html/libtracker-sparql/tracker-private-store.html
+share/gtk-doc/html/libtracker-sparql/up-insensitive.png
+share/gtk-doc/html/libtracker-sparql/up.png
+share/gtk-doc/html/libtracker-sparql/updating-ontology.html
+share/gtk-doc/html/libtracker-sparql/xsd-boolean.html
+share/gtk-doc/html/libtracker-sparql/xsd-date.html
+share/gtk-doc/html/libtracker-sparql/xsd-dateTime.html
+share/gtk-doc/html/libtracker-sparql/xsd-double.html
+share/gtk-doc/html/libtracker-sparql/xsd-integer.html
+share/gtk-doc/html/libtracker-sparql/xsd-ontology.html
+share/gtk-doc/html/libtracker-sparql/xsd-string.html
share/locale/ar/LC_MESSAGES/tracker.mo
share/locale/as/LC_MESSAGES/tracker.mo
share/locale/be@latin/LC_MESSAGES/tracker.mo
@@ -254,12 +191,16 @@ share/locale/et/LC_MESSAGES/tracker.mo
share/locale/eu/LC_MESSAGES/tracker.mo
share/locale/fi/LC_MESSAGES/tracker.mo
share/locale/fr/LC_MESSAGES/tracker.mo
+share/locale/fur/LC_MESSAGES/tracker.mo
share/locale/gl/LC_MESSAGES/tracker.mo
share/locale/he/LC_MESSAGES/tracker.mo
share/locale/hu/LC_MESSAGES/tracker.mo
+share/locale/hr/LC_MESSAGES/tracker.mo
share/locale/id/LC_MESSAGES/tracker.mo
share/locale/it/LC_MESSAGES/tracker.mo
+share/locale/is/LC_MESSAGES/tracker.mo
share/locale/ja/LC_MESSAGES/tracker.mo
+share/locale/kk/LC_MESSAGES/tracker.mo
share/locale/ko/LC_MESSAGES/tracker.mo
share/locale/lt/LC_MESSAGES/tracker.mo
share/locale/lv/LC_MESSAGES/tracker.mo
@@ -267,6 +208,7 @@ share/locale/mk/LC_MESSAGES/tracker.mo
share/locale/ml/LC_MESSAGES/tracker.mo
share/locale/nb/LC_MESSAGES/tracker.mo
share/locale/nds/LC_MESSAGES/tracker.mo
+share/locale/ne/LC_MESSAGES/tracker.mo
share/locale/nl/LC_MESSAGES/tracker.mo
share/locale/oc/LC_MESSAGES/tracker.mo
share/locale/pa/LC_MESSAGES/tracker.mo
@@ -285,94 +227,43 @@ share/locale/tg/LC_MESSAGES/tracker.mo
share/locale/th/LC_MESSAGES/tracker.mo
share/locale/tr/LC_MESSAGES/tracker.mo
share/locale/uk/LC_MESSAGES/tracker.mo
+share/locale/vi/LC_MESSAGES/tracker.mo
share/locale/zh_CN/LC_MESSAGES/tracker.mo
share/locale/zh_HK/LC_MESSAGES/tracker.mo
share/locale/zh_TW/LC_MESSAGES/tracker.mo
-%%DATADIR%%/tracker-backup.xml
-%%DATADIR%%/tracker-extract-priority.xml
-%%DATADIR%%/tracker-extract.xml
-%%DATADIR%%/tracker-miner-files-index.xml
-%%DATADIR%%/tracker-miner.xml
-%%DATADIR%%/tracker-needle.ui
-%%DATADIR%%/tracker-preferences.ui
-%%DATADIR%%/tracker-resources.xml
-%%DATADIR%%/tracker-statistics.xml
-%%DATADIR%%/tracker-status.xml
-%%DATADIR%%/tracker-writeback.xml
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-abw.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-bmp.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-comics.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-dvi.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-ebooks.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-epub.rule
-%%AUDIO_MINERS%%%%DATADIR%%/extract-rules/10-flac.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-gif.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-html.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-ico.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-jpeg.rule
-%%AUDIO_MINERS%%%%DATADIR%%/extract-rules/10-mp3.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-msoffice.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-oasis.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-pdf.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-png.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-ps.rule
-%%DATADIR%%/extract-rules/10-svg.rule
-%%GRAPHIC_MINERS%%%%DATADIR%%/extract-rules/10-tiff.rule
-%%AUDIO_MINERS%%%%DATADIR%%/extract-rules/10-vorbis.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-xmp.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/10-xps.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/11-msoffice-xml.rule
-%%DATADIR%%/extract-rules/15-gstreamer-guess.rule
-%%AUDIO_MINERS%%%%DATADIR%%/extract-rules/15-playlist.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/15-source-code.rule
-%%DATADIR%%/extract-rules/90-gstreamer-audio-generic.rule
-%%DATADIR%%/extract-rules/90-gstreamer-image-generic.rule
-%%DATADIR%%/extract-rules/90-gstreamer-video-generic.rule
-%%DOCUMENT_MINERS%%%%DATADIR%%/extract-rules/90-text-generic.rule
-%%DATADIR%%/miners/org.freedesktop.Tracker1.Miner.Applications.service
-%%DATADIR%%/miners/org.freedesktop.Tracker1.Miner.Extract.service
-%%DATADIR%%/miners/org.freedesktop.Tracker1.Miner.Files.service
-%%DATADIR%%/miners/org.freedesktop.Tracker1.Miner.Userguides.service
-%%DATADIR%%/ontologies/10-xsd.description
-%%DATADIR%%/ontologies/10-xsd.ontology
-%%DATADIR%%/ontologies/11-rdf.description
-%%DATADIR%%/ontologies/11-rdf.ontology
-%%DATADIR%%/ontologies/12-nrl.description
-%%DATADIR%%/ontologies/12-nrl.ontology
-%%DATADIR%%/ontologies/20-dc.description
-%%DATADIR%%/ontologies/20-dc.ontology
-%%DATADIR%%/ontologies/30-nie.description
-%%DATADIR%%/ontologies/30-nie.ontology
-%%DATADIR%%/ontologies/31-nao.description
-%%DATADIR%%/ontologies/31-nao.ontology
-%%DATADIR%%/ontologies/32-nco.description
-%%DATADIR%%/ontologies/32-nco.ontology
-%%DATADIR%%/ontologies/33-nfo.description
-%%DATADIR%%/ontologies/33-nfo.ontology
-%%DATADIR%%/ontologies/34-nmo.description
-%%DATADIR%%/ontologies/34-nmo.ontology
-%%DATADIR%%/ontologies/35-ncal.description
-%%DATADIR%%/ontologies/35-ncal.ontology
-%%DATADIR%%/ontologies/36-scal.description
-%%DATADIR%%/ontologies/36-scal.ontology
-%%DATADIR%%/ontologies/37-nid3.description
-%%DATADIR%%/ontologies/37-nid3.ontology
-%%DATADIR%%/ontologies/38-nmm.description
-%%DATADIR%%/ontologies/38-nmm.ontology
-%%DATADIR%%/ontologies/39-mto.description
-%%DATADIR%%/ontologies/39-mto.ontology
-%%DATADIR%%/ontologies/40-mlo.description
-%%DATADIR%%/ontologies/40-mlo.ontology
-%%DATADIR%%/ontologies/41-mfo.description
-%%DATADIR%%/ontologies/41-mfo.ontology
-%%DATADIR%%/ontologies/89-mtp.description
-%%DATADIR%%/ontologies/89-mtp.ontology
-%%DATADIR%%/ontologies/90-tracker.description
-%%DATADIR%%/ontologies/90-tracker.ontology
-%%DATADIR%%/ontologies/92-slo.description
-%%DATADIR%%/ontologies/92-slo.ontology
-%%DATADIR%%/ontologies/93-libosinfo.description
-%%DATADIR%%/ontologies/93-libosinfo.ontology
+%%DATADIR%%/domain-ontologies/default.rule
+%%DATADIR%%/ontologies/nepomuk/30-nie.description
+%%DATADIR%%/ontologies/nepomuk/30-nie.ontology
+%%DATADIR%%/ontologies/nepomuk/32-nco.description
+%%DATADIR%%/ontologies/nepomuk/32-nco.ontology
+%%DATADIR%%/ontologies/nepomuk/33-nfo.description
+%%DATADIR%%/ontologies/nepomuk/33-nfo.ontology
+%%DATADIR%%/ontologies/nepomuk/34-nmo.description
+%%DATADIR%%/ontologies/nepomuk/34-nmo.ontology
+%%DATADIR%%/ontologies/nepomuk/35-ncal.description
+%%DATADIR%%/ontologies/nepomuk/35-ncal.ontology
+%%DATADIR%%/ontologies/nepomuk/36-scal.description
+%%DATADIR%%/ontologies/nepomuk/36-scal.ontology
+%%DATADIR%%/ontologies/nepomuk/37-nid3.description
+%%DATADIR%%/ontologies/nepomuk/37-nid3.ontology
+%%DATADIR%%/ontologies/nepomuk/38-nmm.description
+%%DATADIR%%/ontologies/nepomuk/38-nmm.ontology
+%%DATADIR%%/ontologies/nepomuk/39-mto.description
+%%DATADIR%%/ontologies/nepomuk/39-mto.ontology
+%%DATADIR%%/ontologies/nepomuk/40-mlo.description
+%%DATADIR%%/ontologies/nepomuk/40-mlo.ontology
+%%DATADIR%%/ontologies/nepomuk/41-mfo.description
+%%DATADIR%%/ontologies/nepomuk/41-mfo.ontology
+%%DATADIR%%/ontologies/nepomuk/89-mtp.description
+%%DATADIR%%/ontologies/nepomuk/89-mtp.ontology
+%%DATADIR%%/ontologies/nepomuk/90-tracker.description
+%%DATADIR%%/ontologies/nepomuk/90-tracker.ontology
+%%DATADIR%%/ontologies/nepomuk/91-maemo.description
+%%DATADIR%%/ontologies/nepomuk/91-maemo.ontology
+%%DATADIR%%/ontologies/nepomuk/92-slo.description
+%%DATADIR%%/ontologies/nepomuk/92-slo.ontology
+%%DATADIR%%/ontologies/nepomuk/93-libosinfo.description
+%%DATADIR%%/ontologies/nepomuk/93-libosinfo.ontology
%%DATADIR%%/stop-words/stopwords.da
%%DATADIR%%/stop-words/stopwords.de
%%DATADIR%%/stop-words/stopwords.en
@@ -386,71 +277,14 @@ share/locale/zh_TW/LC_MESSAGES/tracker.mo
%%DATADIR%%/stop-words/stopwords.pt
%%DATADIR%%/stop-words/stopwords.ru
%%DATADIR%%/stop-words/stopwords.sv
-%%DATADIR%%-tests/01-writeback.py
-share/vala/vapi/tracker-control-%%TRACKER_VER%%.deps
-share/vala/vapi/tracker-control-%%TRACKER_VER%%.vapi
-share/vala/vapi/tracker-miner-%%TRACKER_VER%%.deps
-share/vala/vapi/tracker-miner-%%TRACKER_VER%%.vapi
-share/vala/vapi/tracker-sparql-%%TRACKER_VER%%.deps
-share/vala/vapi/tracker-sparql-%%TRACKER_VER%%.vapi
-%%WEB_MINERS%%share/xul-ext/trackerbird/README
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome.manifest
-%%WEB_MINERS%%share/xul-ext/trackerbird/install.rdf
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/about.xul
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/bindings.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/email-address-parser.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/mailstore.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/namespace.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/options.xul
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/persistent-store.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/plugin.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/queue.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/tb-overlay.xul
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/trackerstore.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/ui.js
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/options.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/options.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/options.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/options.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/options.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/skin/overlay.css
-%%WEB_MINERS%%share/xul-ext/trackerbird/defaults/preferences/prefs.js
-%%WEB_MINERS%%share/xul-ext/trackerfox/COPYRIGHT
-%%WEB_MINERS%%share/xul-ext/trackerfox/README
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome.manifest
-%%WEB_MINERS%%share/xul-ext/trackerfox/install.rdf
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/about.xul
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/bindings.js
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/bookmarks.js
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/ff-overlay.xul
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/namespace.js
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/plugin.js
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/en-US/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/en-US/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/en-US/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/es-ES/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/es-ES/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/es-ES/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/fr-FR/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/fr-FR/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/fr-FR/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/pl-PL/about.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/pl-PL/overlay.dtd
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/pl-PL/overlay.properties
-%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/skin/overlay.css
-%%WEB_MINERS%%share/xul-ext/trackerfox/defaults/preferences/prefs.js
+%%DATADIR%%/tracker-backup.xml
+%%DATADIR%%/tracker-miner.xml
+%%DATADIR%%/tracker-resources.xml
+%%DATADIR%%/tracker-statistics.xml
+%%DATADIR%%/tracker-status.xml
+share/vala/vapi/tracker-control-2.0.deps
+share/vala/vapi/tracker-control-2.0.vapi
+share/vala/vapi/tracker-miner-2.0.deps
+share/vala/vapi/tracker-miner-2.0.vapi
+share/vala/vapi/tracker-sparql-2.0.deps
+share/vala/vapi/tracker-sparql-2.0.vapi
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 01de2cf7f5d0..82f9b20d18ba 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= upower
-PORTVERSION= 0.99.4
+PORTVERSION= 0.99.7
CATEGORIES= sysutils
MASTER_SITES= http://upower.freedesktop.org/releases/
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index 3330b6970243..18307427bda4 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463776909
-SHA256 (upower-0.99.4.tar.xz) = 9ca325a6ccef505529b268ebbbd9becd0ce65a65f6ac7ee31e2e5b17648037b0
-SIZE (upower-0.99.4.tar.xz) = 426292
+TIMESTAMP = 1524943692
+SHA256 (upower-0.99.7.tar.xz) = 24bcc2f6ab25a2533bac70b587bcb019e591293076920f5b5e04bdedc140a401
+SIZE (upower-0.99.7.tar.xz) = 447832
diff --git a/textproc/gspell/Makefile b/textproc/gspell/Makefile
index e2b61f759433..696f0969e450 100644
--- a/textproc/gspell/Makefile
+++ b/textproc/gspell/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gspell
-PORTVERSION= 1.4.1
+PORTVERSION= 1.8.1
CATEGORIES= textproc
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -10,11 +10,15 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Spell checking for GTK+
-LICENSE= GPLv2
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= valac:lang/vala \
iso-codes>=3.57:misc/iso-codes
-LIB_DEPENDS= libenchant.so:textproc/enchant
+LIB_DEPENDS= libenchant-2.so:textproc/enchant2 \
+ libfribidi.so:converters/fribidi
+
+PORTSCOUT= limitw:even
USES= gmake iconv libtool pathfix pkgconfig tar:xz
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 introspection:build \
diff --git a/textproc/gspell/distinfo b/textproc/gspell/distinfo
index 9f81b5df5e85..75eceb0d7954 100644
--- a/textproc/gspell/distinfo
+++ b/textproc/gspell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494188926
-SHA256 (gnome3/gspell-1.4.1.tar.xz) = 442f88fecd7f9e00a6a9d0af2d762744dd3c119217ff11d6739500f75b0f10be
-SIZE (gnome3/gspell-1.4.1.tar.xz) = 408996
+TIMESTAMP = 1529611128
+SHA256 (gnome3/gspell-1.8.1.tar.xz) = 819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5
+SIZE (gnome3/gspell-1.8.1.tar.xz) = 419268
diff --git a/textproc/gspell/pkg-plist b/textproc/gspell/pkg-plist
index a273801aaac6..72419b90c45a 100644
--- a/textproc/gspell/pkg-plist
+++ b/textproc/gspell/pkg-plist
@@ -1,3 +1,4 @@
+bin/gspell-app1
include/gspell-1/gspell/gspell-checker-dialog.h
include/gspell-1/gspell/gspell-checker.h
include/gspell-1/gspell/gspell-entry-buffer.h
@@ -11,11 +12,12 @@ include/gspell-1/gspell/gspell-navigator-text-view.h
include/gspell-1/gspell/gspell-navigator.h
include/gspell-1/gspell/gspell-text-buffer.h
include/gspell-1/gspell/gspell-text-view.h
+include/gspell-1/gspell/gspell-version.h
include/gspell-1/gspell/gspell.h
lib/girepository-1.0/Gspell-1.typelib
lib/libgspell-1.so
-lib/libgspell-1.so.1
-lib/libgspell-1.so.1.2.0
+lib/libgspell-1.so.2
+lib/libgspell-1.so.2.3.0
libdata/pkgconfig/gspell-1.pc
share/gir-1.0/Gspell-1.gir
share/gtk-doc/html/gspell-1.0/GspellChecker.html
@@ -30,34 +32,39 @@ share/gtk-doc/html/gspell-1.0/GspellNavigator.html
share/gtk-doc/html/gspell-1.0/GspellNavigatorTextView.html
share/gtk-doc/html/gspell-1.0/GspellTextBuffer.html
share/gtk-doc/html/gspell-1.0/GspellTextView.html
+share/gtk-doc/html/gspell-1.0/GtkEntry-support.html
+share/gtk-doc/html/gspell-1.0/GtkTextView-support.html
+share/gtk-doc/html/gspell-1.0/annexes.html
share/gtk-doc/html/gspell-1.0/annotation-glossary.html
share/gtk-doc/html/gspell-1.0/api-index-1-2.html
share/gtk-doc/html/gspell-1.0/api-index-1-4.html
+share/gtk-doc/html/gspell-1.0/api-index-1-6.html
share/gtk-doc/html/gspell-1.0/api-index-full.html
-share/gtk-doc/html/gspell-1.0/ch01.html
-share/gtk-doc/html/gspell-1.0/ch02.html
-share/gtk-doc/html/gspell-1.0/ch03.html
-share/gtk-doc/html/gspell-1.0/ch04.html
-share/gtk-doc/html/gspell-1.0/ch05.html
+share/gtk-doc/html/gspell-1.0/api-reference.html
+share/gtk-doc/html/gspell-1.0/core-classes.html
share/gtk-doc/html/gspell-1.0/gspell-1.0.devhelp2
share/gtk-doc/html/gspell-1.0/home.png
share/gtk-doc/html/gspell-1.0/index.html
+share/gtk-doc/html/gspell-1.0/intro.html
+share/gtk-doc/html/gspell-1.0/language-choosers.html
share/gtk-doc/html/gspell-1.0/left-insensitive.png
share/gtk-doc/html/gspell-1.0/left.png
share/gtk-doc/html/gspell-1.0/object-tree.html
-share/gtk-doc/html/gspell-1.0/pt01.html
-share/gtk-doc/html/gspell-1.0/pt02.html
share/gtk-doc/html/gspell-1.0/right-insensitive.png
share/gtk-doc/html/gspell-1.0/right.png
+share/gtk-doc/html/gspell-1.0/spell-checker-dialog.html
share/gtk-doc/html/gspell-1.0/style.css
share/gtk-doc/html/gspell-1.0/up-insensitive.png
share/gtk-doc/html/gspell-1.0/up.png
%%NLS%%share/locale/ar/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/ca/LC_MESSAGES/gspell-1.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/cs/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/da/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/de/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/el/LC_MESSAGES/gspell-1.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/gspell-1.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/es/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/fa/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/fi/LC_MESSAGES/gspell-1.mo
@@ -73,12 +80,16 @@ share/gtk-doc/html/gspell-1.0/up.png
%%NLS%%share/locale/ko/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/lt/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/lv/LC_MESSAGES/gspell-1.mo
+%%NLS%%share/locale/ml/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/nb/LC_MESSAGES/gspell-1.mo
+%%NLS%%share/locale/ne/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/nl/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/oc/LC_MESSAGES/gspell-1.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/pl/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/pt/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/gspell-1.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/ru/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/sk/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/sl/LC_MESSAGES/gspell-1.mo
@@ -87,6 +98,7 @@ share/gtk-doc/html/gspell-1.0/up.png
%%NLS%%share/locale/sv/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/tr/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/vi/LC_MESSAGES/gspell-1.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gspell-1.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/gspell-1.mo
share/vala/vapi/gspell-1.deps
share/vala/vapi/gspell-1.vapi
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index a6a037e003e1..3684e0949f85 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,9 +1,8 @@
# Created by: fenner
# $FreeBSD$
-# $MCom: ports/trunk/textproc/gtk-doc/Makefile 19804 2014-08-13 14:55:11Z kwm $
PORTNAME= gtk-doc
-PORTVERSION= 1.25
+PORTVERSION= 1.28
CATEGORIES= textproc
MASTER_SITES= GNOME
@@ -12,19 +11,30 @@ COMMENT= Code documentation system, originally for GTK+
BUILD_DEPENDS= jade:textproc/jade \
itstool:textproc/itstool \
+ highlight:textproc/highlight \
docbook-xml>0:textproc/docbook-xml \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
rarian-sk-config:textproc/rarian
RUN_DEPENDS= jade:textproc/jade \
docbook-xml>0:textproc/docbook-xml \
+ highlight:textproc/highlight \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
rarian-sk-config:textproc/rarian
DOCBOOK_VERSION= 4.1.2
-USES= gmake gettext-tools pathfix perl5 pkgconfig python tar:xz
+USES= gmake gettext-tools pathfix perl5 pkgconfig python:3.4+ tar:xz
USE_GNOME= gnomeprefix libxslt
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
+post-install:
+ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+ -f -d ${DATADIR}/python/gtkdoc \
+ ${STAGEDIR}${DATADIR}/python/gtkdoc
+ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+ -f -d ${DATADIR}/python/gtkdoc \
+ ${STAGEDIR}${DATADIR}/python/gtkdoc
+
.include <bsd.port.mk>
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index c9576b3e20ae..7799d44e3c4b 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491083060
-SHA256 (gtk-doc-1.25.tar.xz) = 1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42
-SIZE (gtk-doc-1.25.tar.xz) = 673184
+TIMESTAMP = 1525377139
+SHA256 (gtk-doc-1.28.tar.xz) = 911e29e302252c96128965ee1f4067d5431a88e00ad1023a8bc1d6b922af5715
+SIZE (gtk-doc-1.28.tar.xz) = 725972
diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
index 241781a11ad0..545ae92310ff 100644
--- a/textproc/gtk-doc/pkg-plist
+++ b/textproc/gtk-doc/pkg-plist
@@ -3,9 +3,9 @@ bin/gtkdoc-depscan
bin/gtkdoc-fixxref
bin/gtkdoc-mkdb
bin/gtkdoc-mkhtml
+bin/gtkdoc-mkhtml2
bin/gtkdoc-mkman
bin/gtkdoc-mkpdf
-bin/gtkdoc-mktmpl
bin/gtkdoc-rebase
bin/gtkdoc-scan
bin/gtkdoc-scangobj
@@ -17,14 +17,9 @@ libdata/pkgconfig/gtk-doc.pc
share/aclocal/gtk-doc.m4
%%DATADIR%%/data/devhelp2.xsd
%%DATADIR%%/data/devhelp2.xsl
-%%DATADIR%%/data/gtk-doc.dcl
-%%DATADIR%%/data/gtk-doc.dsl
%%DATADIR%%/data/gtk-doc.flat.make
%%DATADIR%%/data/gtk-doc.make
-%%DATADIR%%/data/gtk-doc.notmpl-flat.make
-%%DATADIR%%/data/gtk-doc.notmpl.make
%%DATADIR%%/data/gtk-doc.xsl
-%%DATADIR%%/data/gtkdoc-common.pl
%%DATADIR%%/data/home.png
%%DATADIR%%/data/left-insensitive.png
%%DATADIR%%/data/left.png
@@ -34,10 +29,54 @@ share/aclocal/gtk-doc.m4
%%DATADIR%%/data/up-insensitive.png
%%DATADIR%%/data/up.png
%%DATADIR%%/data/version-greater-or-equal.xsl
+%%DATADIR%%/python/gtkdoc/__init__.py
+%%DATADIR%%/python/gtkdoc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/check.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/check.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/mkdb.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/mkdb.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml2.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml2.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/mkman.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/mkman.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/mkpdf.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/mkpdf.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/rebase.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/rebase.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/scan.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/scan.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/__pycache__/scangobj.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/python/gtkdoc/__pycache__/scangobj.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/python/gtkdoc/check.py
+%%DATADIR%%/python/gtkdoc/common.py
+%%DATADIR%%/python/gtkdoc/config.py
+%%DATADIR%%/python/gtkdoc/fixxref.py
+%%DATADIR%%/python/gtkdoc/md_to_db.py
+%%DATADIR%%/python/gtkdoc/mkdb.py
+%%DATADIR%%/python/gtkdoc/mkhtml.py
+%%DATADIR%%/python/gtkdoc/mkhtml2.py
+%%DATADIR%%/python/gtkdoc/mkman.py
+%%DATADIR%%/python/gtkdoc/mkpdf.py
+%%DATADIR%%/python/gtkdoc/rebase.py
+%%DATADIR%%/python/gtkdoc/scan.py
+%%DATADIR%%/python/gtkdoc/scangobj.py
share/help/C/gtk-doc-manual/fdl-appendix.xml
share/help/C/gtk-doc-manual/index.docbook
share/help/bn_IN/gtk-doc-manual/fdl-appendix.xml
share/help/bn_IN/gtk-doc-manual/index.docbook
+share/help/cs/gtk-doc-manual/fdl-appendix.xml
+share/help/cs/gtk-doc-manual/index.docbook
share/help/de/gtk-doc-manual/fdl-appendix.xml
share/help/de/gtk-doc-manual/index.docbook
share/help/el/gtk-doc-manual/fdl-appendix.xml
diff --git a/textproc/gtkspell3/Makefile b/textproc/gtkspell3/Makefile
index 00de8188d631..91b468810776 100644
--- a/textproc/gtkspell3/Makefile
+++ b/textproc/gtkspell3/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gtkspell3
-PORTVERSION= 3.0.8
+PORTVERSION= 3.0.9
CATEGORIES= textproc gnome
MASTER_SITES= SF/gtkspell/${PORTVERSION}
@@ -12,8 +12,8 @@ COMMENT= GTK+ 3 spell checking component
BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libenchant.so:textproc/enchant
-USE_GNOME= gtk30 intlhack introspection:build
-USES= gettext gmake localbase libtool pathfix pkgconfig
+USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack introspection:build
+USES= gettext gmake localbase libtool pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
diff --git a/textproc/gtkspell3/distinfo b/textproc/gtkspell3/distinfo
index feac87dbdeb9..554afc5a2720 100644
--- a/textproc/gtkspell3/distinfo
+++ b/textproc/gtkspell3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522054936
-SHA256 (gtkspell3-3.0.8.tar.gz) = 011a0ce3f7c2f4b3a5b8f54c55927cdd73e1abf591a284a6d66cfb4cfe2d3fff
-SIZE (gtkspell3-3.0.8.tar.gz) = 450426
+TIMESTAMP = 1524772443
+SHA256 (gtkspell3-3.0.9.tar.xz) = a4f4a4a2789f7499563e26d96b22d8085222ebe278da47d026b2de782b8b4d26
+SIZE (gtkspell3-3.0.9.tar.xz) = 298988
diff --git a/textproc/libgepub/Makefile b/textproc/libgepub/Makefile
index 33862241f9f0..9e3a4a8beb71 100644
--- a/textproc/libgepub/Makefile
+++ b/textproc/libgepub/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= libgepub
-PORTVERSION= 0.4
-PORTREVISION= 1
+PORTVERSION= 0.6.0
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
@@ -15,10 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
libsoup-2.4.so:devel/libsoup
-GNU_CONFIGURE= yes
-USES= gettext-runtime gnome gmake libarchive libtool pathfix \
- pkgconfig tar:xz
-USE_GNOME= atk cairo glib20 gdkpixbuf2 gtk30 libxml2 pango
-INSTALL_TARGET= install-strip
+USES= gettext-runtime gnome libarchive meson pkgconfig tar:xz
+USE_GNOME= gtk30 introspection:build libxml2
.include <bsd.port.mk>
diff --git a/textproc/libgepub/distinfo b/textproc/libgepub/distinfo
index 47ca7acc2b10..79d760f082fb 100644
--- a/textproc/libgepub/distinfo
+++ b/textproc/libgepub/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476870867
-SHA256 (libgepub-0.4.tar.xz) = 5666a1c4d186d205bd2d91b71d4c1cd5426025569114a765dd913a564f149ff4
-SIZE (libgepub-0.4.tar.xz) = 246016
+TIMESTAMP = 1526318187
+SHA256 (libgepub-0.6.0.tar.xz) = c78a395cc1d9c57b4485958ed83ffb96ed442750cfafa7797dd6d986b9f7b399
+SIZE (libgepub-0.6.0.tar.xz) = 26092
diff --git a/textproc/libgepub/pkg-plist b/textproc/libgepub/pkg-plist
index b93725c06d36..c4278c76ed81 100644
--- a/textproc/libgepub/pkg-plist
+++ b/textproc/libgepub/pkg-plist
@@ -1,12 +1,11 @@
-include/libgepub/gepub-archive.h
-include/libgepub/gepub-doc.h
-include/libgepub/gepub-text-chunk.h
-include/libgepub/gepub-widget.h
-include/libgepub/gepub.h
-lib/girepository-1.0/Gepub-0.4.typelib
-lib/libgepub.a
-lib/libgepub.so
-lib/libgepub.so.0
-lib/libgepub.so.0.0.0
-libdata/pkgconfig/libgepub.pc
-share/gir-1.0/Gepub-0.4.gir
+include/libgepub-0.6/gepub-archive.h
+include/libgepub-0.6/gepub-doc.h
+include/libgepub-0.6/gepub-text-chunk.h
+include/libgepub-0.6/gepub-widget.h
+include/libgepub-0.6/gepub.h
+lib/girepository-1.0/Gepub-0.6.typelib
+lib/libgepub-0.6.so
+lib/libgepub-0.6.so.0
+lib/libgepub-0.6.so.0.0.0
+libdata/pkgconfig/libgepub-0.6.pc
+share/gir-1.0/Gepub-0.6.gir
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index b2c95c995bee..c756b98fb676 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= meld
-PORTVERSION= 3.18.0
+PORTVERSION= 3.18.2
CATEGORIES= textproc devel python
MASTER_SITES= GNOME
@@ -25,6 +25,8 @@ PYDISTUTILS_INSTALL_TARGET= --no-update-icon-cache --no-compile-schemas install
INSTALLS_ICONS= yes
NO_ARCH= yes
+PLIST_SUB= PORTVER=${PORTVERSION}
+
.include <bsd.port.pre.mk>
PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} --root=${STAGEDIR}
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index d39bf3c701e2..6a5eefcf0637 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512506220
-SHA256 (meld-3.18.0.tar.xz) = 848158b1e5c7473b9da3ddc16e057aad8951ec82979beb5914b8b4acdf97223e
-SIZE (meld-3.18.0.tar.xz) = 553772
+TIMESTAMP = 1531227251
+SHA256 (meld-3.18.2.tar.xz) = 1934abf4397e6a31b3c3d3d372ddb2aa6e6be499a71d96b114f14707afe93781
+SIZE (meld-3.18.2.tar.xz) = 568292
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index f36b30f52149..5a867ae52d3a 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -169,7 +169,6 @@ bin/meld
man/man1/meld.1.gz
share/appdata/meld.appdata.xml
share/applications/meld.desktop
-%%DOCSDIR%%/NEWS
share/help/C/meld/command-line.page
share/help/C/meld/file-changes.page
share/help/C/meld/file-filters.page
@@ -186,86 +185,6 @@ 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/help/cs/meld/command-line.page
-share/help/cs/meld/file-changes.page
-share/help/cs/meld/file-filters.page
-share/help/cs/meld/file-mode.page
-share/help/cs/meld/flattened-view.page
-share/help/cs/meld/folder-mode.page
-share/help/cs/meld/index.page
-share/help/cs/meld/introduction.page
-share/help/cs/meld/keyboard-shortcuts.page
-share/help/cs/meld/legal.xml
-share/help/cs/meld/missing-functionality.page
-share/help/cs/meld/preferences.page
-share/help/cs/meld/resolving-conflicts.page
-share/help/cs/meld/text-filters.page
-share/help/cs/meld/vc-mode.page
-share/help/cs/meld/vc-supported.page
-share/help/de/meld/command-line.page
-share/help/de/meld/file-changes.page
-share/help/de/meld/file-filters.page
-share/help/de/meld/file-mode.page
-share/help/de/meld/flattened-view.page
-share/help/de/meld/folder-mode.page
-share/help/de/meld/index.page
-share/help/de/meld/introduction.page
-share/help/de/meld/keyboard-shortcuts.page
-share/help/de/meld/legal.xml
-share/help/de/meld/missing-functionality.page
-share/help/de/meld/preferences.page
-share/help/de/meld/resolving-conflicts.page
-share/help/de/meld/text-filters.page
-share/help/de/meld/vc-mode.page
-share/help/de/meld/vc-supported.page
-share/help/el/meld/command-line.page
-share/help/el/meld/file-changes.page
-share/help/el/meld/file-filters.page
-share/help/el/meld/file-mode.page
-share/help/el/meld/flattened-view.page
-share/help/el/meld/folder-mode.page
-share/help/el/meld/index.page
-share/help/el/meld/introduction.page
-share/help/el/meld/keyboard-shortcuts.page
-share/help/el/meld/legal.xml
-share/help/el/meld/missing-functionality.page
-share/help/el/meld/preferences.page
-share/help/el/meld/resolving-conflicts.page
-share/help/el/meld/text-filters.page
-share/help/el/meld/vc-mode.page
-share/help/el/meld/vc-supported.page
-share/help/es/meld/command-line.page
-share/help/es/meld/file-changes.page
-share/help/es/meld/file-filters.page
-share/help/es/meld/file-mode.page
-share/help/es/meld/flattened-view.page
-share/help/es/meld/folder-mode.page
-share/help/es/meld/index.page
-share/help/es/meld/introduction.page
-share/help/es/meld/keyboard-shortcuts.page
-share/help/es/meld/legal.xml
-share/help/es/meld/missing-functionality.page
-share/help/es/meld/preferences.page
-share/help/es/meld/resolving-conflicts.page
-share/help/es/meld/text-filters.page
-share/help/es/meld/vc-mode.page
-share/help/es/meld/vc-supported.page
-share/help/sv/meld/command-line.page
-share/help/sv/meld/file-changes.page
-share/help/sv/meld/file-filters.page
-share/help/sv/meld/file-mode.page
-share/help/sv/meld/flattened-view.page
-share/help/sv/meld/folder-mode.page
-share/help/sv/meld/index.page
-share/help/sv/meld/introduction.page
-share/help/sv/meld/keyboard-shortcuts.page
-share/help/sv/meld/legal.xml
-share/help/sv/meld/missing-functionality.page
-share/help/sv/meld/preferences.page
-share/help/sv/meld/resolving-conflicts.page
-share/help/sv/meld/text-filters.page
-share/help/sv/meld/vc-mode.page
-share/help/sv/meld/vc-supported.page
share/icons/HighContrast/scalable/apps/meld.svg
share/icons/hicolor/16x16/actions/meld-change-apply-left.png
share/icons/hicolor/16x16/actions/meld-change-apply-right.png
@@ -277,6 +196,10 @@ share/icons/hicolor/22x22/apps/meld.png
share/icons/hicolor/32x32/apps/meld.png
share/icons/hicolor/48x48/apps/meld-version-control.png
share/icons/hicolor/48x48/apps/meld.png
+share/icons/hicolor/scalable/apps/meld-figuring-linked.svg
+share/icons/hicolor/scalable/apps/meld-figuring.svg
+share/icons/hicolor/scalable/apps/meld-unlinking-plus-overlay.svg
+share/icons/hicolor/scalable/apps/meld-unlinking.svg
share/icons/hicolor/scalable/apps/meld.svg
share/locale/ar/LC_MESSAGES/meld.mo
share/locale/bg/LC_MESSAGES/meld.mo
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index 8e813bc058ed..0853ab7a582f 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sary
PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= http://sary.sourceforge.net/
diff --git a/textproc/sary/files/patch-sary_builder.c b/textproc/sary/files/patch-sary_builder.c
new file mode 100644
index 000000000000..05902dcc52ea
--- /dev/null
+++ b/textproc/sary/files/patch-sary_builder.c
@@ -0,0 +1,29 @@
+--- sary/builder.c.orig 2005-01-28 08:50:24 UTC
++++ sary/builder.c
+@@ -45,7 +45,7 @@ struct _SaryBuilder{
+ gpointer progress_func_data;
+ };
+
+-static SaryInt index (SaryBuilder *builder,
++static SaryInt sary_index (SaryBuilder *builder,
+ SaryProgress *progress,
+ SaryWriter *writer);
+ static void progress_quiet (SaryProgress *progress);
+@@ -124,7 +124,7 @@ sary_builder_index (SaryBuilder *builder)
+ builder->progress_func,
+ builder->progress_func_data);
+
+- count = index(builder, progress, writer);
++ count = sary_index(builder, progress, writer);
+
+ sary_progress_destroy(progress);
+ sary_writer_destroy(writer);
+@@ -219,7 +219,7 @@ sary_builder_connect_progress (SaryBuilder *builder,
+ }
+
+ static SaryInt
+-index (SaryBuilder *builder, SaryProgress *progress, SaryWriter *writer)
++sary_index (SaryBuilder *builder, SaryProgress *progress, SaryWriter *writer)
+ {
+ gchar *bof, *cursor;
+ SaryInt count;
diff --git a/textproc/sary/files/patch-src_mksary.c b/textproc/sary/files/patch-src_mksary.c
new file mode 100644
index 000000000000..f2bbaaf10e1a
--- /dev/null
+++ b/textproc/sary/files/patch-src_mksary.c
@@ -0,0 +1,38 @@
+--- src/mksary.c.orig 2004-06-11 18:57:28 UTC
++++ src/mksary.c
+@@ -59,7 +59,7 @@ CodesetFunc codeset_func_tab[] = {
+ static SaryIpointFunc dispatch_codeset_func (const gchar *codeset);
+ static SaryBuilder* new_builder (const gchar *file_name,
+ const gchar *array_name);
+-static void index (SaryBuilder *builder,
++static void mk_index (SaryBuilder *builder,
+ const gchar *file_name,
+ const gchar *array_name);
+ static void sort (SaryBuilder *builder,
+@@ -149,7 +149,7 @@ new_builder (const gchar *file_name, const gchar *arra
+ }
+
+ static void
+-index (SaryBuilder *builder,
++mk_index (SaryBuilder *builder,
+ const gchar *file_name,
+ const gchar *array_name)
+ {
+@@ -186,7 +186,7 @@ index_and_sort (SaryBuilder *builder,
+ const gchar *file_name,
+ const gchar *array_name)
+ {
+- index(builder, file_name, array_name);
++ mk_index(builder, file_name, array_name);
+ sort(builder, file_name, array_name);
+ }
+
+@@ -358,7 +358,7 @@ parse_options (int argc, char **argv)
+ show_help();
+ break;
+ case 'i':
+- process = index;
++ process = mk_index;
+ break;
+ case 'l':
+ ipoint_func = sary_ipoint_line;
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 3f1fe4f642bc..b7f9fb6fc776 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -3,8 +3,8 @@
PORTNAME= xmlroff
PORTVERSION= 0.6.2
-PORTREVISION= 7
DISTVERSIONPREFIX= v
+PORTREVISION= 7
CATEGORIES= textproc
MAINTAINER= hrs@FreeBSD.org
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= libfo>=0.6.2:textproc/libfo
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= autoreconf gmake gettext libtool pkgconfig
+USES= autoreconf gmake gnome gettext libtool pkgconfig
USE_GITHUB= yes
USE_GNOME= libgnomeprint libartlgpl2 pango glib20 \
libxslt libxml2 gdkpixbuf2
@@ -24,11 +24,14 @@ GH_ACCOUNT= xmlroff
GH_PROJECT= xmlroff
WRKSRC_SUBDIR= ${PORTNAME}
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc --enable-man
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= DOCS
DOCS_CONFIGURE_ENABLE= gtk-doc
DOCS_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-doc.pc:textproc/gtk-doc
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/docs/Makefile.am
+
.include <bsd.port.mk>
diff --git a/textproc/xmlroff/files/patch-configure.ac b/textproc/xmlroff/files/patch-configure.ac
index d06c812b2090..167fdcd402ef 100644
--- a/textproc/xmlroff/files/patch-configure.ac
+++ b/textproc/xmlroff/files/patch-configure.ac
@@ -5,11 +5,11 @@
#
-# Checks for libxslt
--#
--# Variables for libxslt will also include values appropriate for
--# libxml2.
+# Checks for libfo
#
+-# Variables for libxslt will also include values appropriate for
+-# libxml2.
+-#
-LIBXSLT_PACKAGES=libxslt
-LIBXSLT_REQUIRED_VERSION=1.0.3
+LIBFO_PACKAGES=libfo-0.6
diff --git a/textproc/xmlroff/files/patch-docs-Makefile.am b/textproc/xmlroff/files/patch-docs-Makefile.am
index 17785cf54cfa..3d634b20c5e1 100644
--- a/textproc/xmlroff/files/patch-docs-Makefile.am
+++ b/textproc/xmlroff/files/patch-docs-Makefile.am
@@ -9,16 +9,73 @@
$(PANGO_LIBS) \
$(GNOMEPRINT_LIBS) \
$(GDKPIXBUF_LIBS) \
-@@ -228,7 +228,7 @@ dist-hook-local:
- DOCBOOK_XSL=http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl
+@@ -203,7 +203,7 @@ if ENABLE_MAN
+ man_MANS = xmlroff.1
+
+ .xml.1:
+- @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
++ @XSLTPROC@ -nonet file://%%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $<
+
+ BUILT_EXTRA_DIST = $(man_MANS)
+ endif
+@@ -225,10 +225,10 @@ dist-hook-local:
+ # done
+
+ # Location of DocBook XSL stylesheet.
+-DOCBOOK_XSL=http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl
++DOCBOOK_XSL=file://%%LOCALBASE%%/share/xsl/docbook/fo/docbook.xsl
xmlroff.fo: xmlroff.xml ../libfo-compat.xsl
- xsltproc $(DOCBOOK_XSL) xmlroff.xml > xmlroff.tmp
-+ env XML_CATALOG_FILES=file://${LOCALBASE}/share/xml/catalog xsltproc --nonet $(DOCBOOK_XSL) xmlroff.xml > xmlroff.tmp
++ env XML_CATALOG_FILES=file://%%LOCALBASE%%/share/xml/catalog xsltproc --nonet $(DOCBOOK_XSL) xmlroff.xml > xmlroff.tmp
xsltproc ../libfo-compat.xsl xmlroff.tmp > xmlroff.fo
rm -f xmlroff.tmp
-@@ -341,8 +341,6 @@ install-data-local:
+@@ -254,8 +254,8 @@ EXTRA_DIST = \
+ $(DOC_MODULE)-sections.txt \
+ $(DOC_MODULE)-overrides.txt
+
+-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++DOC_STAMPS=scan-build.stamp sgml-build.stamp html-build.stamp \
++ $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -286,22 +286,9 @@ scan-build.stamp: $(HFILE_GLOB)
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+ @true
+
+-#### templates ####
+-
+-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+- @echo '*** Rebuilding template files ***'
+- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+- touch tmpl-build.stamp
+-
+-tmpl.stamp: tmpl-build.stamp
+- @true
+-
+-tmpl/*.sgml:
+- @true
+-
+ #### sgml ####
+
+-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
++sgml-build.stamp: scan-build.stamp $(CFILE_GLOB)
+ @echo '*** Building SGML ***'
+ cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
+@@ -319,7 +306,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(c
+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @echo '-- Fixing Crossreferences'
+- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ cd $(srcdir) && gtkdoc-fixxref --module=xmlroff --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ touch html-build.stamp
+ endif
+
+@@ -341,8 +328,6 @@ install-data-local:
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
@@ -27,3 +84,14 @@
fi)
#
+@@ -357,10 +342,8 @@ dist-check-gtkdoc:
+ endif
+
+ dist-hook: dist-check-gtkdoc dist-hook-local
+- mkdir $(distdir)/tmpl
+ mkdir $(distdir)/xml
+ mkdir $(distdir)/html
+- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
+ -cp $(srcdir)/html/* $(distdir)/html
+
diff --git a/textproc/xmlroff/pkg-plist b/textproc/xmlroff/pkg-plist
index fd427c0e7bb4..18756ea12c51 100644
--- a/textproc/xmlroff/pkg-plist
+++ b/textproc/xmlroff/pkg-plist
@@ -344,3 +344,4 @@ share/xml/libfo-0.6.2/xmlroff.xml
%%PORTDOCS%%%%DOCSDIR%%/xmlroff.1.html
%%PORTDOCS%%%%DOCSDIR%%/xmlroff.css
%%PORTDOCS%%%%DOCSDIR%%/xmlroff.devhelp2
+man/man1/xmlroff.1.gz
diff --git a/textproc/yelp-tools/Makefile b/textproc/yelp-tools/Makefile
index 73c3d8c9808b..91eeb2aa8e83 100644
--- a/textproc/yelp-tools/Makefile
+++ b/textproc/yelp-tools/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= yelp-tools
-PORTVERSION= 3.18.0
+PORTVERSION= 3.28.0
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/textproc/yelp-tools/distinfo b/textproc/yelp-tools/distinfo
index 9bad2422d005..7a57d5ffacf7 100644
--- a/textproc/yelp-tools/distinfo
+++ b/textproc/yelp-tools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/yelp-tools-3.18.0.tar.xz) = c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932
-SIZE (gnome3/yelp-tools-3.18.0.tar.xz) = 210712
+TIMESTAMP = 1525379451
+SHA256 (gnome3/yelp-tools-3.28.0.tar.xz) = 82dbfeea2359dfef8ee92c7580c7f03768d12f9bf67d839f03a5e9b0686dc1ac
+SIZE (gnome3/yelp-tools-3.28.0.tar.xz) = 210496
diff --git a/textproc/yelp-xsl/Makefile b/textproc/yelp-xsl/Makefile
index ee9bbe30620d..f3db1c14487b 100644
--- a/textproc/yelp-xsl/Makefile
+++ b/textproc/yelp-xsl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= yelp-xsl
-PORTVERSION= 3.18.1
+PORTVERSION= 3.28.0
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -14,10 +14,9 @@ PORTSCOUT= limitw:1,even
BUILD_DEPENDS= itstool:textproc/itstool
-USES= gettext gmake gnome pathfix pkgconfig tar:xz
+USES= gettext gmake gnome localbase pathfix \
+ pkgconfig tar:xz
USE_GNOME= gnomeprefix intlhack libxml2 libxslt
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/textproc/yelp-xsl/distinfo b/textproc/yelp-xsl/distinfo
index 1fe1467bf8ab..ae1a61d55923 100644
--- a/textproc/yelp-xsl/distinfo
+++ b/textproc/yelp-xsl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/yelp-xsl-3.18.1.tar.xz) = 00870fbe59a1bc7797b385fce16386917e2987c404e9b5a7adcf0036f1c1ba62
-SIZE (gnome3/yelp-xsl-3.18.1.tar.xz) = 565376
+TIMESTAMP = 1525379363
+SHA256 (gnome3/yelp-xsl-3.28.0.tar.xz) = 8ccdf47b31acbdd26a7380b3bc6700742a7aff91a54dab279fd5ea8b43b53f93
+SIZE (gnome3/yelp-xsl-3.28.0.tar.xz) = 509828
diff --git a/textproc/yelp-xsl/pkg-plist b/textproc/yelp-xsl/pkg-plist
index dff3a67f6369..9638cc480a69 100644
--- a/textproc/yelp-xsl/pkg-plist
+++ b/textproc/yelp-xsl/pkg-plist
@@ -1,62 +1,16 @@
libdata/pkgconfig/yelp-xsl.pc
-%%DATADIR%%/icons/hicolor/24x24/status/yelp-note-bug.png
-%%DATADIR%%/icons/hicolor/24x24/status/yelp-note-important.png
-%%DATADIR%%/icons/hicolor/24x24/status/yelp-note-tip.png
-%%DATADIR%%/icons/hicolor/24x24/status/yelp-note-warning.png
-%%DATADIR%%/icons/hicolor/24x24/status/yelp-note.png
-%%DATADIR%%/icons/hicolor/48x48/status/yelp-note-bug.png
-%%DATADIR%%/icons/hicolor/48x48/status/yelp-note-important.png
-%%DATADIR%%/icons/hicolor/48x48/status/yelp-note-tip.png
-%%DATADIR%%/icons/hicolor/48x48/status/yelp-note-warning.png
-%%DATADIR%%/icons/hicolor/48x48/status/yelp-note.png
-%%DATADIR%%/icons/hicolor/scalable/status/yelp-note-bug.svg
-%%DATADIR%%/icons/hicolor/scalable/status/yelp-note-important.svg
-%%DATADIR%%/icons/hicolor/scalable/status/yelp-note-tip.svg
-%%DATADIR%%/icons/hicolor/scalable/status/yelp-note-warning.svg
-%%DATADIR%%/icons/hicolor/scalable/status/yelp-note.svg
-%%DATADIR%%/js/jquery.js
-%%DATADIR%%/js/jquery.syntax.brush.apache.js
-%%DATADIR%%/js/jquery.syntax.brush.applescript.js
-%%DATADIR%%/js/jquery.syntax.brush.assembly.js
-%%DATADIR%%/js/jquery.syntax.brush.bash-script.js
-%%DATADIR%%/js/jquery.syntax.brush.bash.js
-%%DATADIR%%/js/jquery.syntax.brush.basic.js
-%%DATADIR%%/js/jquery.syntax.brush.clang.js
-%%DATADIR%%/js/jquery.syntax.brush.csharp.js
-%%DATADIR%%/js/jquery.syntax.brush.css.js
-%%DATADIR%%/js/jquery.syntax.brush.diff.js
-%%DATADIR%%/js/jquery.syntax.brush.go.js
-%%DATADIR%%/js/jquery.syntax.brush.haskell.js
-%%DATADIR%%/js/jquery.syntax.brush.html.js
-%%DATADIR%%/js/jquery.syntax.brush.io.js
-%%DATADIR%%/js/jquery.syntax.brush.java.js
-%%DATADIR%%/js/jquery.syntax.brush.javascript.js
-%%DATADIR%%/js/jquery.syntax.brush.kai.js
-%%DATADIR%%/js/jquery.syntax.brush.lisp.js
-%%DATADIR%%/js/jquery.syntax.brush.lua.js
-%%DATADIR%%/js/jquery.syntax.brush.ocaml.js
-%%DATADIR%%/js/jquery.syntax.brush.ooc.js
-%%DATADIR%%/js/jquery.syntax.brush.pascal.js
-%%DATADIR%%/js/jquery.syntax.brush.perl5.js
-%%DATADIR%%/js/jquery.syntax.brush.php-script.js
-%%DATADIR%%/js/jquery.syntax.brush.php.js
-%%DATADIR%%/js/jquery.syntax.brush.plain.js
-%%DATADIR%%/js/jquery.syntax.brush.protobuf.js
-%%DATADIR%%/js/jquery.syntax.brush.python.js
-%%DATADIR%%/js/jquery.syntax.brush.ruby.js
-%%DATADIR%%/js/jquery.syntax.brush.scala.js
-%%DATADIR%%/js/jquery.syntax.brush.smalltalk.js
-%%DATADIR%%/js/jquery.syntax.brush.sql.js
-%%DATADIR%%/js/jquery.syntax.brush.super-collider.js
-%%DATADIR%%/js/jquery.syntax.brush.xml.js
-%%DATADIR%%/js/jquery.syntax.brush.yaml.js
-%%DATADIR%%/js/jquery.syntax.core.js
-%%DATADIR%%/js/jquery.syntax.js
-%%DATADIR%%/js/jquery.syntax.layout.yelp.js
+%%DATADIR%%/js/highlight.pack.js
%%DATADIR%%/xslt/common/color.xsl
%%DATADIR%%/xslt/common/domains/yelp-xsl.xml
%%DATADIR%%/xslt/common/html.xsl
%%DATADIR%%/xslt/common/icons.xsl
+%%DATADIR%%/xslt/common/icons/yelp-note-advanced.svg
+%%DATADIR%%/xslt/common/icons/yelp-note-bug.svg
+%%DATADIR%%/xslt/common/icons/yelp-note-important.svg
+%%DATADIR%%/xslt/common/icons/yelp-note-note.svg
+%%DATADIR%%/xslt/common/icons/yelp-note-package.svg
+%%DATADIR%%/xslt/common/icons/yelp-note-tip.svg
+%%DATADIR%%/xslt/common/icons/yelp-note-warning.svg
%%DATADIR%%/xslt/common/l10n-numbers.xsl
%%DATADIR%%/xslt/common/l10n.xsl
%%DATADIR%%/xslt/common/ttml.xsl
@@ -96,7 +50,6 @@ libdata/pkgconfig/yelp-xsl.pc
%%DATADIR%%/xslt/mallard/common/mal-sort.xsl
%%DATADIR%%/xslt/mallard/html/mal2html-api.xsl
%%DATADIR%%/xslt/mallard/html/mal2html-block.xsl
-%%DATADIR%%/xslt/mallard/html/mal2html-facets.xsl
%%DATADIR%%/xslt/mallard/html/mal2html-gloss.xsl
%%DATADIR%%/xslt/mallard/html/mal2html-inline.xsl
%%DATADIR%%/xslt/mallard/html/mal2html-links.xsl
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 568ea60fc482..bb5a4c2afdf6 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= epiphany
-PORTVERSION= 3.24.2
-PORTREVISION= 7
+PORTVERSION= 3.28.3.1
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -20,6 +19,7 @@ BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \
LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
libsoup-2.4.so:devel/libsoup \
libsoup-gnome-2.4.so:devel/libsoup-gnome \
+ libsoup-2.4.so:devel/libsoup \
libgcr-3.so:security/gcr \
libstartup-notification-1.so:x11/startup-notification \
libnss3.so:security/nss \
@@ -27,6 +27,8 @@ LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
libicuuc.so:devel/icu \
libavahi-gobject.so:net/avahi-app \
libnotify.so:devel/libnotify \
+ libgmp.so:math/gmp \
+ libnettle.so:security/nettle \
libsecret-1.so:security/libsecret \
libp11-kit.so:security/p11-kit
RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
@@ -36,26 +38,20 @@ RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
PORTSCOUT= limitw:1,even
-USES= compiler:c++11-lib cpe desktop-file-utils gettext gmake gnome \
- libtool localbase pathfix pkgconfig python:3.3+ sqlite tar:xz
+USES= compiler:c++11-lib cpe desktop-file-utils gettext gnome \
+ localbase:ldflags meson pkgconfig python:3.4+ shebangfix \
+ sqlite tar:xz
CPE_VENDOR= gnome
USE_GNOME= cairo gnomedesktop3 intlhack libwnck3 libxml2 libxslt
USE_XORG= x11
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=\
- --with-distributor-name="FreeBSD GNOME Project"
-# --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
-INSTALL_TARGET= install-strip
-
+MESON_ARGS= -Ddistributor_name="GNOME Web by the FreeBSD GNOME Project" \
+ -Dunit_tests=false
GLIB_SCHEMAS= org.gnome.Epiphany.enums.xml \
org.gnome.epiphany.gschema.xml
+SHEBANG_FILES= post_install.py
PLIST_SUB+= EPHY_VERSION=${PORTVERSION:R}
-post-patch:
- @${REINPLACE_CMD} -e 's|execinfo.h|#|g ; s|-ldl"$$|"|g' \
- ${WRKSRC}/configure
-
.include <bsd.port.mk>
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index dc709511b025..a8edff3de36a 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494537247
-SHA256 (gnome3/epiphany-3.24.2.tar.xz) = 5abc0d0c60591df5236ac9b8979dc9f7d9acbb8ad0902b4772d2b7beea81c58d
-SIZE (gnome3/epiphany-3.24.2.tar.xz) = 3439968
+TIMESTAMP = 1528490824
+SHA256 (gnome3/epiphany-3.28.3.1.tar.xz) = 690546a701f046c5c2b3a092659589ea6e17cb0f9a81ec3fdb3046b00cede6f7
+SIZE (gnome3/epiphany-3.28.3.1.tar.xz) = 4475124
diff --git a/www/epiphany/files/patch-src_ephy-window.c b/www/epiphany/files/patch-src_ephy-window.c
deleted file mode 100644
index 6f2eb9d22356..000000000000
--- a/www/epiphany/files/patch-src_ephy-window.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/ephy-window.c.orig 2018-03-27 15:41:00 UTC
-+++ src/ephy-window.c
-@@ -1301,13 +1301,6 @@ webkit_context_menu_item_new_from_gaction_with_paramet
- #pragma GCC diagnostic pop
- }
-
--static WebKitContextMenuItem *
--webkit_context_menu_item_new_from_gaction (GAction *action,
-- const char *label)
--{
-- return webkit_context_menu_item_new_from_gaction_with_parameter (action, label, NULL);
--}
--
- static char *
- ellipsize_string (const char *string,
- glong max_length)
-@@ -1380,7 +1373,7 @@ add_action_to_context_menu (WebKitContextMenu *context
- action = g_action_map_lookup_action (G_ACTION_MAP (action_group), name);
- label = g_hash_table_lookup (window->action_labels, name);
- if (strcmp (label, "search-selection-placeholder") != 0) {
-- webkit_context_menu_append (context_menu, webkit_context_menu_item_new_from_gaction (action, _(label)));
-+ webkit_context_menu_append (context_menu, webkit_context_menu_item_new_from_gaction_with_parameter (action, _(label), NULL));
- } else {
- search_term = g_variant_get_string (target, NULL);
- search_label = format_search_label (search_term);
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 921da01ae9da..23156071452d 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,15 +1,15 @@
bin/epiphany
lib/epiphany/libephymain.so
lib/epiphany/libephymisc.so
+lib/epiphany/libephysync.so
lib/epiphany/web-extensions/libephywebextension.so
libexec/epiphany-search-provider
libexec/epiphany/ephy-profile-migrator
man/man1/epiphany.1.gz
-share/appdata/org.gnome.Epiphany.appdata.xml
share/applications/org.gnome.Epiphany.desktop
-share/dbus-1/services/org.gnome.EpiphanySearchProvider.service
+share/dbus-1/services/org.gnome.Epiphany.SearchProvider.service
%%DATADIR%%/default-bookmarks.rdf
-share/gnome-shell/search-providers/epiphany-search-provider.ini
+share/gnome-shell/search-providers/org.gnome.Epiphany.search-provider.ini
share/help/C/epiphany/browse-local.page
share/help/C/epiphany/browse-private.page
share/help/C/epiphany/browse-tab.page
@@ -178,6 +178,34 @@ share/help/fr/epiphany/pref-passwords.page
share/help/fr/epiphany/pref.page
share/help/fr/epiphany/prob-restore-closed-page.page
share/help/fr/epiphany/proxy.page
+share/help/gl/epiphany/browse-local.page
+share/help/gl/epiphany/browse-private.page
+share/help/gl/epiphany/browse-tab.page
+share/help/gl/epiphany/browse-web.page
+share/help/gl/epiphany/browse-webapps-del.page
+share/help/gl/epiphany/browse-webapps.page
+share/help/gl/epiphany/cert.page
+share/help/gl/epiphany/cookies.xml
+share/help/gl/epiphany/data-cookies.page
+share/help/gl/epiphany/data-passwords.page
+share/help/gl/epiphany/history-delete.page
+share/help/gl/epiphany/history.page
+share/help/gl/epiphany/index.page
+share/help/gl/epiphany/introduction.page
+share/help/gl/epiphany/keyboard-shortcut.page
+share/help/gl/epiphany/legal.xml
+share/help/gl/epiphany/media/epiphany-3-12.png
+share/help/gl/epiphany/media/private-browsing-3-12.png
+share/help/gl/epiphany/media/web-browser.png
+share/help/gl/epiphany/pref-cookies.page
+share/help/gl/epiphany/pref-css.page
+share/help/gl/epiphany/pref-do-not-track.page
+share/help/gl/epiphany/pref-downloads.page
+share/help/gl/epiphany/pref-font.page
+share/help/gl/epiphany/pref-passwords.page
+share/help/gl/epiphany/pref.page
+share/help/gl/epiphany/prob-restore-closed-page.page
+share/help/gl/epiphany/proxy.page
share/help/hu/epiphany/browse-local.page
share/help/hu/epiphany/browse-private.page
share/help/hu/epiphany/browse-tab.page
@@ -234,6 +262,34 @@ share/help/ko/epiphany/pref-passwords.page
share/help/ko/epiphany/pref.page
share/help/ko/epiphany/prob-restore-closed-page.page
share/help/ko/epiphany/proxy.page
+share/help/pl/epiphany/browse-local.page
+share/help/pl/epiphany/browse-private.page
+share/help/pl/epiphany/browse-tab.page
+share/help/pl/epiphany/browse-web.page
+share/help/pl/epiphany/browse-webapps-del.page
+share/help/pl/epiphany/browse-webapps.page
+share/help/pl/epiphany/cert.page
+share/help/pl/epiphany/cookies.xml
+share/help/pl/epiphany/data-cookies.page
+share/help/pl/epiphany/data-passwords.page
+share/help/pl/epiphany/history-delete.page
+share/help/pl/epiphany/history.page
+share/help/pl/epiphany/index.page
+share/help/pl/epiphany/introduction.page
+share/help/pl/epiphany/keyboard-shortcut.page
+share/help/pl/epiphany/legal.xml
+share/help/pl/epiphany/media/epiphany-3-12.png
+share/help/pl/epiphany/media/private-browsing-3-12.png
+share/help/pl/epiphany/media/web-browser.png
+share/help/pl/epiphany/pref-cookies.page
+share/help/pl/epiphany/pref-css.page
+share/help/pl/epiphany/pref-do-not-track.page
+share/help/pl/epiphany/pref-downloads.page
+share/help/pl/epiphany/pref-font.page
+share/help/pl/epiphany/pref-passwords.page
+share/help/pl/epiphany/pref.page
+share/help/pl/epiphany/prob-restore-closed-page.page
+share/help/pl/epiphany/proxy.page
share/help/pt_BR/epiphany/browse-local.page
share/help/pt_BR/epiphany/browse-private.page
share/help/pt_BR/epiphany/browse-tab.page
@@ -324,6 +380,7 @@ share/icons/hicolor/32x32/apps/org.gnome.Epiphany.png
share/icons/hicolor/48x48/apps/org.gnome.Epiphany.png
share/icons/hicolor/512x512/apps/org.gnome.Epiphany.png
share/icons/hicolor/symbolic/apps/org.gnome.Epiphany-symbolic.svg
+share/locale/af/LC_MESSAGES/epiphany.mo
share/locale/am/LC_MESSAGES/epiphany.mo
share/locale/an/LC_MESSAGES/epiphany.mo
share/locale/ar/LC_MESSAGES/epiphany.mo
@@ -425,3 +482,4 @@ share/locale/yo/LC_MESSAGES/epiphany.mo
share/locale/zh_CN/LC_MESSAGES/epiphany.mo
share/locale/zh_HK/LC_MESSAGES/epiphany.mo
share/locale/zh_TW/LC_MESSAGES/epiphany.mo
+share/metainfo/org.gnome.Epiphany.appdata.xml
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index ab8abbc97d41..741125e859ad 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -1,27 +1,28 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/www/libepc/Makefile 19822 2014-08-20 08:57:46Z gusi $
PORTNAME= libepc
-PORTVERSION= 0.4.4
-PORTREVISION= 2
+PORTVERSION= 0.4.6
CATEGORIES= www
MASTER_SITES= GNOME
MAINTAINER= kwm@FreeBSD.org
COMMENT= The Easy Publish and Consume library
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+ libfribidi.so:converters/fribidi \
libsoup-2.4.so:devel/libsoup \
libgnutls.so:security/gnutls \
+ libavahi-common.so:net/avahi-app \
libavahi-ui-gtk3.so:net/avahi-gtk3
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= gnomeprefix gtk30 intltool
+USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USE_GNOME= gnomeprefix cairo gdkpixbuf2 gtk30 intltool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/www/libepc/distinfo b/www/libepc/distinfo
index c819410a1122..e944982fe54e 100644
--- a/www/libepc/distinfo
+++ b/www/libepc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libepc-0.4.4.tar.xz) = 4f98fc306c0f9d361e1381484744246efd084053732924741078270c49afc33b
-SIZE (libepc-0.4.4.tar.xz) = 375332
+TIMESTAMP = 1507321953
+SHA256 (libepc-0.4.6.tar.xz) = 215990847a8526c85774cb74fbcaea4c46866df58281b21dce5a62aac5da7ae8
+SIZE (libepc-0.4.6.tar.xz) = 400464
diff --git a/www/libepc/pkg-plist b/www/libepc/pkg-plist
index 9c5646163539..fedd21c59b78 100644
--- a/www/libepc/pkg-plist
+++ b/www/libepc/pkg-plist
@@ -20,33 +20,8 @@ lib/libepc-ui-1.0.so.3
lib/libepc-ui-1.0.so.3.0.0
libdata/pkgconfig/libepc-1.0.pc
libdata/pkgconfig/libepc-ui-1.0.pc
-%%DOCSDIR%%/EpcProtocol.html
-%%DOCSDIR%%/EpcServiceInfo.html
-%%DOCSDIR%%/consuming.html
-%%DOCSDIR%%/dns-sd-support.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/internal-api.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/libepc-1.0-EpcServiceType.html
-%%DOCSDIR%%/libepc-1.0-EpcShell.html
-%%DOCSDIR%%/libepc-1.0-EpcTls.html
-%%DOCSDIR%%/libepc-1.0-auth-context.html
-%%DOCSDIR%%/libepc-1.0-consumer.html
-%%DOCSDIR%%/libepc-1.0-contents.html
-%%DOCSDIR%%/libepc-1.0-dispatcher.html
-%%DOCSDIR%%/libepc-1.0-password-dialog.html
-%%DOCSDIR%%/libepc-1.0-progress-window.html
-%%DOCSDIR%%/libepc-1.0-publisher.html
-%%DOCSDIR%%/libepc-1.0-service-monitor.html
-%%DOCSDIR%%/libepc-1.0.devhelp2
-%%DOCSDIR%%/publishing.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-%%DOCSDIR%%/widgets.html
share/locale/ar/LC_MESSAGES/libepc.mo
+share/locale/bs/LC_MESSAGES/libepc.mo
share/locale/ca/LC_MESSAGES/libepc.mo
share/locale/cs/LC_MESSAGES/libepc.mo
share/locale/da/LC_MESSAGES/libepc.mo
@@ -57,15 +32,21 @@ share/locale/es/LC_MESSAGES/libepc.mo
share/locale/fi/LC_MESSAGES/libepc.mo
share/locale/fr/LC_MESSAGES/libepc.mo
share/locale/gl/LC_MESSAGES/libepc.mo
+share/locale/hu/LC_MESSAGES/libepc.mo
share/locale/id/LC_MESSAGES/libepc.mo
share/locale/it/LC_MESSAGES/libepc.mo
share/locale/ja/LC_MESSAGES/libepc.mo
share/locale/lv/LC_MESSAGES/libepc.mo
share/locale/nb/LC_MESSAGES/libepc.mo
+share/locale/oc/LC_MESSAGES/libepc.mo
share/locale/pl/LC_MESSAGES/libepc.mo
+share/locale/pt/LC_MESSAGES/libepc.mo
share/locale/pt_BR/LC_MESSAGES/libepc.mo
+share/locale/ro/LC_MESSAGES/libepc.mo
share/locale/ru/LC_MESSAGES/libepc.mo
share/locale/sl/LC_MESSAGES/libepc.mo
+share/locale/sr/LC_MESSAGES/libepc.mo
+share/locale/sr@latin/LC_MESSAGES/libepc.mo
share/locale/sv/LC_MESSAGES/libepc.mo
share/locale/th/LC_MESSAGES/libepc.mo
share/locale/zh_CN/LC_MESSAGES/libepc.mo
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile
index 2a02f010481b..4bed1a6b55ea 100644
--- a/www/webkit2-gtk3/Makefile
+++ b/www/webkit2-gtk3/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= webkit
-PORTVERSION= 2.20.3
-PORTREVISION= 2
+PORTVERSION= 2.20.5
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= 2-gtk3
diff --git a/www/webkit2-gtk3/distinfo b/www/webkit2-gtk3/distinfo
index f310c51d7392..419a1db4349d 100644
--- a/www/webkit2-gtk3/distinfo
+++ b/www/webkit2-gtk3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529262397
-SHA256 (webkitgtk-2.20.3.tar.xz) = 579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48f20dd8
-SIZE (webkitgtk-2.20.3.tar.xz) = 16623456
+TIMESTAMP = 1534713029
+SHA256 (webkitgtk-2.20.5.tar.xz) = 15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac3af990
+SIZE (webkitgtk-2.20.5.tar.xz) = 16625200
diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_CMakeLists.txt b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_CMakeLists.txt
deleted file mode 100644
index 838aeedc7ce2..000000000000
--- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- Source/JavaScriptCore/CMakeLists.txt.orig 2018-02-20 11:38:51 UTC
-+++ Source/JavaScriptCore/CMakeLists.txt
-@@ -253,6 +253,7 @@ add_executable(LLIntOffsetsExtractor
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeStructs.h
- )
- target_link_libraries(LLIntOffsetsExtractor WTF)
-+add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
-
- # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
- # LLIntAssembly.h's mtime. The problem we have here is: asm.rb has some built-in optimization
diff --git a/www/webkit2-gtk3/pkg-plist b/www/webkit2-gtk3/pkg-plist
index 237fce7702ee..9b5320b6618a 100644
--- a/www/webkit2-gtk3/pkg-plist
+++ b/www/webkit2-gtk3/pkg-plist
@@ -199,10 +199,10 @@ lib/girepository-1.0/WebKit2-4.0.typelib
lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
lib/libjavascriptcoregtk-4.0.so
lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.7.11
+lib/libjavascriptcoregtk-4.0.so.18.7.13
lib/libwebkit2gtk-4.0.so
lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.28.3
+lib/libwebkit2gtk-4.0.so.37.28.5
lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
libdata/pkgconfig/javascriptcoregtk-4.0.pc
libdata/pkgconfig/webkit2gtk-4.0.pc
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index b72db2fd3a7a..cd2429eabcc0 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -2,40 +2,33 @@
# $FreeBSD$
PORTNAME= nautilus
-PORTVERSION= 3.18.5
-PORTREVISION= 1
+PORTVERSION= 3.28.1
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= File manager for the GNOME desktop
-BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
-LIB_DEPENDS= libexif.so:graphics/libexif \
- libnotify.so:devel/libnotify \
- libexempi.so:textproc/exempi
-RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+LIB_DEPENDS= libgnome-autoar-0.so:archivers/gnome-autoar \
+ libgexiv2.so:graphics/gexiv2 \
+ libtracker-sparql-2.0.so:sysutils/tracker
PORTSCOUT= limitw:1,even
-USES= compiler:c11 desktop-file-utils gettext gmake gnome \
- libtool pathfix pkgconfig tar:xz
-USE_GNOME= intlhack gnomedesktop3 libxml2 gvfs introspection:build
+USES= compiler:c11 desktop-file-utils gettext gnome \
+ localbase meson pkgconfig python:3.4+,build tar:xz
+#USE_GNOME= cairo gdkpixbuf2 gnomedesktop3 introspection:build
+USE_GNOME= cairo gdkpixbuf2 gnomedesktop3
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --disable-packagekit
-INSTALL_TARGET= install-strip
+USE_XORG= x11
+MESON_ARGS= -Denable-packagekit=false \
+ -Denable-selinux=false
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.nautilus.gschema.xml
-OPTIONS_SUB= yes
-OPTIONS_DEFINE= TRACKER
-OPTIONS_DEFAULT=TRACKER
-TRACKER_DESC= Tracker support
-TRACKER_LIB_DEPENDS= libtracker-control-1.0.so:sysutils/tracker
-TRACKER_CONFIGURE_ENABLE= tracker
-
.include <bsd.port.mk>
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 6dce384cb376..73e1e540f802 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/nautilus-3.18.5.tar.xz) = 60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15
-SIZE (gnome3/nautilus-3.18.5.tar.xz) = 3349312
+TIMESTAMP = 1525501674
+SHA256 (gnome/nautilus-3.28.1.tar.xz) = 9ce878fc9d9f950475c504066ce5f8e98a8cfbf15051724469e865ea85bab0a5
+SIZE (gnome/nautilus-3.28.1.tar.xz) = 3262520
diff --git a/x11-fm/nautilus/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in
deleted file mode 100644
index a4f79ca6bb37..000000000000
--- a/x11-fm/nautilus/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig Wed Nov 24 13:14:21 2004
-+++ Makefile.in Wed Nov 24 13:14:47 2004
-@@ -183,7 +183,6 @@
- libbackground \
- libnautilus-private \
- src \
-- test \
- po \
- data \
- icons \
diff --git a/x11-fm/nautilus/files/patch-data_meson.build b/x11-fm/nautilus/files/patch-data_meson.build
new file mode 100644
index 000000000000..9d1a4b140874
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-data_meson.build
@@ -0,0 +1,28 @@
+From git master. Fixes the same 512x512 icon being installed as all sizes.
+--- data/meson.build.orig 2018-06-24 22:58:44 UTC
++++ data/meson.build
+@@ -8,17 +8,15 @@
+ # https://gitlab.gnome.org/GNOME/nautilus/merge_requests/144
+ ##########
+ foreach icon_size: ['16x16', '22x22', '24x24', '32x32', '48x48', '512x512']
+- configure_file(
+- command: [
+- 'cp', '@INPUT@', '@OUTPUT@'
+- ],
+- input: files(
+- join_paths('icons', 'hicolor', icon_size, 'apps', 'org.gnome.Nautilus.png')
+- ),
+- install_dir: join_paths(datadir, 'icons', 'hicolor', icon_size, 'apps'),
+- output: '@0@.png'.format(application_id)
++ icondir = join_paths('icons', 'hicolor', icon_size, 'apps')
++
++ install_data(
++ join_paths(icondir, 'org.gnome.Nautilus.png'),
++ install_dir: join_paths(datadir, icondir),
++ rename: '@0@.png'.format(application_id)
+ )
+ endforeach
++
+
+ configure_file(
+ command: [
diff --git a/x11-fm/nautilus/files/patch-src_meson.build b/x11-fm/nautilus/files/patch-src_meson.build
new file mode 100644
index 000000000000..df2db60ed757
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-src_meson.build
@@ -0,0 +1,50 @@
+diff --git a/src/meson.build b/src/meson.build
+index 0979128c8ed4ab828f6d546ab86c301ab0c3f98c..c6fbd8808c3ecc0a30af14d621e24f921be2eb55 100644
+--- src/meson.build
++++ src/meson.build
+@@ -1,3 +1,13 @@
++resources = gnome.compile_resources(
++ 'nautilus-resources',
++ join_paths(
++ 'resources', 'nautilus.gresource.xml'
++ ),
++ source_dir: 'resources',
++ c_name: 'nautilus',
++ extra_args: '--manual-register'
++)
++
+ libnautilus_sources = [
+ gnome.mkenums(
+ 'nautilus-enum-types',
+@@ -10,15 +20,8 @@ libnautilus_sources = [
+ 'nautilus-search-provider.h'
+ ]
+ ),
+- gnome.compile_resources(
+- 'nautilus-resources',
+- join_paths(
+- 'resources', 'nautilus.gresource.xml'
+- ),
+- source_dir: 'resources',
+- c_name: 'nautilus',
+- extra_args: '--manual-register'
+- ),
++ # The header is only used by the main executable, no need to add it here.
++ resources[0],
+ gnome.gdbus_codegen(
+ 'nautilus-freedesktop-generated',
+ join_paths(
+@@ -294,7 +297,12 @@ libnautilus_dep = declare_dependency(
+ nautilus_include_dirs,
+ libnautilus_include_dirs
+ ],
+- dependencies: nautilus_deps
++ dependencies: nautilus_deps,
++ # nautilus-main.c, which is part of the main Nautilus executable, uses
++ # the header, generated by glib-compile-resources. Passing it on from here
++ # will ensure that an internal compile-time dependency is placed on this file,
++ # thus avoiding failures that are difficult to reproduce.
++ sources: resources[1]
+ )
+
+ nautilus = executable(
diff --git a/x11-fm/nautilus/pkg-descr b/x11-fm/nautilus/pkg-descr
index b4f3fd678e8f..c67beaae4d09 100644
--- a/x11-fm/nautilus/pkg-descr
+++ b/x11-fm/nautilus/pkg-descr
@@ -1,5 +1,5 @@
-Nautilus is a file manager tightly integrated into the GNOME destkop.
+Nautilus is a file manager tightly integrated into the GNOME desktop.
It is also responsible for desktop and icon management, and provides
an intuitive interface for accessing files and webpages.
-WWW: http://www.gnome.org/projects/nautilus/
+WWW: https://wiki.gnome.org/Apps/Nautilus
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 017a1efd9bd3..2c51e41f4496 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -1,8 +1,8 @@
bin/nautilus
bin/nautilus-autorun-software
-etc/xdg/autostart/nautilus-autostart.desktop
include/nautilus/libnautilus-extension/nautilus-column-provider.h
include/nautilus/libnautilus-extension/nautilus-column.h
+include/nautilus/libnautilus-extension/nautilus-extension-enum-types.h
include/nautilus/libnautilus-extension/nautilus-extension-types.h
include/nautilus/libnautilus-extension/nautilus-file-info.h
include/nautilus/libnautilus-extension/nautilus-info-provider.h
@@ -12,48 +12,27 @@ include/nautilus/libnautilus-extension/nautilus-menu-provider.h
include/nautilus/libnautilus-extension/nautilus-menu.h
include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
include/nautilus/libnautilus-extension/nautilus-property-page.h
+include/nautilus/nautilus-extension.h
lib/girepository-1.0/Nautilus-3.0.typelib
lib/libnautilus-extension.so
lib/libnautilus-extension.so.1
-lib/libnautilus-extension.so.1.4.0
+lib/libnautilus-extension.so.1.5.0
+lib/nautilus/extensions-3.0/libnautilus-image-properties.so
lib/nautilus/extensions-3.0/libnautilus-sendto.so
libdata/pkgconfig/libnautilus-extension.pc
-libexec/nautilus-convert-metadata
-man/man1/nautilus.1.gz
-share/GConf/gsettings/nautilus.convert
-share/appdata/org.gnome.Nautilus.appdata.xml
share/applications/nautilus-autorun-software.desktop
-share/applications/nautilus-classic.desktop
share/applications/org.gnome.Nautilus.desktop
share/dbus-1/services/org.freedesktop.FileManager1.service
share/dbus-1/services/org.gnome.Nautilus.service
share/gir-1.0/Nautilus-3.0.gir
-share/gnome-shell/search-providers/nautilus-search-provider.ini
-share/gtk-doc/html/libnautilus-extension/NautilusColumn.html
-share/gtk-doc/html/libnautilus-extension/NautilusColumnProvider.html
-share/gtk-doc/html/libnautilus-extension/NautilusFileInfo.html
-share/gtk-doc/html/libnautilus-extension/NautilusInfoProvider.html
-share/gtk-doc/html/libnautilus-extension/NautilusLocationWidgetProvider.html
-share/gtk-doc/html/libnautilus-extension/NautilusMenu.html
-share/gtk-doc/html/libnautilus-extension/NautilusMenuItem.html
-share/gtk-doc/html/libnautilus-extension/NautilusMenuProvider.html
-share/gtk-doc/html/libnautilus-extension/NautilusPropertyPage.html
-share/gtk-doc/html/libnautilus-extension/NautilusPropertyPageProvider.html
-share/gtk-doc/html/libnautilus-extension/ch01.html
-share/gtk-doc/html/libnautilus-extension/home.png
-share/gtk-doc/html/libnautilus-extension/index.html
-share/gtk-doc/html/libnautilus-extension/index.sgml
-share/gtk-doc/html/libnautilus-extension/ix01.html
-share/gtk-doc/html/libnautilus-extension/left-insensitive.png
-share/gtk-doc/html/libnautilus-extension/left.png
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension-NautilusModule.html
-share/gtk-doc/html/libnautilus-extension/libnautilus-extension.devhelp2
-share/gtk-doc/html/libnautilus-extension/pt01.html
-share/gtk-doc/html/libnautilus-extension/right-insensitive.png
-share/gtk-doc/html/libnautilus-extension/right.png
-share/gtk-doc/html/libnautilus-extension/style.css
-share/gtk-doc/html/libnautilus-extension/up-insensitive.png
-share/gtk-doc/html/libnautilus-extension/up.png
+share/gnome-shell/search-providers/org.gnome.Nautilus.search-provider.ini
+share/icons/hicolor/16x16/apps/org.gnome.Nautilus.png
+share/icons/hicolor/22x22/apps/org.gnome.Nautilus.png
+share/icons/hicolor/24x24/apps/org.gnome.Nautilus.png
+share/icons/hicolor/32x32/apps/org.gnome.Nautilus.png
+share/icons/hicolor/48x48/apps/org.gnome.Nautilus.png
+share/icons/hicolor/512x512/apps/org.gnome.Nautilus.png
+share/icons/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg
share/locale/af/LC_MESSAGES/nautilus.mo
share/locale/am/LC_MESSAGES/nautilus.mo
share/locale/an/LC_MESSAGES/nautilus.mo
@@ -115,6 +94,7 @@ share/locale/ko/LC_MESSAGES/nautilus.mo
share/locale/ku/LC_MESSAGES/nautilus.mo
share/locale/ky/LC_MESSAGES/nautilus.mo
share/locale/li/LC_MESSAGES/nautilus.mo
+share/locale/ln/LC_MESSAGES/nautilus.mo
share/locale/lt/LC_MESSAGES/nautilus.mo
share/locale/lv/LC_MESSAGES/nautilus.mo
share/locale/mai/LC_MESSAGES/nautilus.mo
@@ -169,3 +149,4 @@ share/locale/zh_CN/LC_MESSAGES/nautilus.mo
share/locale/zh_HK/LC_MESSAGES/nautilus.mo
share/locale/zh_TW/LC_MESSAGES/nautilus.mo
share/locale/zu/LC_MESSAGES/nautilus.mo
+share/metainfo/org.gnome.Nautilus.appdata.xml
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 49273a42997e..e78558d79b96 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nemo
PORTVERSION= 2.4.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm gnome
DIST_SUBDIR= gnome3
@@ -42,7 +42,7 @@ OPTIONS_SUB= yes
OPTIONS_DEFINE= TRACKER
OPTIONS_DEFAULT= TRACKER
TRACKER_CONFIGURE_ENABLE= tracker
-TRACKER_LIB_DEPENDS= libtracker-sparql-1.0.so:sysutils/tracker
+TRACKER_LIB_DEPENDS= libtracker-sparql-2.0.so:sysutils/tracker
TRACKER_DESC= Integration with tracker
post-patch:
@@ -57,6 +57,7 @@ post-patch:
${WRKSRC}/files/Makefile.in
@${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \
+ -e 's|tracker-sparql-1.0|tracker-sparql-2.0|g' \
${WRKSRC}/configure.in
@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
diff --git a/x11-fm/sushi/Makefile b/x11-fm/sushi/Makefile
index 2807a3844021..44cdd26c5b16 100644
--- a/x11-fm/sushi/Makefile
+++ b/x11-fm/sushi/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= sushi
-PORTVERSION= 3.18.0
-PORTREVISION= 2
+PORTVERSION= 3.28.3
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,25 +10,36 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Tool similar to Gloobus Preview that provides quick file previews
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= libgcr-3.so:security/gcr \
libgjs.so:lang/gjs \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
- libclutter-gst-2.0.so:multimedia/clutter-gst \
+ libclutter-gst-3.0.so:multimedia/clutter-gst3 \
libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
libmusicbrainz5.so:audio/libmusicbrainz5 \
+ libfreetype.so:print/freetype2 \
+ libharfbuzz.so:print/harfbuzz \
+ libclutter-1.0.so:graphics/clutter \
+ libjson-glib-1.0.so:devel/json-glib \
+ libcogl.so:graphics/cogl \
+ libsoup-2.4.so:devel/libsoup \
libevdocument3.so:graphics/evince
RUN_DEPENDS= nautilus:x11-fm/nautilus
PORTSCOUT= limitw:1,even
-USES= compiler:c11 gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USES= compiler:c11 gettext gmake gnome libtool localbase pathfix \
+ pkgconfig tar:xz
USE_CSTD= c11
INSTALLS_ICONS= yes
-USE_GNOME= gnomeprefix gtksourceview3 intlhack introspection:build
+USE_GNOME= cairo gnomeprefix gtksourceview3 intlhack introspection
+USE_GL= egl
+USE_GSTREAMER1= yes
USE_LDCONFIG= yes
+USE_XORG= x11 xcomposite xdamage xext xi xfixes xrandr
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/x11-fm/sushi/distinfo b/x11-fm/sushi/distinfo
index 1d82ffeef346..a0cae32886af 100644
--- a/x11-fm/sushi/distinfo
+++ b/x11-fm/sushi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/sushi-3.18.0.tar.xz) = 7f4df92be950bf23aff28da49ce108766dd21a88efc14a9d0807e10225608e9c
-SIZE (gnome3/sushi-3.18.0.tar.xz) = 294676
+TIMESTAMP = 1525967238
+SHA256 (gnome3/sushi-3.28.3.tar.xz) = 3c2e5ae4a6553563fb06bcc3bd59b61a6d891cc9a3fad724f805e483c968cdfb
+SIZE (gnome3/sushi-3.28.3.tar.xz) = 298380
diff --git a/x11-fm/sushi/pkg-plist b/x11-fm/sushi/pkg-plist
index 3127c620d6c6..f5d1f2b9c5a3 100644
--- a/x11-fm/sushi/pkg-plist
+++ b/x11-fm/sushi/pkg-plist
@@ -3,14 +3,15 @@ lib/sushi/girepository-1.0/Sushi-1.0.typelib
lib/sushi/libsushi-1.0.so
libexec/sushi-start
share/dbus-1/services/org.gnome.Sushi.service
+share/locale/af/LC_MESSAGES/sushi.mo
share/locale/an/LC_MESSAGES/sushi.mo
share/locale/ar/LC_MESSAGES/sushi.mo
share/locale/as/LC_MESSAGES/sushi.mo
share/locale/ast/LC_MESSAGES/sushi.mo
share/locale/be/LC_MESSAGES/sushi.mo
-share/locale/bs/LC_MESSAGES/sushi.mo
share/locale/bg/LC_MESSAGES/sushi.mo
share/locale/bn_IN/LC_MESSAGES/sushi.mo
+share/locale/bs/LC_MESSAGES/sushi.mo
share/locale/ca/LC_MESSAGES/sushi.mo
share/locale/ca@valencia/LC_MESSAGES/sushi.mo
share/locale/cs/LC_MESSAGES/sushi.mo
@@ -26,10 +27,12 @@ share/locale/fa/LC_MESSAGES/sushi.mo
share/locale/fi/LC_MESSAGES/sushi.mo
share/locale/fr/LC_MESSAGES/sushi.mo
share/locale/fur/LC_MESSAGES/sushi.mo
+share/locale/gd/LC_MESSAGES/sushi.mo
share/locale/gl/LC_MESSAGES/sushi.mo
share/locale/gu/LC_MESSAGES/sushi.mo
share/locale/he/LC_MESSAGES/sushi.mo
share/locale/hi/LC_MESSAGES/sushi.mo
+share/locale/hr/LC_MESSAGES/sushi.mo
share/locale/hu/LC_MESSAGES/sushi.mo
share/locale/id/LC_MESSAGES/sushi.mo
share/locale/is/LC_MESSAGES/sushi.mo
@@ -43,6 +46,7 @@ share/locale/lv/LC_MESSAGES/sushi.mo
share/locale/ml/LC_MESSAGES/sushi.mo
share/locale/mr/LC_MESSAGES/sushi.mo
share/locale/nb/LC_MESSAGES/sushi.mo
+share/locale/ne/LC_MESSAGES/sushi.mo
share/locale/nl/LC_MESSAGES/sushi.mo
share/locale/oc/LC_MESSAGES/sushi.mo
share/locale/or/LC_MESSAGES/sushi.mo
@@ -50,6 +54,7 @@ share/locale/pa/LC_MESSAGES/sushi.mo
share/locale/pl/LC_MESSAGES/sushi.mo
share/locale/pt/LC_MESSAGES/sushi.mo
share/locale/pt_BR/LC_MESSAGES/sushi.mo
+share/locale/ro/LC_MESSAGES/sushi.mo
share/locale/ru/LC_MESSAGES/sushi.mo
share/locale/sk/LC_MESSAGES/sushi.mo
share/locale/sl/LC_MESSAGES/sushi.mo
@@ -68,23 +73,22 @@ share/locale/vi/LC_MESSAGES/sushi.mo
share/locale/zh_CN/LC_MESSAGES/sushi.mo
share/locale/zh_HK/LC_MESSAGES/sushi.mo
share/locale/zh_TW/LC_MESSAGES/sushi.mo
-share/sushi/gir-1.0/Sushi-1.0.gir
-share/sushi/js/ui/application.js
-share/sushi/js/ui/fallbackRenderer.js
-share/sushi/js/ui/main.js
-share/sushi/js/ui/mainWindow.js
-share/sushi/js/ui/mimeHandler.js
-share/sushi/js/ui/spinnerBox.js
-share/sushi/js/ui/tweener.js
-share/sushi/js/ui/utils.js
-share/sushi/js/util/constants.js
-share/sushi/js/util/format.js
-share/sushi/js/util/path.js
-share/sushi/js/util/totemMimeTypes.js
-share/sushi/js/viewers/audio.js
-share/sushi/js/viewers/evince.js
-share/sushi/js/viewers/font.js
-share/sushi/js/viewers/gst.js
-share/sushi/js/viewers/html.js
-share/sushi/js/viewers/image.js
-share/sushi/js/viewers/text.js
+%%DATADIR%%/gir-1.0/Sushi-1.0.gir
+%%DATADIR%%/js/ui/application.js
+%%DATADIR%%/js/ui/fallbackRenderer.js
+%%DATADIR%%/js/ui/main.js
+%%DATADIR%%/js/ui/mainWindow.js
+%%DATADIR%%/js/ui/mimeHandler.js
+%%DATADIR%%/js/ui/spinnerBox.js
+%%DATADIR%%/js/ui/tweener.js
+%%DATADIR%%/js/ui/utils.js
+%%DATADIR%%/js/util/constants.js
+%%DATADIR%%/js/util/path.js
+%%DATADIR%%/js/util/totemMimeTypes.js
+%%DATADIR%%/js/viewers/audio.js
+%%DATADIR%%/js/viewers/evince.js
+%%DATADIR%%/js/viewers/font.js
+%%DATADIR%%/js/viewers/gst.js
+%%DATADIR%%/js/viewers/html.js
+%%DATADIR%%/js/viewers/image.js
+%%DATADIR%%/js/viewers/text.js
diff --git a/x11-fonts/cantarell-fonts/Makefile b/x11-fonts/cantarell-fonts/Makefile
index ce564e9c3c50..6b44937cc23a 100644
--- a/x11-fonts/cantarell-fonts/Makefile
+++ b/x11-fonts/cantarell-fonts/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cantarell-fonts
-PORTVERSION= 0.0.25
+PORTVERSION= 0.101
CATEGORIES= x11-fonts gnome
MASTER_SITES= GNOME
@@ -12,13 +12,11 @@ COMMENT= Cantarell, a Humanist sans-serif font family
LICENSE= OFL11
LICENSE_FILE= ${WRKSRC}/COPYING
+BUILD_DEPENDS= appstream-util:devel/appstream-glib
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
-USES= fonts gmake gnome pkgconfig tar:xz
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.avail
+USES= gettext-tools fonts meson tar:xz
FONTSDIR= share/fonts/cantarell
-PLIST_SUB= FONTSDIR=${FONTSDIR}
NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/x11-fonts/cantarell-fonts/distinfo b/x11-fonts/cantarell-fonts/distinfo
index 6c85172a4339..0dd479f3dbeb 100644
--- a/x11-fonts/cantarell-fonts/distinfo
+++ b/x11-fonts/cantarell-fonts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491083208
-SHA256 (cantarell-fonts-0.0.25.tar.xz) = 14a228aa0b516dfc367b434a850f955a00c57fc549cbb05348e2b150196a737f
-SIZE (cantarell-fonts-0.0.25.tar.xz) = 351768
+TIMESTAMP = 1525983791
+SHA256 (cantarell-fonts-0.101.tar.xz) = 9b9e6e824fee7a809129f2238710f09d4ef4c6fe8fd7db1969bb5e228c3f7ee5
+SIZE (cantarell-fonts-0.101.tar.xz) = 263480
diff --git a/x11-fonts/cantarell-fonts/pkg-plist b/x11-fonts/cantarell-fonts/pkg-plist
index ab929912bc5a..229a61e2975e 100644
--- a/x11-fonts/cantarell-fonts/pkg-plist
+++ b/x11-fonts/cantarell-fonts/pkg-plist
@@ -1,5 +1,6 @@
-etc/fonts/conf.avail/31-cantarell.conf
-%%FONTSDIR%%/Cantarell-BoldOblique.otf
%%FONTSDIR%%/Cantarell-Bold.otf
-%%FONTSDIR%%/Cantarell-Oblique.otf
+%%FONTSDIR%%/Cantarell-ExtraBold.otf
+%%FONTSDIR%%/Cantarell-Light.otf
%%FONTSDIR%%/Cantarell-Regular.otf
+%%FONTSDIR%%/Cantarell-Thin.otf
+share/metainfo/org.gnome.cantarell.metainfo.xml
diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index 89b2faaa7c2b..624931b18f80 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -59,8 +59,8 @@
SUBDIR += gnome-icons-stylish
SUBDIR += gnome-icons-ximian-south
SUBDIR += gnome-themes
+ SUBDIR += gnome-themes-extra
SUBDIR += gnome-themes-extras
- SUBDIR += gnome-themes-standard
SUBDIR += greybird-theme
SUBDIR += gtk-E17-theme
SUBDIR += gtk-aluminumalloy-cryogenic-theme
diff --git a/x11-themes/adapta-gtk-theme/Makefile b/x11-themes/adapta-gtk-theme/Makefile
index ae2c453a41e0..eed975eac2c4 100644
--- a/x11-themes/adapta-gtk-theme/Makefile
+++ b/x11-themes/adapta-gtk-theme/Makefile
@@ -16,6 +16,7 @@ LICENSE_FILE_CC-BY-SA-4.0= ${WRKSRC}/LICENSE_CC_BY_SA4
BUILD_DEPENDS= gsed:textproc/gsed \
inkscape:graphics/inkscape \
+ bash:shells/bash \
sassc:textproc/sassc
RUN_DEPENDS= noto>=1.0.5:x11-fonts/noto \
roboto-fonts-ttf>=2.134:x11-fonts/roboto-fonts-ttf
diff --git a/x11-themes/adwaita-icon-theme/Makefile b/x11-themes/adwaita-icon-theme/Makefile
index 418d3ea0d124..a12c7d3708e3 100644
--- a/x11-themes/adwaita-icon-theme/Makefile
+++ b/x11-themes/adwaita-icon-theme/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= adwaita-icon-theme
-PORTVERSION= 3.22.0
+PORTVERSION= 3.28.0
CATEGORIES= x11-themes gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/x11-themes/adwaita-icon-theme/distinfo b/x11-themes/adwaita-icon-theme/distinfo
index aff8b40e08bf..e96c028b3651 100644
--- a/x11-themes/adwaita-icon-theme/distinfo
+++ b/x11-themes/adwaita-icon-theme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476361782
-SHA256 (gnome3/adwaita-icon-theme-3.22.0.tar.xz) = c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7
-SIZE (gnome3/adwaita-icon-theme-3.22.0.tar.xz) = 18395856
+TIMESTAMP = 1525984582
+SHA256 (gnome3/adwaita-icon-theme-3.28.0.tar.xz) = 7aae8c1dffd6772fd1a21a3d365a0ea28b7c3988bdbbeafbf8742cda68242150
+SIZE (gnome3/adwaita-icon-theme-3.28.0.tar.xz) = 19992224
diff --git a/x11-themes/adwaita-icon-theme/pkg-plist b/x11-themes/adwaita-icon-theme/pkg-plist
index 3778c6506c76..7b124ca6e90b 100644
--- a/x11-themes/adwaita-icon-theme/pkg-plist
+++ b/x11-themes/adwaita-icon-theme/pkg-plist
@@ -1120,24 +1120,13 @@ share/icons/Adwaita/24x24/status/weather-showers-scattered.png
share/icons/Adwaita/24x24/status/weather-showers.png
share/icons/Adwaita/24x24/status/weather-snow.png
share/icons/Adwaita/24x24/status/weather-storm.png
-share/icons/Adwaita/256x256/actions/address-book-new.png
share/icons/Adwaita/256x256/actions/appointment-new.png
-share/icons/Adwaita/256x256/actions/document-new.png
share/icons/Adwaita/256x256/actions/document-open-recent.png
-share/icons/Adwaita/256x256/actions/document-open.png
-share/icons/Adwaita/256x256/actions/document-page-setup.png
share/icons/Adwaita/256x256/actions/document-print-preview.png
share/icons/Adwaita/256x256/actions/document-print.png
-share/icons/Adwaita/256x256/actions/document-properties.png
-share/icons/Adwaita/256x256/actions/document-revert-rtl.png
-share/icons/Adwaita/256x256/actions/document-revert.png
-share/icons/Adwaita/256x256/actions/document-save-as.png
-share/icons/Adwaita/256x256/actions/document-save.png
share/icons/Adwaita/256x256/actions/edit-delete.png
share/icons/Adwaita/256x256/actions/edit-find-replace.png
share/icons/Adwaita/256x256/actions/edit-find.png
-share/icons/Adwaita/256x256/actions/edit-select-all.png
-share/icons/Adwaita/256x256/actions/folder-new.png
share/icons/Adwaita/256x256/actions/go-first-rtl.png
share/icons/Adwaita/256x256/actions/go-first.png
share/icons/Adwaita/256x256/actions/go-jump.png
@@ -1155,10 +1144,7 @@ share/icons/Adwaita/256x256/actions/system-run.png
share/icons/Adwaita/256x256/actions/system-search.png
share/icons/Adwaita/256x256/actions/system-shutdown.png
share/icons/Adwaita/256x256/actions/view-refresh.png
-share/icons/Adwaita/256x256/apps/accessories-calculator.png
-share/icons/Adwaita/256x256/apps/accessories-character-map.png
share/icons/Adwaita/256x256/apps/accessories-dictionary.png
-share/icons/Adwaita/256x256/apps/accessories-text-editor.png
share/icons/Adwaita/256x256/apps/applets-screenshooter.png
share/icons/Adwaita/256x256/apps/help-browser.png
share/icons/Adwaita/256x256/apps/multimedia-volume-control.png
@@ -1181,14 +1167,10 @@ share/icons/Adwaita/256x256/apps/system-software-install.png
share/icons/Adwaita/256x256/apps/system-software-update.png
share/icons/Adwaita/256x256/apps/system-users.png
share/icons/Adwaita/256x256/apps/user-info.png
-share/icons/Adwaita/256x256/apps/utilities-system-monitor.png
-share/icons/Adwaita/256x256/apps/utilities-terminal.png
share/icons/Adwaita/256x256/apps/web-browser.png
share/icons/Adwaita/256x256/categories/applications-development.png
share/icons/Adwaita/256x256/categories/applications-graphics.png
-share/icons/Adwaita/256x256/categories/applications-internet.png
share/icons/Adwaita/256x256/categories/applications-office.png
-share/icons/Adwaita/256x256/categories/applications-system.png
share/icons/Adwaita/256x256/categories/preferences-system-network.png
share/icons/Adwaita/256x256/categories/preferences-system.png
share/icons/Adwaita/256x256/devices/ac-adapter.png
@@ -1200,12 +1182,10 @@ share/icons/Adwaita/256x256/devices/battery.png
share/icons/Adwaita/256x256/devices/camera-photo.png
share/icons/Adwaita/256x256/devices/camera-web.png
share/icons/Adwaita/256x256/devices/computer.png
-share/icons/Adwaita/256x256/devices/drive-harddisk.png
share/icons/Adwaita/256x256/devices/drive-multidisk.png
share/icons/Adwaita/256x256/devices/drive-optical.png
share/icons/Adwaita/256x256/devices/drive-removable-media.png
share/icons/Adwaita/256x256/devices/ebook-reader.png
-share/icons/Adwaita/256x256/devices/input-dialpad.png
share/icons/Adwaita/256x256/devices/input-gaming.png
share/icons/Adwaita/256x256/devices/input-keyboard.png
share/icons/Adwaita/256x256/devices/input-mouse.png
@@ -1214,7 +1194,6 @@ share/icons/Adwaita/256x256/devices/media-flash.png
share/icons/Adwaita/256x256/devices/media-floppy.png
share/icons/Adwaita/256x256/devices/media-optical.png
share/icons/Adwaita/256x256/devices/media-removable.png
-share/icons/Adwaita/256x256/devices/multimedia-player.png
share/icons/Adwaita/256x256/devices/phone.png
share/icons/Adwaita/256x256/devices/printer-network.png
share/icons/Adwaita/256x256/devices/printer.png
@@ -1222,12 +1201,7 @@ share/icons/Adwaita/256x256/devices/scanner.png
share/icons/Adwaita/256x256/devices/uninterruptible-power-supply.png
share/icons/Adwaita/256x256/devices/video-display.png
share/icons/Adwaita/256x256/emblems/emblem-mail.png
-share/icons/Adwaita/256x256/emblems/emblem-package.png
-share/icons/Adwaita/256x256/emblems/emblem-readonly.png
-share/icons/Adwaita/256x256/emblems/emblem-shared.png
-share/icons/Adwaita/256x256/emblems/emblem-symbolic-link.png
share/icons/Adwaita/256x256/emblems/emblem-synchronizing.png
-share/icons/Adwaita/256x256/emblems/emblem-unreadable.png
share/icons/Adwaita/256x256/emotes/emote-love.png
share/icons/Adwaita/256x256/emotes/face-angel.png
share/icons/Adwaita/256x256/emotes/face-angry.png
@@ -1248,43 +1222,11 @@ share/icons/Adwaita/256x256/emotes/face-tired.png
share/icons/Adwaita/256x256/emotes/face-uncertain.png
share/icons/Adwaita/256x256/emotes/face-wink.png
share/icons/Adwaita/256x256/mimetypes/application-x-addon.png
-share/icons/Adwaita/256x256/mimetypes/application-x-executable.png
share/icons/Adwaita/256x256/mimetypes/application-x-firmware.png
-share/icons/Adwaita/256x256/mimetypes/audio-x-generic.png
-share/icons/Adwaita/256x256/mimetypes/font-x-generic.png
-share/icons/Adwaita/256x256/mimetypes/image-x-generic.png
-share/icons/Adwaita/256x256/mimetypes/package-x-generic.png
-share/icons/Adwaita/256x256/mimetypes/text-html.png
-share/icons/Adwaita/256x256/mimetypes/text-x-generic-template.png
-share/icons/Adwaita/256x256/mimetypes/text-x-generic.png
-share/icons/Adwaita/256x256/mimetypes/text-x-preview.png
-share/icons/Adwaita/256x256/mimetypes/text-x-script.png
share/icons/Adwaita/256x256/mimetypes/video-x-generic.png
-share/icons/Adwaita/256x256/mimetypes/x-office-address-book.png
-share/icons/Adwaita/256x256/mimetypes/x-office-document-template.png
-share/icons/Adwaita/256x256/mimetypes/x-office-document.png
-share/icons/Adwaita/256x256/mimetypes/x-office-drawing-template.png
-share/icons/Adwaita/256x256/mimetypes/x-office-drawing.png
-share/icons/Adwaita/256x256/mimetypes/x-office-presentation-template.png
-share/icons/Adwaita/256x256/mimetypes/x-office-presentation.png
-share/icons/Adwaita/256x256/mimetypes/x-office-spreadsheet-template.png
-share/icons/Adwaita/256x256/mimetypes/x-office-spreadsheet.png
share/icons/Adwaita/256x256/mimetypes/x-package-repository.png
-share/icons/Adwaita/256x256/places/folder-documents.png
-share/icons/Adwaita/256x256/places/folder-download.png
-share/icons/Adwaita/256x256/places/folder-music.png
-share/icons/Adwaita/256x256/places/folder-pictures.png
-share/icons/Adwaita/256x256/places/folder-publicshare.png
-share/icons/Adwaita/256x256/places/folder-remote.png
-share/icons/Adwaita/256x256/places/folder-saved-search.png
-share/icons/Adwaita/256x256/places/folder-templates.png
-share/icons/Adwaita/256x256/places/folder-videos.png
-share/icons/Adwaita/256x256/places/folder.png
share/icons/Adwaita/256x256/places/network-server.png
share/icons/Adwaita/256x256/places/network-workgroup.png
-share/icons/Adwaita/256x256/places/user-bookmarks.png
-share/icons/Adwaita/256x256/places/user-desktop.png
-share/icons/Adwaita/256x256/places/user-home.png
share/icons/Adwaita/256x256/places/user-trash.png
share/icons/Adwaita/256x256/status/appointment-missed.png
share/icons/Adwaita/256x256/status/appointment-soon.png
@@ -1310,11 +1252,6 @@ share/icons/Adwaita/256x256/status/dialog-information.png
share/icons/Adwaita/256x256/status/dialog-password.png
share/icons/Adwaita/256x256/status/dialog-question.png
share/icons/Adwaita/256x256/status/dialog-warning.png
-share/icons/Adwaita/256x256/status/folder-drag-accept.png
-share/icons/Adwaita/256x256/status/folder-open.png
-share/icons/Adwaita/256x256/status/folder-visiting.png
-share/icons/Adwaita/256x256/status/image-loading.png
-share/icons/Adwaita/256x256/status/image-missing.png
share/icons/Adwaita/256x256/status/mail-read.png
share/icons/Adwaita/256x256/status/network-cellular-connected.png
share/icons/Adwaita/256x256/status/network-error.png
@@ -1345,7 +1282,6 @@ share/icons/Adwaita/256x256/status/user-idle.png
share/icons/Adwaita/256x256/status/user-invisible.png
share/icons/Adwaita/256x256/status/user-offline.png
share/icons/Adwaita/256x256/status/user-trash-full.png
-share/icons/Adwaita/512x512/apps/accessories-calculator.png
share/icons/Adwaita/32x32/actions/address-book-new.png
share/icons/Adwaita/32x32/actions/application-exit.png
share/icons/Adwaita/32x32/actions/appointment-new.png
@@ -1634,7 +1570,7 @@ share/icons/Adwaita/32x32/places/network-workgroup.png
share/icons/Adwaita/32x32/places/start-here.png
share/icons/Adwaita/32x32/places/user-bookmarks.png
share/icons/Adwaita/32x32/places/user-desktop.png
-share/icons/Adwaita/32x32/places/user-home.png
+share/icons/Adwaita/32x32/places/user-home.png
share/icons/Adwaita/32x32/places/user-trash.png
share/icons/Adwaita/32x32/status/appointment-missed.png
share/icons/Adwaita/32x32/status/appointment-soon.png
@@ -2093,6 +2029,71 @@ share/icons/Adwaita/48x48/status/weather-showers-scattered.png
share/icons/Adwaita/48x48/status/weather-showers.png
share/icons/Adwaita/48x48/status/weather-snow.png
share/icons/Adwaita/48x48/status/weather-storm.png
+share/icons/Adwaita/512x512/actions/address-book-new.png
+share/icons/Adwaita/512x512/actions/document-new.png
+share/icons/Adwaita/512x512/actions/document-open.png
+share/icons/Adwaita/512x512/actions/document-page-setup.png
+share/icons/Adwaita/512x512/actions/document-properties.png
+share/icons/Adwaita/512x512/actions/document-revert-rtl.png
+share/icons/Adwaita/512x512/actions/document-revert.png
+share/icons/Adwaita/512x512/actions/document-save-as.png
+share/icons/Adwaita/512x512/actions/document-save.png
+share/icons/Adwaita/512x512/actions/edit-select-all.png
+share/icons/Adwaita/512x512/actions/folder-new.png
+share/icons/Adwaita/512x512/actions/mark-location.png
+share/icons/Adwaita/512x512/apps/accessories-calculator.png
+share/icons/Adwaita/512x512/apps/accessories-character-map.png
+share/icons/Adwaita/512x512/apps/accessories-dictionary.png
+share/icons/Adwaita/512x512/apps/accessories-text-editor.png
+share/icons/Adwaita/512x512/apps/utilities-system-monitor.png
+share/icons/Adwaita/512x512/apps/utilities-terminal.png
+share/icons/Adwaita/512x512/categories/applications-internet.png
+share/icons/Adwaita/512x512/categories/applications-system.png
+share/icons/Adwaita/512x512/devices/drive-harddisk.png
+share/icons/Adwaita/512x512/devices/input-dialpad.png
+share/icons/Adwaita/512x512/devices/multimedia-player.png
+share/icons/Adwaita/512x512/emblems/emblem-package.png
+share/icons/Adwaita/512x512/emblems/emblem-readonly.png
+share/icons/Adwaita/512x512/emblems/emblem-shared.png
+share/icons/Adwaita/512x512/emblems/emblem-symbolic-link.png
+share/icons/Adwaita/512x512/emblems/emblem-unreadable.png
+share/icons/Adwaita/512x512/mimetypes/application-x-executable.png
+share/icons/Adwaita/512x512/mimetypes/audio-x-generic.png
+share/icons/Adwaita/512x512/mimetypes/font-x-generic.png
+share/icons/Adwaita/512x512/mimetypes/image-x-generic.png
+share/icons/Adwaita/512x512/mimetypes/package-x-generic.png
+share/icons/Adwaita/512x512/mimetypes/text-html.png
+share/icons/Adwaita/512x512/mimetypes/text-x-generic-template.png
+share/icons/Adwaita/512x512/mimetypes/text-x-generic.png
+share/icons/Adwaita/512x512/mimetypes/text-x-preview.png
+share/icons/Adwaita/512x512/mimetypes/text-x-script.png
+share/icons/Adwaita/512x512/mimetypes/x-office-address-book.png
+share/icons/Adwaita/512x512/mimetypes/x-office-document-template.png
+share/icons/Adwaita/512x512/mimetypes/x-office-document.png
+share/icons/Adwaita/512x512/mimetypes/x-office-drawing-template.png
+share/icons/Adwaita/512x512/mimetypes/x-office-drawing.png
+share/icons/Adwaita/512x512/mimetypes/x-office-presentation-template.png
+share/icons/Adwaita/512x512/mimetypes/x-office-presentation.png
+share/icons/Adwaita/512x512/mimetypes/x-office-spreadsheet-template.png
+share/icons/Adwaita/512x512/mimetypes/x-office-spreadsheet.png
+share/icons/Adwaita/512x512/places/folder-documents.png
+share/icons/Adwaita/512x512/places/folder-download.png
+share/icons/Adwaita/512x512/places/folder-music.png
+share/icons/Adwaita/512x512/places/folder-pictures.png
+share/icons/Adwaita/512x512/places/folder-publicshare.png
+share/icons/Adwaita/512x512/places/folder-remote.png
+share/icons/Adwaita/512x512/places/folder-saved-search.png
+share/icons/Adwaita/512x512/places/folder-templates.png
+share/icons/Adwaita/512x512/places/folder-videos.png
+share/icons/Adwaita/512x512/places/folder.png
+share/icons/Adwaita/512x512/places/user-bookmarks.png
+share/icons/Adwaita/512x512/places/user-desktop.png
+share/icons/Adwaita/512x512/places/user-home.png
+share/icons/Adwaita/512x512/status/folder-drag-accept.png
+share/icons/Adwaita/512x512/status/folder-open.png
+share/icons/Adwaita/512x512/status/folder-visiting.png
+share/icons/Adwaita/512x512/status/image-loading.png
+share/icons/Adwaita/512x512/status/image-missing.png
share/icons/Adwaita/8x8/emblems/emblem-default.png
share/icons/Adwaita/8x8/emblems/emblem-new.png
share/icons/Adwaita/8x8/emblems/emblem-readonly.png
@@ -2127,12 +2128,12 @@ share/icons/Adwaita/cursors/c7088f0f3e6c8088236ef8e1e3e70000
share/icons/Adwaita/cursors/cell
share/icons/Adwaita/cursors/circle
share/icons/Adwaita/cursors/col-resize
+share/icons/Adwaita/cursors/context-menu
share/icons/Adwaita/cursors/copy
share/icons/Adwaita/cursors/cross
share/icons/Adwaita/cursors/cross_reverse
share/icons/Adwaita/cursors/crossed_circle
share/icons/Adwaita/cursors/crosshair
-share/icons/Adwaita/cursors/context-menu
share/icons/Adwaita/cursors/d9ce0ab605698f320427677b458ad60b
share/icons/Adwaita/cursors/default
share/icons/Adwaita/cursors/diamond_cross
@@ -2231,6 +2232,7 @@ share/icons/Adwaita/scalable/actions/appointment-new-symbolic.svg
share/icons/Adwaita/scalable/actions/bookmark-new-symbolic.svg
share/icons/Adwaita/scalable/actions/call-start-symbolic.svg
share/icons/Adwaita/scalable/actions/call-stop-symbolic.svg
+share/icons/Adwaita/scalable/actions/camera-switch-symbolic.svg
share/icons/Adwaita/scalable/actions/color-select-symbolic.svg
share/icons/Adwaita/scalable/actions/contact-new-symbolic.svg
share/icons/Adwaita/scalable/actions/document-edit-symbolic.svg
@@ -2261,6 +2263,7 @@ share/icons/Adwaita/scalable/actions/edit-select-all-symbolic.svg
share/icons/Adwaita/scalable/actions/edit-select-symbolic.svg
share/icons/Adwaita/scalable/actions/edit-undo-symbolic-rtl.svg
share/icons/Adwaita/scalable/actions/edit-undo-symbolic.svg
+share/icons/Adwaita/scalable/actions/error-correct-symbolic.svg
share/icons/Adwaita/scalable/actions/find-location-symbolic.svg
share/icons/Adwaita/scalable/actions/focus-legacy-systray-symbolic.svg
share/icons/Adwaita/scalable/actions/focus-top-bar-symbolic.svg
@@ -2344,6 +2347,7 @@ share/icons/Adwaita/scalable/actions/star-new-symbolic.svg
share/icons/Adwaita/scalable/actions/system-run-symbolic.svg
share/icons/Adwaita/scalable/actions/system-search-symbolic.svg
share/icons/Adwaita/scalable/actions/system-shutdown-symbolic.svg
+share/icons/Adwaita/scalable/actions/system-switch-user-symbolic.svg
share/icons/Adwaita/scalable/actions/tab-new-symbolic.svg
share/icons/Adwaita/scalable/actions/tools-check-spelling-symbolic.svg
share/icons/Adwaita/scalable/actions/view-app-grid-symbolic.svg
@@ -2352,9 +2356,11 @@ share/icons/Adwaita/scalable/actions/view-dual-symbolic.svg
share/icons/Adwaita/scalable/actions/view-fullscreen-symbolic.svg
share/icons/Adwaita/scalable/actions/view-grid-symbolic.svg
share/icons/Adwaita/scalable/actions/view-list-symbolic.svg
+share/icons/Adwaita/scalable/actions/view-mirror-symbolic.svg
share/icons/Adwaita/scalable/actions/view-more-horizontal-symbolic.svg
share/icons/Adwaita/scalable/actions/view-more-symbolic.svg
share/icons/Adwaita/scalable/actions/view-paged-symbolic.svg
+share/icons/Adwaita/scalable/actions/view-pin-symbolic.svg
share/icons/Adwaita/scalable/actions/view-refresh-symbolic.svg
share/icons/Adwaita/scalable/actions/view-restore-symbolic.svg
share/icons/Adwaita/scalable/actions/view-sort-ascending-symbolic.svg
@@ -2384,10 +2390,13 @@ share/icons/Adwaita/scalable/apps/preferences-desktop-accessibility-symbolic.svg
share/icons/Adwaita/scalable/apps/preferences-desktop-display-symbolic.svg
share/icons/Adwaita/scalable/apps/preferences-desktop-font-symbolic.svg
share/icons/Adwaita/scalable/apps/preferences-desktop-keyboard-shortcuts-symbolic.svg
+share/icons/Adwaita/scalable/apps/preferences-desktop-keyboard-symbolic.svg
share/icons/Adwaita/scalable/apps/preferences-desktop-locale-symbolic.svg
share/icons/Adwaita/scalable/apps/preferences-desktop-remote-desktop-symbolic.svg
share/icons/Adwaita/scalable/apps/preferences-desktop-screensaver-symbolic.svg
share/icons/Adwaita/scalable/apps/preferences-desktop-wallpaper-symbolic.svg
+share/icons/Adwaita/scalable/apps/preferences-system-details-symbolic.svg
+share/icons/Adwaita/scalable/apps/preferences-system-devices-symbolic.svg
share/icons/Adwaita/scalable/apps/preferences-system-network-proxy-symbolic.svg
share/icons/Adwaita/scalable/apps/preferences-system-network-symbolic.svg
share/icons/Adwaita/scalable/apps/preferences-system-notifications-symbolic.svg
@@ -2419,6 +2428,11 @@ share/icons/Adwaita/scalable/devices/audio-headphones-symbolic.svg
share/icons/Adwaita/scalable/devices/audio-headset-symbolic.svg
share/icons/Adwaita/scalable/devices/audio-input-microphone-symbolic.svg
share/icons/Adwaita/scalable/devices/audio-speakers-symbolic.svg
+share/icons/Adwaita/scalable/devices/audio-volume-high-symbolic.svg
+share/icons/Adwaita/scalable/devices/audio-volume-low-symbolic.svg
+share/icons/Adwaita/scalable/devices/audio-volume-medium-symbolic.svg
+share/icons/Adwaita/scalable/devices/audio-volume-muted-symbolic.svg
+share/icons/Adwaita/scalable/devices/audio-volume-overamplified-symbolic.svg
share/icons/Adwaita/scalable/devices/battery-symbolic.svg
share/icons/Adwaita/scalable/devices/camera-photo-symbolic.svg
share/icons/Adwaita/scalable/devices/camera-video-symbolic.svg
@@ -2461,9 +2475,12 @@ share/icons/Adwaita/scalable/devices/phone-symbolic.svg
share/icons/Adwaita/scalable/devices/printer-network-symbolic.svg
share/icons/Adwaita/scalable/devices/printer-symbolic.svg
share/icons/Adwaita/scalable/devices/scanner-symbolic.svg
+share/icons/Adwaita/scalable/devices/thunderbolt-symbolic.svg
share/icons/Adwaita/scalable/devices/tv-symbolic.svg
share/icons/Adwaita/scalable/devices/uninterruptible-power-supply-symbolic.svg
share/icons/Adwaita/scalable/devices/video-display-symbolic.svg
+share/icons/Adwaita/scalable/devices/video-joined-displays-symbolic.svg
+share/icons/Adwaita/scalable/devices/video-single-display-symbolic.svg
share/icons/Adwaita/scalable/emblems/emblem-default-symbolic.svg
share/icons/Adwaita/scalable/emblems/emblem-documents-symbolic.svg
share/icons/Adwaita/scalable/emblems/emblem-favorite-symbolic.svg
@@ -2506,6 +2523,7 @@ share/icons/Adwaita/scalable/mimetypes/application-rss+xml-symbolic.svg
share/icons/Adwaita/scalable/mimetypes/application-x-addon-symbolic.svg
share/icons/Adwaita/scalable/mimetypes/application-x-appliance-symbolic.svg
share/icons/Adwaita/scalable/mimetypes/application-x-executable-symbolic.svg
+share/icons/Adwaita/scalable/mimetypes/application-x-firmware-symbolic.svg
share/icons/Adwaita/scalable/mimetypes/audio-x-generic-symbolic.svg
share/icons/Adwaita/scalable/mimetypes/font-x-generic-symbolic.svg
share/icons/Adwaita/scalable/mimetypes/image-x-generic-symbolic.svg
@@ -2540,10 +2558,6 @@ share/icons/Adwaita/scalable/status/airplane-mode-symbolic.svg
share/icons/Adwaita/scalable/status/alarm-symbolic.svg
share/icons/Adwaita/scalable/status/appointment-missed-symbolic.svg
share/icons/Adwaita/scalable/status/appointment-soon-symbolic.svg
-share/icons/Adwaita/scalable/status/audio-volume-high-symbolic.svg
-share/icons/Adwaita/scalable/status/audio-volume-low-symbolic.svg
-share/icons/Adwaita/scalable/status/audio-volume-medium-symbolic.svg
-share/icons/Adwaita/scalable/status/audio-volume-muted-symbolic.svg
share/icons/Adwaita/scalable/status/avatar-default-symbolic.svg
share/icons/Adwaita/scalable/status/battery-caution-charging-symbolic.svg
share/icons/Adwaita/scalable/status/battery-caution-symbolic.svg
@@ -2569,6 +2583,8 @@ share/icons/Adwaita/scalable/status/checkbox-mixed-symbolic.svg
share/icons/Adwaita/scalable/status/checkbox-symbolic.svg
share/icons/Adwaita/scalable/status/computer-fail-symbolic.svg
share/icons/Adwaita/scalable/status/content-loading-symbolic.svg
+share/icons/Adwaita/scalable/status/daytime-sunrise-symbolic.svg
+share/icons/Adwaita/scalable/status/daytime-sunset-symbolic.svg
share/icons/Adwaita/scalable/status/dialog-error-symbolic.svg
share/icons/Adwaita/scalable/status/dialog-information-symbolic.svg
share/icons/Adwaita/scalable/status/dialog-password-symbolic.svg
@@ -2618,6 +2634,7 @@ share/icons/Adwaita/scalable/status/network-receive-symbolic.svg
share/icons/Adwaita/scalable/status/network-transmit-receive-symbolic.svg
share/icons/Adwaita/scalable/status/network-transmit-symbolic.svg
share/icons/Adwaita/scalable/status/network-vpn-acquiring-symbolic.svg
+share/icons/Adwaita/scalable/status/network-vpn-no-route-symbolic.svg
share/icons/Adwaita/scalable/status/network-vpn-symbolic.svg
share/icons/Adwaita/scalable/status/network-wired-acquiring-symbolic.svg
share/icons/Adwaita/scalable/status/network-wired-disconnected-symbolic.svg
@@ -2634,7 +2651,12 @@ share/icons/Adwaita/scalable/status/network-wireless-signal-good-symbolic.svg
share/icons/Adwaita/scalable/status/network-wireless-signal-none-symbolic.svg
share/icons/Adwaita/scalable/status/network-wireless-signal-ok-symbolic.svg
share/icons/Adwaita/scalable/status/network-wireless-signal-weak-symbolic.svg
+share/icons/Adwaita/scalable/status/night-light-symbolic.svg
share/icons/Adwaita/scalable/status/non-starred-symbolic.svg
+share/icons/Adwaita/scalable/status/orientation-landscape-inverse-symbolic.svg
+share/icons/Adwaita/scalable/status/orientation-landscape-symbolic.svg
+share/icons/Adwaita/scalable/status/orientation-portrait-inverse-symbolic.svg
+share/icons/Adwaita/scalable/status/orientation-portrait-symbolic.svg
share/icons/Adwaita/scalable/status/printer-error-symbolic.svg
share/icons/Adwaita/scalable/status/printer-printing-symbolic.svg
share/icons/Adwaita/scalable/status/printer-warning-symbolic.svg
@@ -2654,6 +2676,7 @@ share/icons/Adwaita/scalable/status/starred-symbolic.svg
share/icons/Adwaita/scalable/status/system-lock-screen-symbolic.svg
share/icons/Adwaita/scalable/status/task-due-symbolic.svg
share/icons/Adwaita/scalable/status/task-past-due-symbolic.svg
+share/icons/Adwaita/scalable/status/thunderbolt-acquiring-symbolic.svg
share/icons/Adwaita/scalable/status/touchpad-disabled-symbolic.svg
share/icons/Adwaita/scalable/status/user-available-symbolic.svg
share/icons/Adwaita/scalable/status/user-away-symbolic.svg
@@ -2677,3 +2700,4 @@ share/icons/Adwaita/scalable/status/weather-showers-scattered-symbolic.svg
share/icons/Adwaita/scalable/status/weather-showers-symbolic.svg
share/icons/Adwaita/scalable/status/weather-snow-symbolic.svg
share/icons/Adwaita/scalable/status/weather-storm-symbolic.svg
+share/icons/Adwaita/scalable/status/weather-windy-symbolic.svg
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index 4edfd120afb8..65535ba5f7cd 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -2,18 +2,20 @@
# $FreeBSD$
PORTNAME= gnome-backgrounds
-PORTVERSION= 3.18.0
+PORTVERSION= 3.28.0
CATEGORIES= x11-themes graphics gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Collection of backgrounds for GNOME
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome pathfix tar:xz
-USE_GNOME= intlhack
-GNU_CONFIGURE= yes
+NO_ARCH= yes
+USES= gettext meson tar:xz
.include <bsd.port.mk>
diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo
index 10427076f418..4317e388dd9b 100644
--- a/x11-themes/gnome-backgrounds/distinfo
+++ b/x11-themes/gnome-backgrounds/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-backgrounds-3.18.0.tar.xz) = aa560f0e5f12a308dd36aaac2fff32916abd61d42f47b4bc42c8c7011bf2a7b9
-SIZE (gnome3/gnome-backgrounds-3.18.0.tar.xz) = 15090244
+TIMESTAMP = 1525984740
+SHA256 (gnome/gnome-backgrounds-3.28.0.tar.xz) = b25b963d9d1ce076b489ef1e85c6540166f2312c77132f4ec0ecc90f3da8f1e1
+SIZE (gnome/gnome-backgrounds-3.28.0.tar.xz) = 26134776
diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist
index 88009a85843b..631aa766442f 100644
--- a/x11-themes/gnome-backgrounds/pkg-plist
+++ b/x11-themes/gnome-backgrounds/pkg-plist
@@ -1,22 +1,20 @@
-share/backgrounds/gnome/Blinds.jpg
-share/backgrounds/gnome/Bokeh_Tails.jpg
-share/backgrounds/gnome/Chmiri.jpg
+share/backgrounds/gnome/AndICallItBoke.jpg
+share/backgrounds/gnome/ColdWarm.jpg
share/backgrounds/gnome/Dark_Ivy.jpg
share/backgrounds/gnome/Fabric.jpg
share/backgrounds/gnome/Flowerbed.jpg
-share/backgrounds/gnome/FootFall.png
-share/backgrounds/gnome/Mirror.jpg
+share/backgrounds/gnome/Icescape.jpg
share/backgrounds/gnome/Road.jpg
share/backgrounds/gnome/Sandstone.jpg
-share/backgrounds/gnome/Stones.jpg
-share/backgrounds/gnome/Terraform-green.jpg
-share/backgrounds/gnome/Waves.jpg
-share/backgrounds/gnome/Whispy_Tails.jpg
+share/backgrounds/gnome/SeaSunset.jpg
+share/backgrounds/gnome/Wood.jpg
share/backgrounds/gnome/adwaita-day.jpg
-share/backgrounds/gnome/adwaita-lock.jpg
share/backgrounds/gnome/adwaita-morning.jpg
share/backgrounds/gnome/adwaita-night.jpg
share/backgrounds/gnome/adwaita-timed.xml
+share/backgrounds/gnome/endless-shapes.jpg
+share/backgrounds/gnome/symbolics-1.jpg
+share/backgrounds/gnome/symbolics-2.jpg
share/gnome-background-properties/adwaita.xml
share/gnome-background-properties/gnome-backgrounds.xml
share/locale/af/LC_MESSAGES/gnome-backgrounds.mo
@@ -51,10 +49,12 @@ share/locale/fr/LC_MESSAGES/gnome-backgrounds.mo
share/locale/fur/LC_MESSAGES/gnome-backgrounds.mo
share/locale/fy/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ga/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/gd/LC_MESSAGES/gnome-backgrounds.mo
share/locale/gl/LC_MESSAGES/gnome-backgrounds.mo
share/locale/gu/LC_MESSAGES/gnome-backgrounds.mo
share/locale/he/LC_MESSAGES/gnome-backgrounds.mo
share/locale/hi/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/hr/LC_MESSAGES/gnome-backgrounds.mo
share/locale/hu/LC_MESSAGES/gnome-backgrounds.mo
share/locale/hy/LC_MESSAGES/gnome-backgrounds.mo
share/locale/id/LC_MESSAGES/gnome-backgrounds.mo
diff --git a/x11-themes/gnome-themes-standard/Makefile b/x11-themes/gnome-themes-extra/Makefile
index 49e6b95d8679..e36cb6eca806 100644
--- a/x11-themes/gnome-themes-standard/Makefile
+++ b/x11-themes/gnome-themes-extra/Makefile
@@ -1,8 +1,8 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-PORTNAME= gnome-themes-standard
-PORTVERSION= 3.22.3
+PORTNAME= gnome-themes-extra
+PORTVERSION= 3.28
CATEGORIES= x11-themes gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,6 +11,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Standard themes for GNOME
LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/LICENSE
CONFLICTS= gnome-themes-2.[0-9]*
PORTSCOUT= limitw:1,even
@@ -19,13 +20,9 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
USES= gettext-tools gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME= cairo gtk20 gtk30 intlhack librsvg2
+USE_GNOME= cairo gtk20 intltool gtk30 librsvg2
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-post-patch:
- @${REINPLACE_CMD} -e 's|install: install-data|install:|g' \
- ${WRKSRC}/po/Makefile.in.in
-
.include <bsd.port.mk>
diff --git a/x11-themes/gnome-themes-extra/distinfo b/x11-themes/gnome-themes-extra/distinfo
new file mode 100644
index 000000000000..cfb8f067cd35
--- /dev/null
+++ b/x11-themes/gnome-themes-extra/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525979075
+SHA256 (gnome3/gnome-themes-extra-3.28.tar.xz) = 7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819
+SIZE (gnome3/gnome-themes-extra-3.28.tar.xz) = 2953272
diff --git a/x11-themes/gnome-themes-standard/pkg-descr b/x11-themes/gnome-themes-extra/pkg-descr
index 333388e7853d..333388e7853d 100644
--- a/x11-themes/gnome-themes-standard/pkg-descr
+++ b/x11-themes/gnome-themes-extra/pkg-descr
diff --git a/x11-themes/gnome-themes-standard/pkg-plist b/x11-themes/gnome-themes-extra/pkg-plist
index 2c3de9a86106..2c3de9a86106 100644
--- a/x11-themes/gnome-themes-standard/pkg-plist
+++ b/x11-themes/gnome-themes-extra/pkg-plist
diff --git a/x11-themes/gnome-themes-standard/distinfo b/x11-themes/gnome-themes-standard/distinfo
deleted file mode 100644
index 7256b04a5e71..000000000000
--- a/x11-themes/gnome-themes-standard/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1491986809
-SHA256 (gnome3/gnome-themes-standard-3.22.3.tar.xz) = 61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a
-SIZE (gnome3/gnome-themes-standard-3.22.3.tar.xz) = 2904736
diff --git a/x11-themes/gtk-arc-themes/Makefile b/x11-themes/gtk-arc-themes/Makefile
index 81011423b99c..f9bb48e67cca 100644
--- a/x11-themes/gtk-arc-themes/Makefile
+++ b/x11-themes/gtk-arc-themes/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtk-arc-themes
PORTVERSION= 20170302
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-themes
MAINTAINER= mail_me@riseup.net
@@ -13,9 +13,9 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gtk-murrine-engine>0:x11-themes/gtk-murrine-engine \
- gnome-themes-standard>0:x11-themes/gnome-themes-standard
+ gnome-themes-extra>0:x11-themes/gnome-themes-extra
RUN_DEPENDS= gtk-murrine-engine>0:x11-themes/gtk-murrine-engine \
- gnome-themes-standard>0:x11-themes/gnome-themes-standard
+ gnome-themes-extra>0:x11-themes/gnome-themes-extra
USE_GITHUB= yes
GH_ACCOUNT= horst3180
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 6c3dca6e264e..5ae6074eb340 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -41,7 +41,6 @@
SUBDIR += gtk20
SUBDIR += gtk20-reference
SUBDIR += gtk30
- SUBDIR += gtk30-reference
SUBDIR += gtkada
SUBDIR += gtkada3
SUBDIR += gtkdatabox
@@ -100,6 +99,7 @@
SUBDIR += libXt
SUBDIR += libbonoboui
SUBDIR += libbonoboui-reference
+ SUBDIR += libdazzle
SUBDIR += libgdiplus
SUBDIR += libgnomeprintui
SUBDIR += libgnomeprintuimm
@@ -191,7 +191,6 @@
SUBDIR += p5-Wx-GLCanvas
SUBDIR += p5-Wx-Perl-ProcessStream
SUBDIR += pango
- SUBDIR += pango-reference
SUBDIR += pangomm
SUBDIR += pangox-compat
SUBDIR += pangoxsl
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index b8b33c4e04cf..55c5d7d050a2 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gdl
-PORTVERSION= 3.22.0
+PORTVERSION= 3.28.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index 5acef2d6739e..6bc0e47e06ca 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496672932
-SHA256 (gnome3/gdl-3.22.0.tar.xz) = cc5b360e1392292186924f0f9a8efc0f4db7e6e56dc7042037466b5cc839660c
-SIZE (gnome3/gdl-3.22.0.tar.xz) = 529072
+TIMESTAMP = 1523096155
+SHA256 (gnome3/gdl-3.28.0.tar.xz) = 52cc98ecc105148467b3b2b4e0d27ae484b1b6710d53413f771ed07ef1b737b6
+SIZE (gnome3/gdl-3.28.0.tar.xz) = 541252
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 837e6926fbf3..f5edf396e086 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -36,7 +36,6 @@ share/gtk-doc/html/gdl-3.0/deprecated.html
share/gtk-doc/html/gdl-3.0/gdl-3.0.devhelp2
share/gtk-doc/html/gdl-3.0/home.png
share/gtk-doc/html/gdl-3.0/index.html
-share/gtk-doc/html/gdl-3.0/index.sgml
share/gtk-doc/html/gdl-3.0/left-insensitive.png
share/gtk-doc/html/gdl-3.0/left.png
share/gtk-doc/html/gdl-3.0/private.html
@@ -71,6 +70,7 @@ share/locale/et/LC_MESSAGES/gdl-3.mo
share/locale/eu/LC_MESSAGES/gdl-3.mo
share/locale/fi/LC_MESSAGES/gdl-3.mo
share/locale/fr/LC_MESSAGES/gdl-3.mo
+share/locale/fur/LC_MESSAGES/gdl-3.mo
share/locale/ga/LC_MESSAGES/gdl-3.mo
share/locale/gl/LC_MESSAGES/gdl-3.mo
share/locale/gu/LC_MESSAGES/gdl-3.mo
diff --git a/x11-toolkits/gtk30-reference/Makefile b/x11-toolkits/gtk30-reference/Makefile
deleted file mode 100644
index d8c8a63ce866..000000000000
--- a/x11-toolkits/gtk30-reference/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 0
-
-BOOKS= gdk gtk libgail-util
-
-NO_ARCH= yes
-
-do-install:
-.for d in ${BOOKS}
- if [ -d ${REFERENCE_SRC}/${d}/html ]; then \
- ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/${d}3; \
- cd ${REFERENCE_SRC}/${d}/html && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/doc/${d}3; \
- fi
-.endfor
-
-# overwrite this from bsd.port.mk, because we not don't honow DOCSDIR
-add-plist-docs:
- @${DO_NADA}
-
-.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtk30-reference/pkg-descr b/x11-toolkits/gtk30-reference/pkg-descr
deleted file mode 100644
index 6b94c24bff4d..000000000000
--- a/x11-toolkits/gtk30-reference/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port contains the programming reference for x11-toolkits/gtk30.
-
-WWW: http://www.gtk.org/
diff --git a/x11-toolkits/gtk30-reference/pkg-plist b/x11-toolkits/gtk30-reference/pkg-plist
deleted file mode 100644
index bd4499c83266..000000000000
--- a/x11-toolkits/gtk30-reference/pkg-plist
+++ /dev/null
@@ -1,664 +0,0 @@
-share/doc/gdk3/GdkDevice.html
-share/doc/gdk3/GdkDeviceManager.html
-share/doc/gdk3/GdkDevicePad.html
-share/doc/gdk3/GdkDisplay.html
-share/doc/gdk3/GdkDisplayManager.html
-share/doc/gdk3/GdkDrawingContext.html
-share/doc/gdk3/GdkFrameClock.html
-share/doc/gdk3/GdkGLContext.html
-share/doc/gdk3/GdkMonitor.html
-share/doc/gdk3/GdkScreen.html
-share/doc/gdk3/GdkSeat.html
-share/doc/gdk3/X_cursor.png
-share/doc/gdk3/alias_cursor.png
-share/doc/gdk3/all_scroll_cursor.png
-share/doc/gdk3/annotation-glossary.html
-share/doc/gdk3/api-index-full.html
-share/doc/gdk3/arrow.png
-share/doc/gdk3/based_arrow_down.png
-share/doc/gdk3/based_arrow_up.png
-share/doc/gdk3/boat.png
-share/doc/gdk3/bogosity.png
-share/doc/gdk3/bottom_left_corner.png
-share/doc/gdk3/bottom_right_corner.png
-share/doc/gdk3/bottom_side.png
-share/doc/gdk3/bottom_tee.png
-share/doc/gdk3/box_spiral.png
-share/doc/gdk3/cell_cursor.png
-share/doc/gdk3/center_ptr.png
-share/doc/gdk3/circle.png
-share/doc/gdk3/clock.png
-share/doc/gdk3/coffee_mug.png
-share/doc/gdk3/col_resize_cursor.png
-share/doc/gdk3/context_menu_cursor.png
-share/doc/gdk3/copy_cursor.png
-share/doc/gdk3/cross.png
-share/doc/gdk3/cross_reverse.png
-share/doc/gdk3/crosshair.png
-share/doc/gdk3/crosshair_cursor.png
-share/doc/gdk3/default_cursor.png
-share/doc/gdk3/diamond_cross.png
-share/doc/gdk3/dot.png
-share/doc/gdk3/dotbox.png
-share/doc/gdk3/double_arrow.png
-share/doc/gdk3/draft_large.png
-share/doc/gdk3/draft_small.png
-share/doc/gdk3/draped_box.png
-share/doc/gdk3/e_resize_cursor.png
-share/doc/gdk3/ew_resize_cursor.png
-share/doc/gdk3/exchange.png
-share/doc/gdk3/fleur.png
-share/doc/gdk3/gdk3-Application-launching.html
-share/doc/gdk3/gdk3-Cairo-Interaction.html
-share/doc/gdk3/gdk3-Colors.html
-share/doc/gdk3/gdk3-Cursors.html
-share/doc/gdk3/gdk3-Drag-and-Drop.html
-share/doc/gdk3/gdk3-Event-Structures.html
-share/doc/gdk3/gdk3-Events.html
-share/doc/gdk3/gdk3-GdkFrameTimings.html
-share/doc/gdk3/gdk3-General.html
-share/doc/gdk3/gdk3-Keyboard-Handling.html
-share/doc/gdk3/gdk3-Pango-Interaction.html
-share/doc/gdk3/gdk3-Pixbufs.html
-share/doc/gdk3/gdk3-Points-Rectangles-and-Regions.html
-share/doc/gdk3/gdk3-Properties-and-Atoms.html
-share/doc/gdk3/gdk3-RGBA-Colors.html
-share/doc/gdk3/gdk3-Selections.html
-share/doc/gdk3/gdk3-Testing.html
-share/doc/gdk3/gdk3-Threads.html
-share/doc/gdk3/gdk3-Visuals.html
-share/doc/gdk3/gdk3-Wayland-Interaction.html
-share/doc/gdk3/gdk3-Windows.html
-share/doc/gdk3/gdk3-X-Window-System-Interaction.html
-share/doc/gdk3/gdk3.devhelp2
-share/doc/gdk3/gobbler.png
-share/doc/gdk3/grab_cursor.png
-share/doc/gdk3/grabbing_cursor.png
-share/doc/gdk3/gumby.png
-share/doc/gdk3/hand1.png
-share/doc/gdk3/hand2.png
-share/doc/gdk3/hand_cursor.png
-share/doc/gdk3/heart.png
-share/doc/gdk3/help_cursor.png
-share/doc/gdk3/home.png
-share/doc/gdk3/icon.png
-share/doc/gdk3/index.html
-share/doc/gdk3/iron_cross.png
-share/doc/gdk3/left-insensitive.png
-share/doc/gdk3/left.png
-share/doc/gdk3/left_ptr.png
-share/doc/gdk3/left_side.png
-share/doc/gdk3/left_tee.png
-share/doc/gdk3/leftbutton.png
-share/doc/gdk3/ll_angle.png
-share/doc/gdk3/lr_angle.png
-share/doc/gdk3/man.png
-share/doc/gdk3/middlebutton.png
-share/doc/gdk3/mouse.png
-share/doc/gdk3/move_cursor.png
-share/doc/gdk3/n_resize_cursor.png
-share/doc/gdk3/ne_resize_cursor.png
-share/doc/gdk3/nesw_resize_cursor.png
-share/doc/gdk3/no_drop_cursor.png
-share/doc/gdk3/not_allowed_cursor.png
-share/doc/gdk3/ns_resize_cursor.png
-share/doc/gdk3/nw_resize_cursor.png
-share/doc/gdk3/nwse_resize_cursor.png
-share/doc/gdk3/pencil.png
-share/doc/gdk3/pirate.png
-share/doc/gdk3/plus.png
-share/doc/gdk3/pointer_cursor.png
-share/doc/gdk3/progress_cursor.png
-share/doc/gdk3/question_arrow.png
-share/doc/gdk3/reference.html
-share/doc/gdk3/right-insensitive.png
-share/doc/gdk3/right.png
-share/doc/gdk3/right_ptr.png
-share/doc/gdk3/right_side.png
-share/doc/gdk3/right_tee.png
-share/doc/gdk3/rightbutton.png
-share/doc/gdk3/rn02.html
-share/doc/gdk3/rotated-text.png
-share/doc/gdk3/row_resize_cursor.png
-share/doc/gdk3/rtl_logo.png
-share/doc/gdk3/s_resize_cursor.png
-share/doc/gdk3/sailboat.png
-share/doc/gdk3/sb_down_arrow.png
-share/doc/gdk3/sb_h_double_arrow.png
-share/doc/gdk3/sb_left_arrow.png
-share/doc/gdk3/sb_right_arrow.png
-share/doc/gdk3/sb_up_arrow.png
-share/doc/gdk3/sb_v_double_arrow.png
-share/doc/gdk3/se_resize_cursor.png
-share/doc/gdk3/shuttle.png
-share/doc/gdk3/sizing.png
-share/doc/gdk3/spider.png
-share/doc/gdk3/spraycan.png
-share/doc/gdk3/star.png
-share/doc/gdk3/style.css
-share/doc/gdk3/sw_resize_cursor.png
-share/doc/gdk3/target.png
-share/doc/gdk3/tcross.png
-share/doc/gdk3/text_cursor.png
-share/doc/gdk3/top_left_arrow.png
-share/doc/gdk3/top_left_corner.png
-share/doc/gdk3/top_right_corner.png
-share/doc/gdk3/top_side.png
-share/doc/gdk3/top_tee.png
-share/doc/gdk3/trek.png
-share/doc/gdk3/ul_angle.png
-share/doc/gdk3/umbrella.png
-share/doc/gdk3/up-insensitive.png
-share/doc/gdk3/up.png
-share/doc/gdk3/ur_angle.png
-share/doc/gdk3/vertical_text_cursor.png
-share/doc/gdk3/w_resize_cursor.png
-share/doc/gdk3/wait_cursor.png
-share/doc/gdk3/watch.png
-share/doc/gdk3/xterm.png
-share/doc/gdk3/zoom_in_cursor.png
-share/doc/gdk3/zoom_out_cursor.png
-%%PORTDOCS%%%%DOCSDIR%%3/AbstractObjects.html
-%%PORTDOCS%%%%DOCSDIR%%3/Application.html
-%%PORTDOCS%%%%DOCSDIR%%3/ApplicationChoosing.html
-%%PORTDOCS%%%%DOCSDIR%%3/Builder.html
-%%PORTDOCS%%%%DOCSDIR%%3/ButtonWidgets.html
-%%PORTDOCS%%%%DOCSDIR%%3/DeprecatedObjects.html
-%%PORTDOCS%%%%DOCSDIR%%3/DisplayWidgets.html
-%%PORTDOCS%%%%DOCSDIR%%3/Gestures.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAboutDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAccelLabel.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAccessible.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAction.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkActionBar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkActionGroup.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkActionable.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkActivatable.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAdjustment.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAlignment.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAppChooser.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAppChooserButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAppChooserDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAppChooserWidget.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkApplication.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkApplicationWindow.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkArrow.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAspectFrame.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkAssistant.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkBin.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkBuildable.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkBuilder.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkButtonBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCalendar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellArea.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellAreaBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellAreaContext.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellEditable.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellLayout.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellRenderer.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellRendererAccel.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellRendererCombo.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellRendererPixbuf.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellRendererProgress.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellRendererSpin.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellRendererSpinner.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellRendererText.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellRendererToggle.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCellView.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCheckButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCheckMenuItem.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkColorButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkColorChooser.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkColorChooserDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkColorChooserWidget.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkColorSelection.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkColorSelectionDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkComboBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkComboBoxText.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkContainer.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkCssProvider.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkDrawingArea.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkEditable.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkEntry.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkEntryBuffer.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkEntryCompletion.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkEventBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkEventController.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkExpander.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFileChooser.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFileChooserButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFileChooserDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFileChooserWidget.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFileFilter.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFixed.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFlowBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFontButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFontChooser.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFontChooserDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFontChooserWidget.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFontSelection.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFontSelectionDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkFrame.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGLArea.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGesture.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGestureDrag.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGestureLongPress.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGestureMultiPress.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGesturePan.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGestureRotate.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGestureSingle.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGestureSwipe.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGestureZoom.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkGrid.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkHBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkHButtonBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkHPaned.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkHSV.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkHScale.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkHScrollbar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkHSeparator.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkHandleBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkHeaderBar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkIMContext.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkIMContextSimple.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkIMMulticontext.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkIconTheme.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkIconView.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkImage.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkImageMenuItem.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkInfoBar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkInvisible.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkLabel.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkLayout.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkLevelBar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkLinkButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkListBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkListStore.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkLockButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkMenu.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkMenuBar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkMenuButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkMenuItem.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkMenuShell.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkMenuToolButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkMessageDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkMisc.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkModelButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkNotebook.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkNumerableIcon.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkOffscreenWindow.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkOverlay.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPadController.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPageSetup.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPageSetupUnixDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPaned.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPaperSize.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPlacesSidebar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPlug.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPopover.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPopoverMenu.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPrintContext.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPrintJob.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPrintSettings.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPrintUnixDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkPrinter.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkProgressBar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRadioAction.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRadioButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRadioMenuItem.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRadioToolButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRange.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRecentAction.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRecentChooser.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRecentChooserDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRecentChooserMenu.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRecentChooserWidget.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRecentFilter.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRecentManager.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkRevealer.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkScale.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkScaleButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkScrollable.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkScrollbar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkScrolledWindow.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSearchBar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSearchEntry.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSeparator.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSeparatorMenuItem.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSeparatorToolItem.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSettings.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkShortcutsGroup.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkShortcutsSection.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkShortcutsShortcut.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkShortcutsWindow.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSizeGroup.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSocket.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSpinButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSpinner.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkStack.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkStackSidebar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkStackSwitcher.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkStatusIcon.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkStatusbar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkStyle.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkStyleContext.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkStyleProvider.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkSwitch.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTable.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTearoffMenuItem.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTextBuffer.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTextIter.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTextMark.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTextTag.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTextTagTable.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTextView.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkThemingEngine.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkToggleAction.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkToggleButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkToggleToolButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkToolButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkToolItem.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkToolItemGroup.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkToolPalette.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkToolShell.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkToolbar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTooltip.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTreeModel.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTreeModelFilter.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTreeModelSort.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTreeSelection.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTreeSortable.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTreeStore.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTreeView.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkTreeViewColumn.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkUIManager.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkVBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkVButtonBox.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkVPaned.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkVScale.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkVScrollbar.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkVSeparator.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkViewport.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkVolumeButton.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkWidget.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkWindow.html
-%%PORTDOCS%%%%DOCSDIR%%3/GtkWindowGroup.html
-%%PORTDOCS%%%%DOCSDIR%%3/LayoutContainers.html
-%%PORTDOCS%%%%DOCSDIR%%3/MenusAndCombos.html
-%%PORTDOCS%%%%DOCSDIR%%3/MiscObjects.html
-%%PORTDOCS%%%%DOCSDIR%%3/NumericEntry.html
-%%PORTDOCS%%%%DOCSDIR%%3/Ornaments.html
-%%PORTDOCS%%%%DOCSDIR%%3/PlugSocket.html
-%%PORTDOCS%%%%DOCSDIR%%3/Printing.html
-%%PORTDOCS%%%%DOCSDIR%%3/RecentDocuments.html
-%%PORTDOCS%%%%DOCSDIR%%3/ScrollingWidgets.html
-%%PORTDOCS%%%%DOCSDIR%%3/SelectorWidgets.html
-%%PORTDOCS%%%%DOCSDIR%%3/ShortcutsOverview.html
-%%PORTDOCS%%%%DOCSDIR%%3/TextWidget.html
-%%PORTDOCS%%%%DOCSDIR%%3/TextWidgetObjects.html
-%%PORTDOCS%%%%DOCSDIR%%3/TreeWidget.html
-%%PORTDOCS%%%%DOCSDIR%%3/TreeWidgetObjects.html
-%%PORTDOCS%%%%DOCSDIR%%3/WindowWidgets.html
-%%PORTDOCS%%%%DOCSDIR%%3/aboutdialog.png
-%%PORTDOCS%%%%DOCSDIR%%3/accel-label.png
-%%PORTDOCS%%%%DOCSDIR%%3/action-bar.png
-%%PORTDOCS%%%%DOCSDIR%%3/annotation-glossary.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-full.html
-%%PORTDOCS%%%%DOCSDIR%%3/appchooserbutton.png
-%%PORTDOCS%%%%DOCSDIR%%3/appchooserdialog.png
-%%PORTDOCS%%%%DOCSDIR%%3/arrows.png
-%%PORTDOCS%%%%DOCSDIR%%3/assistant.png
-%%PORTDOCS%%%%DOCSDIR%%3/background.png
-%%PORTDOCS%%%%DOCSDIR%%3/bloatpad-gnome.png
-%%PORTDOCS%%%%DOCSDIR%%3/bloatpad-osx.png
-%%PORTDOCS%%%%DOCSDIR%%3/bloatpad-xfce.png
-%%PORTDOCS%%%%DOCSDIR%%3/border1.png
-%%PORTDOCS%%%%DOCSDIR%%3/border2.png
-%%PORTDOCS%%%%DOCSDIR%%3/border3.png
-%%PORTDOCS%%%%DOCSDIR%%3/box-expand.png
-%%PORTDOCS%%%%DOCSDIR%%3/box-packing.png
-%%PORTDOCS%%%%DOCSDIR%%3/broadwayd.html
-%%PORTDOCS%%%%DOCSDIR%%3/builder-shortcuts.png
-%%PORTDOCS%%%%DOCSDIR%%3/button.png
-%%PORTDOCS%%%%DOCSDIR%%3/ch01s02.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch01s03.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch01s04.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch01s05.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch02.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch03.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch26s02.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch28s02.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch30s02.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch30s03.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch32s02.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch32s03.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch32s04.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch32s05.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch32s06.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch32s07.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch32s08.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch32s09.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch32s10.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch32s11.html
-%%PORTDOCS%%%%DOCSDIR%%3/chap-css-overview.html
-%%PORTDOCS%%%%DOCSDIR%%3/chap-css-properties.html
-%%PORTDOCS%%%%DOCSDIR%%3/chap-drawing-model.html
-%%PORTDOCS%%%%DOCSDIR%%3/chap-input-handling.html
-%%PORTDOCS%%%%DOCSDIR%%3/check-button.png
-%%PORTDOCS%%%%DOCSDIR%%3/checklist-gdkeventexpose-region.html
-%%PORTDOCS%%%%DOCSDIR%%3/checklist-modifiers.html
-%%PORTDOCS%%%%DOCSDIR%%3/checklist-named-icons.html
-%%PORTDOCS%%%%DOCSDIR%%3/checks.png
-%%PORTDOCS%%%%DOCSDIR%%3/clocks-shortcuts.png
-%%PORTDOCS%%%%DOCSDIR%%3/color-button.png
-%%PORTDOCS%%%%DOCSDIR%%3/colorchooser.png
-%%PORTDOCS%%%%DOCSDIR%%3/combo-box-entry.png
-%%PORTDOCS%%%%DOCSDIR%%3/combo-box-text.png
-%%PORTDOCS%%%%DOCSDIR%%3/combo-box.png
-%%PORTDOCS%%%%DOCSDIR%%3/down-center.png
-%%PORTDOCS%%%%DOCSDIR%%3/down-end.png
-%%PORTDOCS%%%%DOCSDIR%%3/down-start.png
-%%PORTDOCS%%%%DOCSDIR%%3/drawing.png
-%%PORTDOCS%%%%DOCSDIR%%3/ease-in-out.png
-%%PORTDOCS%%%%DOCSDIR%%3/ease-in.png
-%%PORTDOCS%%%%DOCSDIR%%3/ease-out.png
-%%PORTDOCS%%%%DOCSDIR%%3/ease.png
-%%PORTDOCS%%%%DOCSDIR%%3/entry.png
-%%PORTDOCS%%%%DOCSDIR%%3/exampleapp.png
-%%PORTDOCS%%%%DOCSDIR%%3/expanders.png
-%%PORTDOCS%%%%DOCSDIR%%3/extensions.png
-%%PORTDOCS%%%%DOCSDIR%%3/figure-hierarchical-drawing.png
-%%PORTDOCS%%%%DOCSDIR%%3/figure-windowed-label.png
-%%PORTDOCS%%%%DOCSDIR%%3/file-button.png
-%%PORTDOCS%%%%DOCSDIR%%3/filechooser.png
-%%PORTDOCS%%%%DOCSDIR%%3/flow-box.png
-%%PORTDOCS%%%%DOCSDIR%%3/focus.png
-%%PORTDOCS%%%%DOCSDIR%%3/font-button.png
-%%PORTDOCS%%%%DOCSDIR%%3/fontchooser.png
-%%PORTDOCS%%%%DOCSDIR%%3/frame-gap.png
-%%PORTDOCS%%%%DOCSDIR%%3/frame.png
-%%PORTDOCS%%%%DOCSDIR%%3/frames.png
-%%PORTDOCS%%%%DOCSDIR%%3/gedit-shortcuts.png
-%%PORTDOCS%%%%DOCSDIR%%3/getting-started-app1.png
-%%PORTDOCS%%%%DOCSDIR%%3/getting-started-app10.png
-%%PORTDOCS%%%%DOCSDIR%%3/getting-started-app2.png
-%%PORTDOCS%%%%DOCSDIR%%3/getting-started-app3.png
-%%PORTDOCS%%%%DOCSDIR%%3/getting-started-app4.png
-%%PORTDOCS%%%%DOCSDIR%%3/getting-started-app6.png
-%%PORTDOCS%%%%DOCSDIR%%3/getting-started-app7.png
-%%PORTDOCS%%%%DOCSDIR%%3/getting-started-app8.png
-%%PORTDOCS%%%%DOCSDIR%%3/getting-started-app9.png
-%%PORTDOCS%%%%DOCSDIR%%3/glarea.png
-%%PORTDOCS%%%%DOCSDIR%%3/glossary.html
-%%PORTDOCS%%%%DOCSDIR%%3/gradient1.png
-%%PORTDOCS%%%%DOCSDIR%%3/gradient2.png
-%%PORTDOCS%%%%DOCSDIR%%3/gradient3.png
-%%PORTDOCS%%%%DOCSDIR%%3/gradient4.png
-%%PORTDOCS%%%%DOCSDIR%%3/grid-packing.png
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-broadway.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-builder-tool.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-building.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-compiling.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-encode-symbolic-svg.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-getting-started.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-launch.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-2-to-3.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-3-x-to-y.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-GtkGrid.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-GtkStyleContext-bonus-points.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-GtkStyleContext-checklist.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-GtkStyleContext-css.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-GtkStyleContext-parser-extensions.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-GtkStyleContext-parsing.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-GtkStyleContext.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-checklist.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-smclient-GtkApplication.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-theme-GtkStyleContext-engines.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-unique-GtkApplication.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-mir.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-osx.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-query-immodules-3.0.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-query-settings.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-question-index.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-resources.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-running.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-update-icon-cache.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-wayland.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-windows.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk-x11.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Accelerator-Maps.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Bindings.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Clipboards.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Drag-and-Drop.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Feature-Test-Macros.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Filesystem-utilities.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-General.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkFileChooserNative.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkGradient.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkNativeDialog.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkStyleProperties.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkSymbolicColor.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkTreeView-drag-and-drop.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkWidgetPath.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-High-level-Printing-API.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Keyboard-Accelerators.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Orientable.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Resource-Files.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Selections.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Standard-Enumerations.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Stock-Items.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Testing.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-Themeable-Stock-Images.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-demo-application.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-demo.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-icon-browser.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3-widget-factory.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtk3.devhelp2
-%%PORTDOCS%%%%DOCSDIR%%3/gtkbase.html
-%%PORTDOCS%%%%DOCSDIR%%3/gtkobjects.html
-%%PORTDOCS%%%%DOCSDIR%%3/handles.png
-%%PORTDOCS%%%%DOCSDIR%%3/headerbar.png
-%%PORTDOCS%%%%DOCSDIR%%3/hello-world.png
-%%PORTDOCS%%%%DOCSDIR%%3/home.png
-%%PORTDOCS%%%%DOCSDIR%%3/icon-view.png
-%%PORTDOCS%%%%DOCSDIR%%3/image.png
-%%PORTDOCS%%%%DOCSDIR%%3/index.html
-%%PORTDOCS%%%%DOCSDIR%%3/info-bar.png
-%%PORTDOCS%%%%DOCSDIR%%3/inspector.png
-%%PORTDOCS%%%%DOCSDIR%%3/label.png
-%%PORTDOCS%%%%DOCSDIR%%3/layout-btlr.png
-%%PORTDOCS%%%%DOCSDIR%%3/layout-btrl.png
-%%PORTDOCS%%%%DOCSDIR%%3/layout-lrbt.png
-%%PORTDOCS%%%%DOCSDIR%%3/layout-lrtb.png
-%%PORTDOCS%%%%DOCSDIR%%3/layout-rlbt.png
-%%PORTDOCS%%%%DOCSDIR%%3/layout-rltb.png
-%%PORTDOCS%%%%DOCSDIR%%3/layout-tblr.png
-%%PORTDOCS%%%%DOCSDIR%%3/layout-tbrl.png
-%%PORTDOCS%%%%DOCSDIR%%3/left-center.png
-%%PORTDOCS%%%%DOCSDIR%%3/left-end.png
-%%PORTDOCS%%%%DOCSDIR%%3/left-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%3/left-start.png
-%%PORTDOCS%%%%DOCSDIR%%3/left.png
-%%PORTDOCS%%%%DOCSDIR%%3/levelbar.png
-%%PORTDOCS%%%%DOCSDIR%%3/linear.png
-%%PORTDOCS%%%%DOCSDIR%%3/link-button.png
-%%PORTDOCS%%%%DOCSDIR%%3/list-and-tree.png
-%%PORTDOCS%%%%DOCSDIR%%3/list-box.png
-%%PORTDOCS%%%%DOCSDIR%%3/lock-button.png
-%%PORTDOCS%%%%DOCSDIR%%3/lockbutton-locked.png
-%%PORTDOCS%%%%DOCSDIR%%3/lockbutton-sorry.png
-%%PORTDOCS%%%%DOCSDIR%%3/lockbutton-unlocked.png
-%%PORTDOCS%%%%DOCSDIR%%3/lockbutton.png
-%%PORTDOCS%%%%DOCSDIR%%3/menu-button.png
-%%PORTDOCS%%%%DOCSDIR%%3/menubar.png
-%%PORTDOCS%%%%DOCSDIR%%3/messagedialog.png
-%%PORTDOCS%%%%DOCSDIR%%3/migrating.html
-%%PORTDOCS%%%%DOCSDIR%%3/multiline-text.png
-%%PORTDOCS%%%%DOCSDIR%%3/notebook.png
-%%PORTDOCS%%%%DOCSDIR%%3/numerableicon.png
-%%PORTDOCS%%%%DOCSDIR%%3/numerableicon2.png
-%%PORTDOCS%%%%DOCSDIR%%3/options.png
-%%PORTDOCS%%%%DOCSDIR%%3/pagesetupdialog.png
-%%PORTDOCS%%%%DOCSDIR%%3/panes.png
-%%PORTDOCS%%%%DOCSDIR%%3/placessidebar.png
-%%PORTDOCS%%%%DOCSDIR%%3/platform-support.html
-%%PORTDOCS%%%%DOCSDIR%%3/popup-anchors.png
-%%PORTDOCS%%%%DOCSDIR%%3/popup-flip.png
-%%PORTDOCS%%%%DOCSDIR%%3/popup-slide.png
-%%PORTDOCS%%%%DOCSDIR%%3/printdialog.png
-%%PORTDOCS%%%%DOCSDIR%%3/progressbar.png
-%%PORTDOCS%%%%DOCSDIR%%3/pt06.html
-%%PORTDOCS%%%%DOCSDIR%%3/radio-group.png
-%%PORTDOCS%%%%DOCSDIR%%3/recentchooserdialog.png
-%%PORTDOCS%%%%DOCSDIR%%3/right-center.png
-%%PORTDOCS%%%%DOCSDIR%%3/right-end.png
-%%PORTDOCS%%%%DOCSDIR%%3/right-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%3/right-start.png
-%%PORTDOCS%%%%DOCSDIR%%3/right.png
-%%PORTDOCS%%%%DOCSDIR%%3/scales.png
-%%PORTDOCS%%%%DOCSDIR%%3/scrollbar.png
-%%PORTDOCS%%%%DOCSDIR%%3/scrolledwindow.png
-%%PORTDOCS%%%%DOCSDIR%%3/search-bar.png
-%%PORTDOCS%%%%DOCSDIR%%3/search-entry.png
-%%PORTDOCS%%%%DOCSDIR%%3/separator.png
-%%PORTDOCS%%%%DOCSDIR%%3/sidebar.png
-%%PORTDOCS%%%%DOCSDIR%%3/slices.png
-%%PORTDOCS%%%%DOCSDIR%%3/sliders.png
-%%PORTDOCS%%%%DOCSDIR%%3/spinbutton.png
-%%PORTDOCS%%%%DOCSDIR%%3/spinner.png
-%%PORTDOCS%%%%DOCSDIR%%3/stack.png
-%%PORTDOCS%%%%DOCSDIR%%3/stackswitcher.png
-%%PORTDOCS%%%%DOCSDIR%%3/statusbar.png
-%%PORTDOCS%%%%DOCSDIR%%3/style.css
-%%PORTDOCS%%%%DOCSDIR%%3/switch.png
-%%PORTDOCS%%%%DOCSDIR%%3/theming.html
-%%PORTDOCS%%%%DOCSDIR%%3/toggle-button.png
-%%PORTDOCS%%%%DOCSDIR%%3/toolbar.png
-%%PORTDOCS%%%%DOCSDIR%%3/toolpalette.png
-%%PORTDOCS%%%%DOCSDIR%%3/tree-view-coordinates.png
-%%PORTDOCS%%%%DOCSDIR%%3/up-center.png
-%%PORTDOCS%%%%DOCSDIR%%3/up-end.png
-%%PORTDOCS%%%%DOCSDIR%%3/up-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%3/up-start.png
-%%PORTDOCS%%%%DOCSDIR%%3/up.png
-%%PORTDOCS%%%%DOCSDIR%%3/volumebutton.png
-%%PORTDOCS%%%%DOCSDIR%%3/widget-hvalign.png
-%%PORTDOCS%%%%DOCSDIR%%3/window-default.png
-%%PORTDOCS%%%%DOCSDIR%%3/window.png
-share/doc/libgail-util3/gail-libgail-util3-GailMisc.html
-share/doc/libgail-util3/gail-libgail-util3-GailTextUtil.html
-share/doc/libgail-util3/gail-libgail-util3.devhelp2
-share/doc/libgail-util3/home.png
-share/doc/libgail-util3/index.html
-share/doc/libgail-util3/left-insensitive.png
-share/doc/libgail-util3/left.png
-share/doc/libgail-util3/libgail-util-main.html
-share/doc/libgail-util3/right-insensitive.png
-share/doc/libgail-util3/right.png
-share/doc/libgail-util3/style.css
-share/doc/libgail-util3/up-insensitive.png
-share/doc/libgail-util3/up.png
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index ec9b2f12eef6..0c446084c306 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -4,24 +4,19 @@
# adwaita-icon-theme, gnome-themes-standard and mate-themes
PORTNAME= gtk
-PORTVERSION= 3.22.29
+PORTVERSION= 3.22.30
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX= 3
DISTNAME= gtk+-${PORTVERSION}
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (current stable version)
LICENSE= LGPL20
-USES= tar:xz
-
-.if defined(REFERENCE_PORT)
-PORTSCOUT= ignore:1
-.else
PORTSCOUT= limit:1,even
BUILD_DEPENDS+= at-spi2-atk>=0:accessibility/at-spi2-atk
@@ -39,8 +34,8 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango
#gtk-update-icon-cache
-USES+= compiler:c11 gettext gmake gnome libtool localbase \
- pathfix perl5 pkgconfig
+USES= compiler:c11 gettext gmake gnome libtool localbase \
+ pathfix perl5 pkgconfig tar:xz
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
CONFIGURE_ARGS= --enable-x11-backend \
@@ -49,7 +44,7 @@ CPPFLAGS+= -fno-omit-frame-pointer
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-LIBVERSION= 0.2200.29
+LIBVERSION= 0.2200.30
PLIST_SUB+= LIBVERSION=${LIBVERSION}
GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \
@@ -75,9 +70,22 @@ CUPS_CONFIGURE_ENABLE= cups
CLOUDPRINT_DESC= Cloud printing support
CLOUDPRINT_CONFIGURE_ENABLE= cloudprint
+CLOUDPRINT_USE= gnome=libxml2
CLOUDPRINT_LIB_DEPENDS= librest-0.7.so:devel/librest \
+ libsoup-2.4.so:devel/libsoup \
libjson-glib-1.0.so:devel/json-glib
+WAYLAND_DESC= GDK Wayland backend
+WAYLAND_CONFIGURE_ENABLE= wayland-backend
+WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \
+ v4l_compat>=0:multimedia/v4l_compat
+WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
+ libxkbcommon.so:x11/libxkbcommon
+WAYLAND_RUN_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
+WAYLAND_USE= GL=egl
+
+.include <bsd.port.options.mk>
+
# don't explicitly disable debug, this causes segfaults. ports r437293
DEBUG_CONFIGURE_ON= --enable-debug=yes
@@ -98,6 +106,12 @@ pre-configure:
${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \
${FALSE}; \
fi
+.if ${PORT_OPTIONS:MWAYLAND}
+ @if ! pkg-config --exists wayland-egl; then \
+ ${ECHO_MSG} "${PKGNAME}: Needs mesa-libs with wayland support enabled."; \
+ ${FALSE}; \
+ fi
+.endif
pre-build:
@${RM} -r ${WRKSRC}/docs/gtk.info*
@@ -110,5 +124,3 @@ post-install:
${STAGEDIR}${PREFIX}/man/man1
.include <bsd.port.mk>
-
-.endif
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 2f5b6aa43ab8..78cfa842702a 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522395169
-SHA256 (gnome3/gtk+-3.22.29.tar.xz) = a07d64b939fcc034a066b7723fdf9b24e92c9cfb6a8497593f3471fe56fbbbf8
-SIZE (gnome3/gtk+-3.22.29.tar.xz) = 18964852
+TIMESTAMP = 1524773157
+SHA256 (gnome/gtk+-3.22.30.tar.xz) = a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567
+SIZE (gnome/gtk+-3.22.30.tar.xz) = 18946084
diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_reference_Makefile.in
deleted file mode 100644
index a9d1d5f214c3..000000000000
--- a/x11-toolkits/gtk30/files/patch-docs_reference_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/reference/Makefile.in.orig 2010-06-27 12:22:03.000000000 +0200
-+++ docs/reference/Makefile.in 2010-06-27 12:22:37.000000000 +0200
-@@ -354,7 +354,7 @@
- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- && DISPLAY=:$$XID && export DISPLAY
-
--SUBDIRS = gdk gtk libgail-util
-+SUBDIRS = #gdk gtk libgail-util
- GITIGNOREFILES = */*.1
- all: all-recursive
-
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 3e1600106eb7..b7b245f3a956 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -424,6 +424,7 @@ lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.so
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.so
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.so
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.so
+%%WAYLAND%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-wayland.so
lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.so
%%CLOUDPRINT%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cloudprint.so
%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so
@@ -448,7 +449,16 @@ libdata/pkgconfig/gtk+-3.0.pc
libdata/pkgconfig/gtk+-unix-print-3.0.pc
%%WAYLAND%%libdata/pkgconfig/gtk+-wayland-3.0.pc
libdata/pkgconfig/gtk+-x11-3.0.pc
+%%BROADWAY%%man/man1/broadwayd.1.gz
+man/man1/gtk-builder-tool.1.gz
+man/man1/gtk-encode-symbolic-svg.1.gz
+man/man1/gtk-launch.1.gz
man/man1/gtk-query-immodules-3.0.1.gz
+man/man1/gtk-query-settings.1.gz
+man/man1/gtk3-demo-application.1.gz
+man/man1/gtk3-demo.1.gz
+man/man1/gtk3-icon-browser.1.gz
+man/man1/gtk3-widget-factory.1.gz
share/aclocal/gtk-3.0.m4
share/applications/gtk3-demo.desktop
share/applications/gtk3-icon-browser.desktop
@@ -458,7 +468,671 @@ share/gettext/its/gtkbuilder.loc
share/gir-1.0/Gdk-3.0.gir
share/gir-1.0/GdkX11-3.0.gir
share/gir-1.0/Gtk-3.0.gir
-share/gtk-3.0/gtkbuilder.rng
+%%DATADIR%%-3.0/gtkbuilder.rng
+%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailMisc.html
+%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailTextUtil.html
+%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3.devhelp2
+%%DATADIR%%-doc/html/gail-libgail-util3/home.png
+%%DATADIR%%-doc/html/gail-libgail-util3/index.html
+%%DATADIR%%-doc/html/gail-libgail-util3/left-insensitive.png
+%%DATADIR%%-doc/html/gail-libgail-util3/left.png
+%%DATADIR%%-doc/html/gail-libgail-util3/libgail-util-main.html
+%%DATADIR%%-doc/html/gail-libgail-util3/right-insensitive.png
+%%DATADIR%%-doc/html/gail-libgail-util3/right.png
+%%DATADIR%%-doc/html/gail-libgail-util3/style.css
+%%DATADIR%%-doc/html/gail-libgail-util3/up-insensitive.png
+%%DATADIR%%-doc/html/gail-libgail-util3/up.png
+%%DATADIR%%-doc/html/gdk3/GdkDevice.html
+%%DATADIR%%-doc/html/gdk3/GdkDeviceManager.html
+%%DATADIR%%-doc/html/gdk3/GdkDevicePad.html
+%%DATADIR%%-doc/html/gdk3/GdkDisplay.html
+%%DATADIR%%-doc/html/gdk3/GdkDisplayManager.html
+%%DATADIR%%-doc/html/gdk3/GdkDrawingContext.html
+%%DATADIR%%-doc/html/gdk3/GdkFrameClock.html
+%%DATADIR%%-doc/html/gdk3/GdkGLContext.html
+%%DATADIR%%-doc/html/gdk3/GdkMonitor.html
+%%DATADIR%%-doc/html/gdk3/GdkScreen.html
+%%DATADIR%%-doc/html/gdk3/GdkSeat.html
+%%DATADIR%%-doc/html/gdk3/X_cursor.png
+%%DATADIR%%-doc/html/gdk3/alias_cursor.png
+%%DATADIR%%-doc/html/gdk3/all_scroll_cursor.png
+%%DATADIR%%-doc/html/gdk3/annotation-glossary.html
+%%DATADIR%%-doc/html/gdk3/api-index-full.html
+%%DATADIR%%-doc/html/gdk3/arrow.png
+%%DATADIR%%-doc/html/gdk3/based_arrow_down.png
+%%DATADIR%%-doc/html/gdk3/based_arrow_up.png
+%%DATADIR%%-doc/html/gdk3/boat.png
+%%DATADIR%%-doc/html/gdk3/bogosity.png
+%%DATADIR%%-doc/html/gdk3/bottom_left_corner.png
+%%DATADIR%%-doc/html/gdk3/bottom_right_corner.png
+%%DATADIR%%-doc/html/gdk3/bottom_side.png
+%%DATADIR%%-doc/html/gdk3/bottom_tee.png
+%%DATADIR%%-doc/html/gdk3/box_spiral.png
+%%DATADIR%%-doc/html/gdk3/cell_cursor.png
+%%DATADIR%%-doc/html/gdk3/center_ptr.png
+%%DATADIR%%-doc/html/gdk3/circle.png
+%%DATADIR%%-doc/html/gdk3/clock.png
+%%DATADIR%%-doc/html/gdk3/coffee_mug.png
+%%DATADIR%%-doc/html/gdk3/col_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/context_menu_cursor.png
+%%DATADIR%%-doc/html/gdk3/copy_cursor.png
+%%DATADIR%%-doc/html/gdk3/cross.png
+%%DATADIR%%-doc/html/gdk3/cross_reverse.png
+%%DATADIR%%-doc/html/gdk3/crosshair.png
+%%DATADIR%%-doc/html/gdk3/crosshair_cursor.png
+%%DATADIR%%-doc/html/gdk3/default_cursor.png
+%%DATADIR%%-doc/html/gdk3/diamond_cross.png
+%%DATADIR%%-doc/html/gdk3/dot.png
+%%DATADIR%%-doc/html/gdk3/dotbox.png
+%%DATADIR%%-doc/html/gdk3/double_arrow.png
+%%DATADIR%%-doc/html/gdk3/draft_large.png
+%%DATADIR%%-doc/html/gdk3/draft_small.png
+%%DATADIR%%-doc/html/gdk3/draped_box.png
+%%DATADIR%%-doc/html/gdk3/e_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/ew_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/exchange.png
+%%DATADIR%%-doc/html/gdk3/fleur.png
+%%DATADIR%%-doc/html/gdk3/gdk3-Application-launching.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Cairo-Interaction.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Colors.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Cursors.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Drag-and-Drop.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Event-Structures.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Events.html
+%%DATADIR%%-doc/html/gdk3/gdk3-GdkFrameTimings.html
+%%DATADIR%%-doc/html/gdk3/gdk3-General.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Keyboard-Handling.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Pango-Interaction.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Pixbufs.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Points-Rectangles-and-Regions.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Properties-and-Atoms.html
+%%DATADIR%%-doc/html/gdk3/gdk3-RGBA-Colors.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Selections.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Testing.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Threads.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Visuals.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Wayland-Interaction.html
+%%DATADIR%%-doc/html/gdk3/gdk3-Windows.html
+%%DATADIR%%-doc/html/gdk3/gdk3-X-Window-System-Interaction.html
+%%DATADIR%%-doc/html/gdk3/gdk3.devhelp2
+%%DATADIR%%-doc/html/gdk3/gobbler.png
+%%DATADIR%%-doc/html/gdk3/grab_cursor.png
+%%DATADIR%%-doc/html/gdk3/grabbing_cursor.png
+%%DATADIR%%-doc/html/gdk3/gumby.png
+%%DATADIR%%-doc/html/gdk3/hand1.png
+%%DATADIR%%-doc/html/gdk3/hand2.png
+%%DATADIR%%-doc/html/gdk3/hand_cursor.png
+%%DATADIR%%-doc/html/gdk3/heart.png
+%%DATADIR%%-doc/html/gdk3/help_cursor.png
+%%DATADIR%%-doc/html/gdk3/home.png
+%%DATADIR%%-doc/html/gdk3/icon.png
+%%DATADIR%%-doc/html/gdk3/index.html
+%%DATADIR%%-doc/html/gdk3/iron_cross.png
+%%DATADIR%%-doc/html/gdk3/left-insensitive.png
+%%DATADIR%%-doc/html/gdk3/left.png
+%%DATADIR%%-doc/html/gdk3/left_ptr.png
+%%DATADIR%%-doc/html/gdk3/left_side.png
+%%DATADIR%%-doc/html/gdk3/left_tee.png
+%%DATADIR%%-doc/html/gdk3/leftbutton.png
+%%DATADIR%%-doc/html/gdk3/ll_angle.png
+%%DATADIR%%-doc/html/gdk3/lr_angle.png
+%%DATADIR%%-doc/html/gdk3/man.png
+%%DATADIR%%-doc/html/gdk3/middlebutton.png
+%%DATADIR%%-doc/html/gdk3/mouse.png
+%%DATADIR%%-doc/html/gdk3/move_cursor.png
+%%DATADIR%%-doc/html/gdk3/n_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/ne_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/nesw_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/no_drop_cursor.png
+%%DATADIR%%-doc/html/gdk3/not_allowed_cursor.png
+%%DATADIR%%-doc/html/gdk3/ns_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/nw_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/nwse_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/pencil.png
+%%DATADIR%%-doc/html/gdk3/pirate.png
+%%DATADIR%%-doc/html/gdk3/plus.png
+%%DATADIR%%-doc/html/gdk3/pointer_cursor.png
+%%DATADIR%%-doc/html/gdk3/progress_cursor.png
+%%DATADIR%%-doc/html/gdk3/question_arrow.png
+%%DATADIR%%-doc/html/gdk3/reference.html
+%%DATADIR%%-doc/html/gdk3/right-insensitive.png
+%%DATADIR%%-doc/html/gdk3/right.png
+%%DATADIR%%-doc/html/gdk3/right_ptr.png
+%%DATADIR%%-doc/html/gdk3/right_side.png
+%%DATADIR%%-doc/html/gdk3/right_tee.png
+%%DATADIR%%-doc/html/gdk3/rightbutton.png
+%%DATADIR%%-doc/html/gdk3/rn02.html
+%%DATADIR%%-doc/html/gdk3/rotated-text.png
+%%DATADIR%%-doc/html/gdk3/row_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/rtl_logo.png
+%%DATADIR%%-doc/html/gdk3/s_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/sailboat.png
+%%DATADIR%%-doc/html/gdk3/sb_down_arrow.png
+%%DATADIR%%-doc/html/gdk3/sb_h_double_arrow.png
+%%DATADIR%%-doc/html/gdk3/sb_left_arrow.png
+%%DATADIR%%-doc/html/gdk3/sb_right_arrow.png
+%%DATADIR%%-doc/html/gdk3/sb_up_arrow.png
+%%DATADIR%%-doc/html/gdk3/sb_v_double_arrow.png
+%%DATADIR%%-doc/html/gdk3/se_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/shuttle.png
+%%DATADIR%%-doc/html/gdk3/sizing.png
+%%DATADIR%%-doc/html/gdk3/spider.png
+%%DATADIR%%-doc/html/gdk3/spraycan.png
+%%DATADIR%%-doc/html/gdk3/star.png
+%%DATADIR%%-doc/html/gdk3/style.css
+%%DATADIR%%-doc/html/gdk3/sw_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/target.png
+%%DATADIR%%-doc/html/gdk3/tcross.png
+%%DATADIR%%-doc/html/gdk3/text_cursor.png
+%%DATADIR%%-doc/html/gdk3/top_left_arrow.png
+%%DATADIR%%-doc/html/gdk3/top_left_corner.png
+%%DATADIR%%-doc/html/gdk3/top_right_corner.png
+%%DATADIR%%-doc/html/gdk3/top_side.png
+%%DATADIR%%-doc/html/gdk3/top_tee.png
+%%DATADIR%%-doc/html/gdk3/trek.png
+%%DATADIR%%-doc/html/gdk3/ul_angle.png
+%%DATADIR%%-doc/html/gdk3/umbrella.png
+%%DATADIR%%-doc/html/gdk3/up-insensitive.png
+%%DATADIR%%-doc/html/gdk3/up.png
+%%DATADIR%%-doc/html/gdk3/ur_angle.png
+%%DATADIR%%-doc/html/gdk3/vertical_text_cursor.png
+%%DATADIR%%-doc/html/gdk3/w_resize_cursor.png
+%%DATADIR%%-doc/html/gdk3/wait_cursor.png
+%%DATADIR%%-doc/html/gdk3/watch.png
+%%DATADIR%%-doc/html/gdk3/xterm.png
+%%DATADIR%%-doc/html/gdk3/zoom_in_cursor.png
+%%DATADIR%%-doc/html/gdk3/zoom_out_cursor.png
+%%DATADIR%%-doc/html/gtk3/AbstractObjects.html
+%%DATADIR%%-doc/html/gtk3/Application.html
+%%DATADIR%%-doc/html/gtk3/ApplicationChoosing.html
+%%DATADIR%%-doc/html/gtk3/Builder.html
+%%DATADIR%%-doc/html/gtk3/ButtonWidgets.html
+%%DATADIR%%-doc/html/gtk3/DeprecatedObjects.html
+%%DATADIR%%-doc/html/gtk3/DisplayWidgets.html
+%%DATADIR%%-doc/html/gtk3/Gestures.html
+%%DATADIR%%-doc/html/gtk3/GtkAboutDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkAccelLabel.html
+%%DATADIR%%-doc/html/gtk3/GtkAccessible.html
+%%DATADIR%%-doc/html/gtk3/GtkAction.html
+%%DATADIR%%-doc/html/gtk3/GtkActionBar.html
+%%DATADIR%%-doc/html/gtk3/GtkActionGroup.html
+%%DATADIR%%-doc/html/gtk3/GtkActionable.html
+%%DATADIR%%-doc/html/gtk3/GtkActivatable.html
+%%DATADIR%%-doc/html/gtk3/GtkAdjustment.html
+%%DATADIR%%-doc/html/gtk3/GtkAlignment.html
+%%DATADIR%%-doc/html/gtk3/GtkAppChooser.html
+%%DATADIR%%-doc/html/gtk3/GtkAppChooserButton.html
+%%DATADIR%%-doc/html/gtk3/GtkAppChooserDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkAppChooserWidget.html
+%%DATADIR%%-doc/html/gtk3/GtkApplication.html
+%%DATADIR%%-doc/html/gtk3/GtkApplicationWindow.html
+%%DATADIR%%-doc/html/gtk3/GtkArrow.html
+%%DATADIR%%-doc/html/gtk3/GtkAspectFrame.html
+%%DATADIR%%-doc/html/gtk3/GtkAssistant.html
+%%DATADIR%%-doc/html/gtk3/GtkBin.html
+%%DATADIR%%-doc/html/gtk3/GtkBox.html
+%%DATADIR%%-doc/html/gtk3/GtkBuildable.html
+%%DATADIR%%-doc/html/gtk3/GtkBuilder.html
+%%DATADIR%%-doc/html/gtk3/GtkButton.html
+%%DATADIR%%-doc/html/gtk3/GtkButtonBox.html
+%%DATADIR%%-doc/html/gtk3/GtkCalendar.html
+%%DATADIR%%-doc/html/gtk3/GtkCellArea.html
+%%DATADIR%%-doc/html/gtk3/GtkCellAreaBox.html
+%%DATADIR%%-doc/html/gtk3/GtkCellAreaContext.html
+%%DATADIR%%-doc/html/gtk3/GtkCellEditable.html
+%%DATADIR%%-doc/html/gtk3/GtkCellLayout.html
+%%DATADIR%%-doc/html/gtk3/GtkCellRenderer.html
+%%DATADIR%%-doc/html/gtk3/GtkCellRendererAccel.html
+%%DATADIR%%-doc/html/gtk3/GtkCellRendererCombo.html
+%%DATADIR%%-doc/html/gtk3/GtkCellRendererPixbuf.html
+%%DATADIR%%-doc/html/gtk3/GtkCellRendererProgress.html
+%%DATADIR%%-doc/html/gtk3/GtkCellRendererSpin.html
+%%DATADIR%%-doc/html/gtk3/GtkCellRendererSpinner.html
+%%DATADIR%%-doc/html/gtk3/GtkCellRendererText.html
+%%DATADIR%%-doc/html/gtk3/GtkCellRendererToggle.html
+%%DATADIR%%-doc/html/gtk3/GtkCellView.html
+%%DATADIR%%-doc/html/gtk3/GtkCheckButton.html
+%%DATADIR%%-doc/html/gtk3/GtkCheckMenuItem.html
+%%DATADIR%%-doc/html/gtk3/GtkColorButton.html
+%%DATADIR%%-doc/html/gtk3/GtkColorChooser.html
+%%DATADIR%%-doc/html/gtk3/GtkColorChooserDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkColorChooserWidget.html
+%%DATADIR%%-doc/html/gtk3/GtkColorSelection.html
+%%DATADIR%%-doc/html/gtk3/GtkColorSelectionDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkComboBox.html
+%%DATADIR%%-doc/html/gtk3/GtkComboBoxText.html
+%%DATADIR%%-doc/html/gtk3/GtkContainer.html
+%%DATADIR%%-doc/html/gtk3/GtkCssProvider.html
+%%DATADIR%%-doc/html/gtk3/GtkDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkDrawingArea.html
+%%DATADIR%%-doc/html/gtk3/GtkEditable.html
+%%DATADIR%%-doc/html/gtk3/GtkEntry.html
+%%DATADIR%%-doc/html/gtk3/GtkEntryBuffer.html
+%%DATADIR%%-doc/html/gtk3/GtkEntryCompletion.html
+%%DATADIR%%-doc/html/gtk3/GtkEventBox.html
+%%DATADIR%%-doc/html/gtk3/GtkEventController.html
+%%DATADIR%%-doc/html/gtk3/GtkExpander.html
+%%DATADIR%%-doc/html/gtk3/GtkFileChooser.html
+%%DATADIR%%-doc/html/gtk3/GtkFileChooserButton.html
+%%DATADIR%%-doc/html/gtk3/GtkFileChooserDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkFileChooserWidget.html
+%%DATADIR%%-doc/html/gtk3/GtkFileFilter.html
+%%DATADIR%%-doc/html/gtk3/GtkFixed.html
+%%DATADIR%%-doc/html/gtk3/GtkFlowBox.html
+%%DATADIR%%-doc/html/gtk3/GtkFontButton.html
+%%DATADIR%%-doc/html/gtk3/GtkFontChooser.html
+%%DATADIR%%-doc/html/gtk3/GtkFontChooserDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkFontChooserWidget.html
+%%DATADIR%%-doc/html/gtk3/GtkFontSelection.html
+%%DATADIR%%-doc/html/gtk3/GtkFontSelectionDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkFrame.html
+%%DATADIR%%-doc/html/gtk3/GtkGLArea.html
+%%DATADIR%%-doc/html/gtk3/GtkGesture.html
+%%DATADIR%%-doc/html/gtk3/GtkGestureDrag.html
+%%DATADIR%%-doc/html/gtk3/GtkGestureLongPress.html
+%%DATADIR%%-doc/html/gtk3/GtkGestureMultiPress.html
+%%DATADIR%%-doc/html/gtk3/GtkGesturePan.html
+%%DATADIR%%-doc/html/gtk3/GtkGestureRotate.html
+%%DATADIR%%-doc/html/gtk3/GtkGestureSingle.html
+%%DATADIR%%-doc/html/gtk3/GtkGestureSwipe.html
+%%DATADIR%%-doc/html/gtk3/GtkGestureZoom.html
+%%DATADIR%%-doc/html/gtk3/GtkGrid.html
+%%DATADIR%%-doc/html/gtk3/GtkHBox.html
+%%DATADIR%%-doc/html/gtk3/GtkHButtonBox.html
+%%DATADIR%%-doc/html/gtk3/GtkHPaned.html
+%%DATADIR%%-doc/html/gtk3/GtkHSV.html
+%%DATADIR%%-doc/html/gtk3/GtkHScale.html
+%%DATADIR%%-doc/html/gtk3/GtkHScrollbar.html
+%%DATADIR%%-doc/html/gtk3/GtkHSeparator.html
+%%DATADIR%%-doc/html/gtk3/GtkHandleBox.html
+%%DATADIR%%-doc/html/gtk3/GtkHeaderBar.html
+%%DATADIR%%-doc/html/gtk3/GtkIMContext.html
+%%DATADIR%%-doc/html/gtk3/GtkIMContextSimple.html
+%%DATADIR%%-doc/html/gtk3/GtkIMMulticontext.html
+%%DATADIR%%-doc/html/gtk3/GtkIconTheme.html
+%%DATADIR%%-doc/html/gtk3/GtkIconView.html
+%%DATADIR%%-doc/html/gtk3/GtkImage.html
+%%DATADIR%%-doc/html/gtk3/GtkImageMenuItem.html
+%%DATADIR%%-doc/html/gtk3/GtkInfoBar.html
+%%DATADIR%%-doc/html/gtk3/GtkInvisible.html
+%%DATADIR%%-doc/html/gtk3/GtkLabel.html
+%%DATADIR%%-doc/html/gtk3/GtkLayout.html
+%%DATADIR%%-doc/html/gtk3/GtkLevelBar.html
+%%DATADIR%%-doc/html/gtk3/GtkLinkButton.html
+%%DATADIR%%-doc/html/gtk3/GtkListBox.html
+%%DATADIR%%-doc/html/gtk3/GtkListStore.html
+%%DATADIR%%-doc/html/gtk3/GtkLockButton.html
+%%DATADIR%%-doc/html/gtk3/GtkMenu.html
+%%DATADIR%%-doc/html/gtk3/GtkMenuBar.html
+%%DATADIR%%-doc/html/gtk3/GtkMenuButton.html
+%%DATADIR%%-doc/html/gtk3/GtkMenuItem.html
+%%DATADIR%%-doc/html/gtk3/GtkMenuShell.html
+%%DATADIR%%-doc/html/gtk3/GtkMenuToolButton.html
+%%DATADIR%%-doc/html/gtk3/GtkMessageDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkMisc.html
+%%DATADIR%%-doc/html/gtk3/GtkModelButton.html
+%%DATADIR%%-doc/html/gtk3/GtkNotebook.html
+%%DATADIR%%-doc/html/gtk3/GtkNumerableIcon.html
+%%DATADIR%%-doc/html/gtk3/GtkOffscreenWindow.html
+%%DATADIR%%-doc/html/gtk3/GtkOverlay.html
+%%DATADIR%%-doc/html/gtk3/GtkPadController.html
+%%DATADIR%%-doc/html/gtk3/GtkPageSetup.html
+%%DATADIR%%-doc/html/gtk3/GtkPageSetupUnixDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkPaned.html
+%%DATADIR%%-doc/html/gtk3/GtkPaperSize.html
+%%DATADIR%%-doc/html/gtk3/GtkPlacesSidebar.html
+%%DATADIR%%-doc/html/gtk3/GtkPlug.html
+%%DATADIR%%-doc/html/gtk3/GtkPopover.html
+%%DATADIR%%-doc/html/gtk3/GtkPopoverMenu.html
+%%DATADIR%%-doc/html/gtk3/GtkPrintContext.html
+%%DATADIR%%-doc/html/gtk3/GtkPrintJob.html
+%%DATADIR%%-doc/html/gtk3/GtkPrintSettings.html
+%%DATADIR%%-doc/html/gtk3/GtkPrintUnixDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkPrinter.html
+%%DATADIR%%-doc/html/gtk3/GtkProgressBar.html
+%%DATADIR%%-doc/html/gtk3/GtkRadioAction.html
+%%DATADIR%%-doc/html/gtk3/GtkRadioButton.html
+%%DATADIR%%-doc/html/gtk3/GtkRadioMenuItem.html
+%%DATADIR%%-doc/html/gtk3/GtkRadioToolButton.html
+%%DATADIR%%-doc/html/gtk3/GtkRange.html
+%%DATADIR%%-doc/html/gtk3/GtkRecentAction.html
+%%DATADIR%%-doc/html/gtk3/GtkRecentChooser.html
+%%DATADIR%%-doc/html/gtk3/GtkRecentChooserDialog.html
+%%DATADIR%%-doc/html/gtk3/GtkRecentChooserMenu.html
+%%DATADIR%%-doc/html/gtk3/GtkRecentChooserWidget.html
+%%DATADIR%%-doc/html/gtk3/GtkRecentFilter.html
+%%DATADIR%%-doc/html/gtk3/GtkRecentManager.html
+%%DATADIR%%-doc/html/gtk3/GtkRevealer.html
+%%DATADIR%%-doc/html/gtk3/GtkScale.html
+%%DATADIR%%-doc/html/gtk3/GtkScaleButton.html
+%%DATADIR%%-doc/html/gtk3/GtkScrollable.html
+%%DATADIR%%-doc/html/gtk3/GtkScrollbar.html
+%%DATADIR%%-doc/html/gtk3/GtkScrolledWindow.html
+%%DATADIR%%-doc/html/gtk3/GtkSearchBar.html
+%%DATADIR%%-doc/html/gtk3/GtkSearchEntry.html
+%%DATADIR%%-doc/html/gtk3/GtkSeparator.html
+%%DATADIR%%-doc/html/gtk3/GtkSeparatorMenuItem.html
+%%DATADIR%%-doc/html/gtk3/GtkSeparatorToolItem.html
+%%DATADIR%%-doc/html/gtk3/GtkSettings.html
+%%DATADIR%%-doc/html/gtk3/GtkShortcutsGroup.html
+%%DATADIR%%-doc/html/gtk3/GtkShortcutsSection.html
+%%DATADIR%%-doc/html/gtk3/GtkShortcutsShortcut.html
+%%DATADIR%%-doc/html/gtk3/GtkShortcutsWindow.html
+%%DATADIR%%-doc/html/gtk3/GtkSizeGroup.html
+%%DATADIR%%-doc/html/gtk3/GtkSocket.html
+%%DATADIR%%-doc/html/gtk3/GtkSpinButton.html
+%%DATADIR%%-doc/html/gtk3/GtkSpinner.html
+%%DATADIR%%-doc/html/gtk3/GtkStack.html
+%%DATADIR%%-doc/html/gtk3/GtkStackSidebar.html
+%%DATADIR%%-doc/html/gtk3/GtkStackSwitcher.html
+%%DATADIR%%-doc/html/gtk3/GtkStatusIcon.html
+%%DATADIR%%-doc/html/gtk3/GtkStatusbar.html
+%%DATADIR%%-doc/html/gtk3/GtkStyle.html
+%%DATADIR%%-doc/html/gtk3/GtkStyleContext.html
+%%DATADIR%%-doc/html/gtk3/GtkStyleProvider.html
+%%DATADIR%%-doc/html/gtk3/GtkSwitch.html
+%%DATADIR%%-doc/html/gtk3/GtkTable.html
+%%DATADIR%%-doc/html/gtk3/GtkTearoffMenuItem.html
+%%DATADIR%%-doc/html/gtk3/GtkTextBuffer.html
+%%DATADIR%%-doc/html/gtk3/GtkTextIter.html
+%%DATADIR%%-doc/html/gtk3/GtkTextMark.html
+%%DATADIR%%-doc/html/gtk3/GtkTextTag.html
+%%DATADIR%%-doc/html/gtk3/GtkTextTagTable.html
+%%DATADIR%%-doc/html/gtk3/GtkTextView.html
+%%DATADIR%%-doc/html/gtk3/GtkThemingEngine.html
+%%DATADIR%%-doc/html/gtk3/GtkToggleAction.html
+%%DATADIR%%-doc/html/gtk3/GtkToggleButton.html
+%%DATADIR%%-doc/html/gtk3/GtkToggleToolButton.html
+%%DATADIR%%-doc/html/gtk3/GtkToolButton.html
+%%DATADIR%%-doc/html/gtk3/GtkToolItem.html
+%%DATADIR%%-doc/html/gtk3/GtkToolItemGroup.html
+%%DATADIR%%-doc/html/gtk3/GtkToolPalette.html
+%%DATADIR%%-doc/html/gtk3/GtkToolShell.html
+%%DATADIR%%-doc/html/gtk3/GtkToolbar.html
+%%DATADIR%%-doc/html/gtk3/GtkTooltip.html
+%%DATADIR%%-doc/html/gtk3/GtkTreeModel.html
+%%DATADIR%%-doc/html/gtk3/GtkTreeModelFilter.html
+%%DATADIR%%-doc/html/gtk3/GtkTreeModelSort.html
+%%DATADIR%%-doc/html/gtk3/GtkTreeSelection.html
+%%DATADIR%%-doc/html/gtk3/GtkTreeSortable.html
+%%DATADIR%%-doc/html/gtk3/GtkTreeStore.html
+%%DATADIR%%-doc/html/gtk3/GtkTreeView.html
+%%DATADIR%%-doc/html/gtk3/GtkTreeViewColumn.html
+%%DATADIR%%-doc/html/gtk3/GtkUIManager.html
+%%DATADIR%%-doc/html/gtk3/GtkVBox.html
+%%DATADIR%%-doc/html/gtk3/GtkVButtonBox.html
+%%DATADIR%%-doc/html/gtk3/GtkVPaned.html
+%%DATADIR%%-doc/html/gtk3/GtkVScale.html
+%%DATADIR%%-doc/html/gtk3/GtkVScrollbar.html
+%%DATADIR%%-doc/html/gtk3/GtkVSeparator.html
+%%DATADIR%%-doc/html/gtk3/GtkViewport.html
+%%DATADIR%%-doc/html/gtk3/GtkVolumeButton.html
+%%DATADIR%%-doc/html/gtk3/GtkWidget.html
+%%DATADIR%%-doc/html/gtk3/GtkWindow.html
+%%DATADIR%%-doc/html/gtk3/GtkWindowGroup.html
+%%DATADIR%%-doc/html/gtk3/LayoutContainers.html
+%%DATADIR%%-doc/html/gtk3/MenusAndCombos.html
+%%DATADIR%%-doc/html/gtk3/MiscObjects.html
+%%DATADIR%%-doc/html/gtk3/NumericEntry.html
+%%DATADIR%%-doc/html/gtk3/Ornaments.html
+%%DATADIR%%-doc/html/gtk3/PlugSocket.html
+%%DATADIR%%-doc/html/gtk3/Printing.html
+%%DATADIR%%-doc/html/gtk3/RecentDocuments.html
+%%DATADIR%%-doc/html/gtk3/ScrollingWidgets.html
+%%DATADIR%%-doc/html/gtk3/SelectorWidgets.html
+%%DATADIR%%-doc/html/gtk3/ShortcutsOverview.html
+%%DATADIR%%-doc/html/gtk3/TextWidget.html
+%%DATADIR%%-doc/html/gtk3/TextWidgetObjects.html
+%%DATADIR%%-doc/html/gtk3/TreeWidget.html
+%%DATADIR%%-doc/html/gtk3/TreeWidgetObjects.html
+%%DATADIR%%-doc/html/gtk3/WindowWidgets.html
+%%DATADIR%%-doc/html/gtk3/aboutdialog.png
+%%DATADIR%%-doc/html/gtk3/accel-label.png
+%%DATADIR%%-doc/html/gtk3/action-bar.png
+%%DATADIR%%-doc/html/gtk3/annotation-glossary.html
+%%DATADIR%%-doc/html/gtk3/api-index-full.html
+%%DATADIR%%-doc/html/gtk3/appchooserbutton.png
+%%DATADIR%%-doc/html/gtk3/appchooserdialog.png
+%%DATADIR%%-doc/html/gtk3/arrows.png
+%%DATADIR%%-doc/html/gtk3/assistant.png
+%%DATADIR%%-doc/html/gtk3/background.png
+%%DATADIR%%-doc/html/gtk3/bloatpad-gnome.png
+%%DATADIR%%-doc/html/gtk3/bloatpad-osx.png
+%%DATADIR%%-doc/html/gtk3/bloatpad-xfce.png
+%%DATADIR%%-doc/html/gtk3/border1.png
+%%DATADIR%%-doc/html/gtk3/border2.png
+%%DATADIR%%-doc/html/gtk3/border3.png
+%%DATADIR%%-doc/html/gtk3/box-expand.png
+%%DATADIR%%-doc/html/gtk3/box-packing.png
+%%DATADIR%%-doc/html/gtk3/broadwayd.html
+%%DATADIR%%-doc/html/gtk3/builder-shortcuts.png
+%%DATADIR%%-doc/html/gtk3/button.png
+%%DATADIR%%-doc/html/gtk3/ch01s02.html
+%%DATADIR%%-doc/html/gtk3/ch01s03.html
+%%DATADIR%%-doc/html/gtk3/ch01s04.html
+%%DATADIR%%-doc/html/gtk3/ch01s05.html
+%%DATADIR%%-doc/html/gtk3/ch02.html
+%%DATADIR%%-doc/html/gtk3/ch03.html
+%%DATADIR%%-doc/html/gtk3/ch26s02.html
+%%DATADIR%%-doc/html/gtk3/ch28s02.html
+%%DATADIR%%-doc/html/gtk3/ch30s02.html
+%%DATADIR%%-doc/html/gtk3/ch30s03.html
+%%DATADIR%%-doc/html/gtk3/ch32s02.html
+%%DATADIR%%-doc/html/gtk3/ch32s03.html
+%%DATADIR%%-doc/html/gtk3/ch32s04.html
+%%DATADIR%%-doc/html/gtk3/ch32s05.html
+%%DATADIR%%-doc/html/gtk3/ch32s06.html
+%%DATADIR%%-doc/html/gtk3/ch32s07.html
+%%DATADIR%%-doc/html/gtk3/ch32s08.html
+%%DATADIR%%-doc/html/gtk3/ch32s09.html
+%%DATADIR%%-doc/html/gtk3/ch32s10.html
+%%DATADIR%%-doc/html/gtk3/ch32s11.html
+%%DATADIR%%-doc/html/gtk3/chap-css-overview.html
+%%DATADIR%%-doc/html/gtk3/chap-css-properties.html
+%%DATADIR%%-doc/html/gtk3/chap-drawing-model.html
+%%DATADIR%%-doc/html/gtk3/chap-input-handling.html
+%%DATADIR%%-doc/html/gtk3/check-button.png
+%%DATADIR%%-doc/html/gtk3/checklist-gdkeventexpose-region.html
+%%DATADIR%%-doc/html/gtk3/checklist-modifiers.html
+%%DATADIR%%-doc/html/gtk3/checklist-named-icons.html
+%%DATADIR%%-doc/html/gtk3/checks.png
+%%DATADIR%%-doc/html/gtk3/clocks-shortcuts.png
+%%DATADIR%%-doc/html/gtk3/color-button.png
+%%DATADIR%%-doc/html/gtk3/colorchooser.png
+%%DATADIR%%-doc/html/gtk3/combo-box-entry.png
+%%DATADIR%%-doc/html/gtk3/combo-box-text.png
+%%DATADIR%%-doc/html/gtk3/combo-box.png
+%%DATADIR%%-doc/html/gtk3/down-center.png
+%%DATADIR%%-doc/html/gtk3/down-end.png
+%%DATADIR%%-doc/html/gtk3/down-start.png
+%%DATADIR%%-doc/html/gtk3/drawing.png
+%%DATADIR%%-doc/html/gtk3/ease-in-out.png
+%%DATADIR%%-doc/html/gtk3/ease-in.png
+%%DATADIR%%-doc/html/gtk3/ease-out.png
+%%DATADIR%%-doc/html/gtk3/ease.png
+%%DATADIR%%-doc/html/gtk3/entry.png
+%%DATADIR%%-doc/html/gtk3/exampleapp.png
+%%DATADIR%%-doc/html/gtk3/expanders.png
+%%DATADIR%%-doc/html/gtk3/extensions.png
+%%DATADIR%%-doc/html/gtk3/figure-hierarchical-drawing.png
+%%DATADIR%%-doc/html/gtk3/figure-windowed-label.png
+%%DATADIR%%-doc/html/gtk3/file-button.png
+%%DATADIR%%-doc/html/gtk3/filechooser.png
+%%DATADIR%%-doc/html/gtk3/flow-box.png
+%%DATADIR%%-doc/html/gtk3/focus.png
+%%DATADIR%%-doc/html/gtk3/font-button.png
+%%DATADIR%%-doc/html/gtk3/fontchooser.png
+%%DATADIR%%-doc/html/gtk3/frame-gap.png
+%%DATADIR%%-doc/html/gtk3/frame.png
+%%DATADIR%%-doc/html/gtk3/frames.png
+%%DATADIR%%-doc/html/gtk3/gedit-shortcuts.png
+%%DATADIR%%-doc/html/gtk3/getting-started-app1.png
+%%DATADIR%%-doc/html/gtk3/getting-started-app10.png
+%%DATADIR%%-doc/html/gtk3/getting-started-app2.png
+%%DATADIR%%-doc/html/gtk3/getting-started-app3.png
+%%DATADIR%%-doc/html/gtk3/getting-started-app4.png
+%%DATADIR%%-doc/html/gtk3/getting-started-app6.png
+%%DATADIR%%-doc/html/gtk3/getting-started-app7.png
+%%DATADIR%%-doc/html/gtk3/getting-started-app8.png
+%%DATADIR%%-doc/html/gtk3/getting-started-app9.png
+%%DATADIR%%-doc/html/gtk3/glarea.png
+%%DATADIR%%-doc/html/gtk3/glossary.html
+%%DATADIR%%-doc/html/gtk3/gradient1.png
+%%DATADIR%%-doc/html/gtk3/gradient2.png
+%%DATADIR%%-doc/html/gtk3/gradient3.png
+%%DATADIR%%-doc/html/gtk3/gradient4.png
+%%DATADIR%%-doc/html/gtk3/grid-packing.png
+%%DATADIR%%-doc/html/gtk3/gtk-broadway.html
+%%DATADIR%%-doc/html/gtk3/gtk-builder-tool.html
+%%DATADIR%%-doc/html/gtk3/gtk-building.html
+%%DATADIR%%-doc/html/gtk3/gtk-compiling.html
+%%DATADIR%%-doc/html/gtk3/gtk-encode-symbolic-svg.html
+%%DATADIR%%-doc/html/gtk3/gtk-getting-started.html
+%%DATADIR%%-doc/html/gtk3/gtk-launch.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-2-to-3.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-3-x-to-y.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-GtkGrid.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-GtkStyleContext-bonus-points.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-GtkStyleContext-checklist.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-GtkStyleContext-css.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-GtkStyleContext-parser-extensions.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-GtkStyleContext-parsing.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-GtkStyleContext.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-checklist.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-smclient-GtkApplication.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-theme-GtkStyleContext-engines.html
+%%DATADIR%%-doc/html/gtk3/gtk-migrating-unique-GtkApplication.html
+%%DATADIR%%-doc/html/gtk3/gtk-mir.html
+%%DATADIR%%-doc/html/gtk3/gtk-osx.html
+%%DATADIR%%-doc/html/gtk3/gtk-query-immodules-3.0.html
+%%DATADIR%%-doc/html/gtk3/gtk-query-settings.html
+%%DATADIR%%-doc/html/gtk3/gtk-question-index.html
+%%DATADIR%%-doc/html/gtk3/gtk-resources.html
+%%DATADIR%%-doc/html/gtk3/gtk-running.html
+%%DATADIR%%-doc/html/gtk3/gtk-update-icon-cache.html
+%%DATADIR%%-doc/html/gtk3/gtk-wayland.html
+%%DATADIR%%-doc/html/gtk3/gtk-windows.html
+%%DATADIR%%-doc/html/gtk3/gtk-x11.html
+%%DATADIR%%-doc/html/gtk3/gtk.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Accelerator-Maps.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Bindings.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Clipboards.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Drag-and-Drop.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Feature-Test-Macros.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Filesystem-utilities.html
+%%DATADIR%%-doc/html/gtk3/gtk3-General.html
+%%DATADIR%%-doc/html/gtk3/gtk3-GtkFileChooserNative.html
+%%DATADIR%%-doc/html/gtk3/gtk3-GtkGradient.html
+%%DATADIR%%-doc/html/gtk3/gtk3-GtkNativeDialog.html
+%%DATADIR%%-doc/html/gtk3/gtk3-GtkStyleProperties.html
+%%DATADIR%%-doc/html/gtk3/gtk3-GtkSymbolicColor.html
+%%DATADIR%%-doc/html/gtk3/gtk3-GtkTreeView-drag-and-drop.html
+%%DATADIR%%-doc/html/gtk3/gtk3-GtkWidgetPath.html
+%%DATADIR%%-doc/html/gtk3/gtk3-High-level-Printing-API.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Keyboard-Accelerators.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Orientable.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Resource-Files.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Selections.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Standard-Enumerations.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Stock-Items.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Testing.html
+%%DATADIR%%-doc/html/gtk3/gtk3-Themeable-Stock-Images.html
+%%DATADIR%%-doc/html/gtk3/gtk3-demo-application.html
+%%DATADIR%%-doc/html/gtk3/gtk3-demo.html
+%%DATADIR%%-doc/html/gtk3/gtk3-icon-browser.html
+%%DATADIR%%-doc/html/gtk3/gtk3-widget-factory.html
+%%DATADIR%%-doc/html/gtk3/gtk3.devhelp2
+%%DATADIR%%-doc/html/gtk3/gtkbase.html
+%%DATADIR%%-doc/html/gtk3/gtkobjects.html
+%%DATADIR%%-doc/html/gtk3/handles.png
+%%DATADIR%%-doc/html/gtk3/headerbar.png
+%%DATADIR%%-doc/html/gtk3/hello-world.png
+%%DATADIR%%-doc/html/gtk3/home.png
+%%DATADIR%%-doc/html/gtk3/icon-view.png
+%%DATADIR%%-doc/html/gtk3/image.png
+%%DATADIR%%-doc/html/gtk3/index.html
+%%DATADIR%%-doc/html/gtk3/info-bar.png
+%%DATADIR%%-doc/html/gtk3/inspector.png
+%%DATADIR%%-doc/html/gtk3/label.png
+%%DATADIR%%-doc/html/gtk3/layout-btlr.png
+%%DATADIR%%-doc/html/gtk3/layout-btrl.png
+%%DATADIR%%-doc/html/gtk3/layout-lrbt.png
+%%DATADIR%%-doc/html/gtk3/layout-lrtb.png
+%%DATADIR%%-doc/html/gtk3/layout-rlbt.png
+%%DATADIR%%-doc/html/gtk3/layout-rltb.png
+%%DATADIR%%-doc/html/gtk3/layout-tblr.png
+%%DATADIR%%-doc/html/gtk3/layout-tbrl.png
+%%DATADIR%%-doc/html/gtk3/left-center.png
+%%DATADIR%%-doc/html/gtk3/left-end.png
+%%DATADIR%%-doc/html/gtk3/left-insensitive.png
+%%DATADIR%%-doc/html/gtk3/left-start.png
+%%DATADIR%%-doc/html/gtk3/left.png
+%%DATADIR%%-doc/html/gtk3/levelbar.png
+%%DATADIR%%-doc/html/gtk3/linear.png
+%%DATADIR%%-doc/html/gtk3/link-button.png
+%%DATADIR%%-doc/html/gtk3/list-and-tree.png
+%%DATADIR%%-doc/html/gtk3/list-box.png
+%%DATADIR%%-doc/html/gtk3/lock-button.png
+%%DATADIR%%-doc/html/gtk3/lockbutton-locked.png
+%%DATADIR%%-doc/html/gtk3/lockbutton-sorry.png
+%%DATADIR%%-doc/html/gtk3/lockbutton-unlocked.png
+%%DATADIR%%-doc/html/gtk3/lockbutton.png
+%%DATADIR%%-doc/html/gtk3/menu-button.png
+%%DATADIR%%-doc/html/gtk3/menubar.png
+%%DATADIR%%-doc/html/gtk3/messagedialog.png
+%%DATADIR%%-doc/html/gtk3/migrating.html
+%%DATADIR%%-doc/html/gtk3/multiline-text.png
+%%DATADIR%%-doc/html/gtk3/notebook.png
+%%DATADIR%%-doc/html/gtk3/numerableicon.png
+%%DATADIR%%-doc/html/gtk3/numerableicon2.png
+%%DATADIR%%-doc/html/gtk3/options.png
+%%DATADIR%%-doc/html/gtk3/pagesetupdialog.png
+%%DATADIR%%-doc/html/gtk3/panes.png
+%%DATADIR%%-doc/html/gtk3/placessidebar.png
+%%DATADIR%%-doc/html/gtk3/platform-support.html
+%%DATADIR%%-doc/html/gtk3/popup-anchors.png
+%%DATADIR%%-doc/html/gtk3/popup-flip.png
+%%DATADIR%%-doc/html/gtk3/popup-slide.png
+%%DATADIR%%-doc/html/gtk3/printdialog.png
+%%DATADIR%%-doc/html/gtk3/progressbar.png
+%%DATADIR%%-doc/html/gtk3/pt06.html
+%%DATADIR%%-doc/html/gtk3/radio-group.png
+%%DATADIR%%-doc/html/gtk3/recentchooserdialog.png
+%%DATADIR%%-doc/html/gtk3/right-center.png
+%%DATADIR%%-doc/html/gtk3/right-end.png
+%%DATADIR%%-doc/html/gtk3/right-insensitive.png
+%%DATADIR%%-doc/html/gtk3/right-start.png
+%%DATADIR%%-doc/html/gtk3/right.png
+%%DATADIR%%-doc/html/gtk3/scales.png
+%%DATADIR%%-doc/html/gtk3/scrollbar.png
+%%DATADIR%%-doc/html/gtk3/scrolledwindow.png
+%%DATADIR%%-doc/html/gtk3/search-bar.png
+%%DATADIR%%-doc/html/gtk3/search-entry.png
+%%DATADIR%%-doc/html/gtk3/separator.png
+%%DATADIR%%-doc/html/gtk3/sidebar.png
+%%DATADIR%%-doc/html/gtk3/slices.png
+%%DATADIR%%-doc/html/gtk3/sliders.png
+%%DATADIR%%-doc/html/gtk3/spinbutton.png
+%%DATADIR%%-doc/html/gtk3/spinner.png
+%%DATADIR%%-doc/html/gtk3/stack.png
+%%DATADIR%%-doc/html/gtk3/stackswitcher.png
+%%DATADIR%%-doc/html/gtk3/statusbar.png
+%%DATADIR%%-doc/html/gtk3/style.css
+%%DATADIR%%-doc/html/gtk3/switch.png
+%%DATADIR%%-doc/html/gtk3/theming.html
+%%DATADIR%%-doc/html/gtk3/toggle-button.png
+%%DATADIR%%-doc/html/gtk3/toolbar.png
+%%DATADIR%%-doc/html/gtk3/toolpalette.png
+%%DATADIR%%-doc/html/gtk3/tree-view-coordinates.png
+%%DATADIR%%-doc/html/gtk3/up-center.png
+%%DATADIR%%-doc/html/gtk3/up-end.png
+%%DATADIR%%-doc/html/gtk3/up-insensitive.png
+%%DATADIR%%-doc/html/gtk3/up-start.png
+%%DATADIR%%-doc/html/gtk3/up.png
+%%DATADIR%%-doc/html/gtk3/volumebutton.png
+%%DATADIR%%-doc/html/gtk3/widget-hvalign.png
+%%DATADIR%%-doc/html/gtk3/window-default.png
+%%DATADIR%%-doc/html/gtk3/window.png
share/icons/hicolor/16x16/apps/gtk3-demo-symbolic.symbolic.png
share/icons/hicolor/16x16/apps/gtk3-demo.png
share/icons/hicolor/16x16/apps/gtk3-widget-factory-symbolic.symbolic.png
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index afecef1c925a..beabc2d17403 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -14,6 +14,8 @@ COMMENT= Useful widget set complementary to GTK+ 2.0
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
+BROKEN= Does not build: libgtkextra-x11-2.0.so: undefined reference to `gtkextra_BOOLEAN__BOXED_BOXED'
+
USES= gmake libtool pathfix pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 7022403f96f5..da9e57b80708 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -1,10 +1,9 @@
# Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.77 2011/07/16 17:31:29 kwm Exp $
PORTNAME= gtkmm
-PORTVERSION= 2.24.4
-PORTREVISION?= 3
+PORTVERSION= 2.24.5
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
PKGNAMESUFFIX= 24
@@ -20,13 +19,15 @@ PORTSCOUT= ignore:1
.if !defined(REFERENCE_PORT)
BUILD_DEPENDS= gm4:devel/m4
+LIB_DEPENDS= libfreetype.so:print/freetype2 \
+ libfontconfig.so:x11-fonts/fontconfig
GNU_CONFIGURE= yes
USES+= gettext gmake libtool:keepla pathfix pkgconfig \
compiler:c++11-lang
USE_CXXSTD= gnu++11
USE_LDCONFIG= yes
-USE_GNOME= atkmm gtk20 pangomm
+USE_GNOME= atkmm gdkpixbuf2 gtk20 pangomm
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-documentation
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index d35c95d98d31..24f6a7e3c11b 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome2/gtkmm-2.24.4.tar.xz) = 443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee
-SIZE (gnome2/gtkmm-2.24.4.tar.xz) = 10262212
+TIMESTAMP = 1506627384
+SHA256 (gnome2/gtkmm-2.24.5.tar.xz) = 0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72
+SIZE (gnome2/gtkmm-2.24.5.tar.xz) = 12022024
diff --git a/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_menushell.cc b/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_menushell.cc
deleted file mode 100644
index 663a44adbe3a..000000000000
--- a/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_menushell.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/gtkmm/menushell.cc.orig 2017-04-02 16:29:30 UTC
-+++ gtk/gtkmm/menushell.cc
-@@ -130,7 +130,7 @@ MenuList::iterator MenuList::insert(MenuList::iterator
- {
- const Glib::RefPtr<Gtk::MenuItem> item = element.get_child();
-
-- g_return_val_if_fail(item != 0, position);
-+ g_return_val_if_fail(item, position);
- g_return_val_if_fail(gparent() != 0, position);
-
- int pos = -1;
diff --git a/x11-toolkits/libdazzle/Makefile b/x11-toolkits/libdazzle/Makefile
new file mode 100644
index 000000000000..11f3505fb8f9
--- /dev/null
+++ b/x11-toolkits/libdazzle/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME= libdazzle
+PORTVERSION= 3.28.3
+CATEGORIES= x11-toolkits
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Staging and stabilizing for facy Glib and Gtk+ features
+
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= valac:lang/vala
+
+USES= gnome meson pkgconfig tar:xz
+USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libdazzle/distinfo b/x11-toolkits/libdazzle/distinfo
new file mode 100644
index 000000000000..44808828edbe
--- /dev/null
+++ b/x11-toolkits/libdazzle/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1529614509
+SHA256 (gnome/libdazzle-3.28.3.tar.xz) = 879f88b87b0b4048bad8aedc0ca4e60869ed9525d84eda1bcfdba7a457bc0a61
+SIZE (gnome/libdazzle-3.28.3.tar.xz) = 421612
diff --git a/x11-toolkits/libdazzle/pkg-descr b/x11-toolkits/libdazzle/pkg-descr
new file mode 100644
index 000000000000..c1176251ade4
--- /dev/null
+++ b/x11-toolkits/libdazzle/pkg-descr
@@ -0,0 +1,6 @@
+libdazzle is a collection of fancy features for GLib and Gtk+ that
+aren't quite ready or generic enough for use inside those libraries.
+This is often a proving ground for new widget prototypes. Applications
+such as Builder tend to drive development of this project.
+
+WWW:
diff --git a/x11-toolkits/libdazzle/pkg-plist b/x11-toolkits/libdazzle/pkg-plist
new file mode 100644
index 000000000000..17acbfbb5bc3
--- /dev/null
+++ b/x11-toolkits/libdazzle/pkg-plist
@@ -0,0 +1,147 @@
+bin/dazzle-list-counters
+include/libdazzle-1.0/actions/dzl-action-group.h
+include/libdazzle-1.0/actions/dzl-child-property-action.h
+include/libdazzle-1.0/actions/dzl-properties-group.h
+include/libdazzle-1.0/actions/dzl-settings-flag-action.h
+include/libdazzle-1.0/actions/dzl-widget-action-group.h
+include/libdazzle-1.0/animation/dzl-animation.h
+include/libdazzle-1.0/animation/dzl-box-theatric.h
+include/libdazzle-1.0/app/dzl-application-window.h
+include/libdazzle-1.0/app/dzl-application.h
+include/libdazzle-1.0/bindings/dzl-binding-group.h
+include/libdazzle-1.0/bindings/dzl-signal-group.h
+include/libdazzle-1.0/cache/dzl-task-cache.h
+include/libdazzle-1.0/dazzle.h
+include/libdazzle-1.0/dzl-enums.h
+include/libdazzle-1.0/dzl-version-macros.h
+include/libdazzle-1.0/dzl-version.h
+include/libdazzle-1.0/files/dzl-directory-model.h
+include/libdazzle-1.0/files/dzl-directory-reaper.h
+include/libdazzle-1.0/files/dzl-file-transfer.h
+include/libdazzle-1.0/files/dzl-recursive-file-monitor.h
+include/libdazzle-1.0/graphing/dzl-cpu-graph.h
+include/libdazzle-1.0/graphing/dzl-cpu-model.h
+include/libdazzle-1.0/graphing/dzl-graph-column.h
+include/libdazzle-1.0/graphing/dzl-graph-line-renderer.h
+include/libdazzle-1.0/graphing/dzl-graph-model.h
+include/libdazzle-1.0/graphing/dzl-graph-renderer.h
+include/libdazzle-1.0/graphing/dzl-graph-view.h
+include/libdazzle-1.0/menus/dzl-joined-menu.h
+include/libdazzle-1.0/menus/dzl-menu-button.h
+include/libdazzle-1.0/menus/dzl-menu-manager.h
+include/libdazzle-1.0/panel/dzl-dock-bin-edge.h
+include/libdazzle-1.0/panel/dzl-dock-bin.h
+include/libdazzle-1.0/panel/dzl-dock-item.h
+include/libdazzle-1.0/panel/dzl-dock-manager.h
+include/libdazzle-1.0/panel/dzl-dock-overlay-edge.h
+include/libdazzle-1.0/panel/dzl-dock-overlay.h
+include/libdazzle-1.0/panel/dzl-dock-paned.h
+include/libdazzle-1.0/panel/dzl-dock-revealer.h
+include/libdazzle-1.0/panel/dzl-dock-stack.h
+include/libdazzle-1.0/panel/dzl-dock-transient-grab.h
+include/libdazzle-1.0/panel/dzl-dock-types.h
+include/libdazzle-1.0/panel/dzl-dock-widget.h
+include/libdazzle-1.0/panel/dzl-dock-window.h
+include/libdazzle-1.0/panel/dzl-dock.h
+include/libdazzle-1.0/panel/dzl-tab-strip.h
+include/libdazzle-1.0/panel/dzl-tab.h
+include/libdazzle-1.0/pathbar/dzl-path-bar.h
+include/libdazzle-1.0/pathbar/dzl-path-element.h
+include/libdazzle-1.0/pathbar/dzl-path.h
+include/libdazzle-1.0/prefs/dzl-preferences-bin.h
+include/libdazzle-1.0/prefs/dzl-preferences-entry.h
+include/libdazzle-1.0/prefs/dzl-preferences-file-chooser-button.h
+include/libdazzle-1.0/prefs/dzl-preferences-flow-box.h
+include/libdazzle-1.0/prefs/dzl-preferences-font-button.h
+include/libdazzle-1.0/prefs/dzl-preferences-group.h
+include/libdazzle-1.0/prefs/dzl-preferences-page.h
+include/libdazzle-1.0/prefs/dzl-preferences-spin-button.h
+include/libdazzle-1.0/prefs/dzl-preferences-switch.h
+include/libdazzle-1.0/prefs/dzl-preferences-view.h
+include/libdazzle-1.0/prefs/dzl-preferences.h
+include/libdazzle-1.0/search/dzl-fuzzy-index-builder.h
+include/libdazzle-1.0/search/dzl-fuzzy-index-cursor.h
+include/libdazzle-1.0/search/dzl-fuzzy-index-match.h
+include/libdazzle-1.0/search/dzl-fuzzy-index.h
+include/libdazzle-1.0/search/dzl-fuzzy-mutable-index.h
+include/libdazzle-1.0/search/dzl-levenshtein.h
+include/libdazzle-1.0/search/dzl-pattern-spec.h
+include/libdazzle-1.0/search/dzl-trie.h
+include/libdazzle-1.0/settings/dzl-settings-sandwich.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-accel-dialog.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-chord.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-context.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-controller.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-label.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-manager.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-model.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-phase.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-simple-label.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-theme-editor.h
+include/libdazzle-1.0/shortcuts/dzl-shortcut-theme.h
+include/libdazzle-1.0/shortcuts/dzl-shortcuts-group.h
+include/libdazzle-1.0/shortcuts/dzl-shortcuts-section.h
+include/libdazzle-1.0/shortcuts/dzl-shortcuts-shortcut.h
+include/libdazzle-1.0/shortcuts/dzl-shortcuts-window.h
+include/libdazzle-1.0/statemachine/dzl-state-machine-buildable.h
+include/libdazzle-1.0/statemachine/dzl-state-machine.h
+include/libdazzle-1.0/suggestions/dzl-suggestion-entry-buffer.h
+include/libdazzle-1.0/suggestions/dzl-suggestion-entry.h
+include/libdazzle-1.0/suggestions/dzl-suggestion-popover.h
+include/libdazzle-1.0/suggestions/dzl-suggestion-row.h
+include/libdazzle-1.0/suggestions/dzl-suggestion.h
+include/libdazzle-1.0/theming/dzl-css-provider.h
+include/libdazzle-1.0/theming/dzl-theme-manager.h
+include/libdazzle-1.0/tree/dzl-list-store-adapter.h
+include/libdazzle-1.0/tree/dzl-tree-builder.h
+include/libdazzle-1.0/tree/dzl-tree-node.h
+include/libdazzle-1.0/tree/dzl-tree-types.h
+include/libdazzle-1.0/tree/dzl-tree.h
+include/libdazzle-1.0/util/dzl-cairo.h
+include/libdazzle-1.0/util/dzl-cancellable.h
+include/libdazzle-1.0/util/dzl-counter.h
+include/libdazzle-1.0/util/dzl-date-time.h
+include/libdazzle-1.0/util/dzl-dnd.h
+include/libdazzle-1.0/util/dzl-file-manager.h
+include/libdazzle-1.0/util/dzl-gdk.h
+include/libdazzle-1.0/util/dzl-gtk.h
+include/libdazzle-1.0/util/dzl-heap.h
+include/libdazzle-1.0/util/dzl-int-pair.h
+include/libdazzle-1.0/util/dzl-macros.h
+include/libdazzle-1.0/util/dzl-pango.h
+include/libdazzle-1.0/util/dzl-rgba.h
+include/libdazzle-1.0/util/dzl-ring.h
+include/libdazzle-1.0/util/dzl-variant.h
+include/libdazzle-1.0/widgets/dzl-bin.h
+include/libdazzle-1.0/widgets/dzl-bolding-label.h
+include/libdazzle-1.0/widgets/dzl-box.h
+include/libdazzle-1.0/widgets/dzl-centering-bin.h
+include/libdazzle-1.0/widgets/dzl-column-layout.h
+include/libdazzle-1.0/widgets/dzl-counters-window.h
+include/libdazzle-1.0/widgets/dzl-elastic-bin.h
+include/libdazzle-1.0/widgets/dzl-empty-state.h
+include/libdazzle-1.0/widgets/dzl-entry-box.h
+include/libdazzle-1.0/widgets/dzl-file-chooser-entry.h
+include/libdazzle-1.0/widgets/dzl-list-box-row.h
+include/libdazzle-1.0/widgets/dzl-list-box.h
+include/libdazzle-1.0/widgets/dzl-multi-paned.h
+include/libdazzle-1.0/widgets/dzl-pill-box.h
+include/libdazzle-1.0/widgets/dzl-priority-box.h
+include/libdazzle-1.0/widgets/dzl-progress-button.h
+include/libdazzle-1.0/widgets/dzl-progress-icon.h
+include/libdazzle-1.0/widgets/dzl-progress-menu-button.h
+include/libdazzle-1.0/widgets/dzl-radio-box.h
+include/libdazzle-1.0/widgets/dzl-scrolled-window.h
+include/libdazzle-1.0/widgets/dzl-search-bar.h
+include/libdazzle-1.0/widgets/dzl-simple-label.h
+include/libdazzle-1.0/widgets/dzl-simple-popover.h
+include/libdazzle-1.0/widgets/dzl-slider.h
+include/libdazzle-1.0/widgets/dzl-stack-list.h
+include/libdazzle-1.0/widgets/dzl-three-grid.h
+lib/girepository-1.0/Dazzle-1.0.typelib
+lib/libdazzle-1.0.so
+lib/libdazzle-1.0.so.0
+libdata/pkgconfig/libdazzle-1.0.pc
+share/gir-1.0/Dazzle-1.0.gir
+share/vala/vapi/libdazzle-1.0.deps
+share/vala/vapi/libdazzle-1.0.vapi
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-scores.h b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-scores.h
new file mode 100644
index 000000000000..8672ff95d2e4
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-scores.h
@@ -0,0 +1,26 @@
+From 30334c28794ef85d8973f4ed0779b5ceed6594f2 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 7 Aug 2017 13:15:26 -0400
+Subject: [PATCH] gnome-scores.h: Convert to UTF-8
+
+The new Python `glib-mkenums` barfs on ISO-8859-1 input.
+---
+ libgnomeui/gnome-scores.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgnomeui/gnome-scores.h b/libgnomeui/gnome-scores.h
+index 911b12d1..4e641d22 100644
+--- libgnomeui/gnome-scores.h
++++ libgnomeui/gnome-scores.h
+@@ -27,7 +27,7 @@
+ * "High Scores" Widget
+ *
+ * AUTHOR:
+- * Horacio J. Peña <horape@compendium.com.ar>
++ * Horacio J. Peña <horape@compendium.com.ar>
+ *
+ * This is free software (under the terms of the GNU LGPL)
+ *
+--
+2.17.1
+
diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile
index e0a29f7bdefc..921118485274 100644
--- a/x11-toolkits/libwnck3/Makefile
+++ b/x11-toolkits/libwnck3/Makefile
@@ -1,9 +1,8 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11-toolkits/libwnck3/Makefile 19952 2014-10-15 08:11:00Z gusi $
PORTNAME= libwnck
-PORTVERSION= 3.14.0
+PORTVERSION= 3.24.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
@@ -12,18 +11,20 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library used for writing pagers and taskslists
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
+
USES= tar:xz
.if !defined(REFERENCE_PORT)
-USES+= bison gettext gmake libtool pathfix pkgconfig
-USE_GNOME= gtk30 intlhack introspection:build referencehack
-USE_XORG= xres x11
+USES+= bison gettext gmake libtool localbase pathfix pkgconfig
+USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack introspection:build \
+ referencehack
+USE_XORG= xext xrender xres x11
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-tools
-CPPFLAGS+= -I${LOCALBASE}/include
-LINS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= STARTUP
diff --git a/x11-toolkits/libwnck3/distinfo b/x11-toolkits/libwnck3/distinfo
index e42ae9418b67..987db0190a74 100644
--- a/x11-toolkits/libwnck3/distinfo
+++ b/x11-toolkits/libwnck3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/libwnck-3.14.0.tar.xz) = f5080076346609b4c36394b879f3a86b92ced3b90a37cb54c8e9a14f00e7921c
-SIZE (gnome3/libwnck-3.14.0.tar.xz) = 675916
+TIMESTAMP = 1516306501
+SHA256 (gnome3/libwnck-3.24.1.tar.xz) = afa6dc283582ffec15c3374790bcbcb5fb422bd38356d72deeef35bf7f9a1f04
+SIZE (gnome3/libwnck-3.24.1.tar.xz) = 821508
diff --git a/x11-toolkits/libwnck3/pkg-plist b/x11-toolkits/libwnck3/pkg-plist
index 74024ed453c5..a2f53c8f4c84 100644
--- a/x11-toolkits/libwnck3/pkg-plist
+++ b/x11-toolkits/libwnck3/pkg-plist
@@ -13,7 +13,7 @@ include/libwnck-3.0/libwnck/wnck-enum-types.h
include/libwnck-3.0/libwnck/workspace.h
lib/libwnck-3.so
lib/libwnck-3.so.0
-lib/libwnck-3.so.0.2.2
+lib/libwnck-3.so.0.3.0
libdata/pkgconfig/libwnck-3.0.pc
lib/girepository-1.0/Wnck-3.0.typelib
share/gtk-doc/html/libwnck-3.0/WnckApplication.html
@@ -29,7 +29,6 @@ share/gtk-doc/html/libwnck-3.0/core.html
share/gtk-doc/html/libwnck-3.0/getting-started.html
share/gtk-doc/html/libwnck-3.0/home.png
share/gtk-doc/html/libwnck-3.0/index.html
-share/gtk-doc/html/libwnck-3.0/index.sgml
share/gtk-doc/html/libwnck-3.0/indexes.html
share/gtk-doc/html/libwnck-3.0/ix01.html
share/gtk-doc/html/libwnck-3.0/ix02.html
diff --git a/x11-toolkits/pango-reference/Makefile b/x11-toolkits/pango-reference/Makefile
deleted file mode 100644
index db0c33e98759..000000000000
--- a/x11-toolkits/pango-reference/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
-# $FreeBSD$
-
-REFERENCE_SRC= ${WRKSRC}/docs
-
-.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/pango-reference/pkg-descr b/x11-toolkits/pango-reference/pkg-descr
deleted file mode 100644
index dab3ba0d134a..000000000000
--- a/x11-toolkits/pango-reference/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port contains the programming reference for x11-toolkits/pango.
-
-WWW: http://www.pango.org/
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index d0e81cd7d53f..b67b7d2d3878 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pango
-PORTVERSION= 1.42.0
+PORTVERSION= 1.42.4
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -13,10 +13,7 @@ COMMENT= Open-source framework for the layout and rendering of i18n text
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= tar:xz
-
-.if !defined(REFERENCE_PORT)
-
+BUILD_DEPENDS= help2man:misc/help2man
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
libfontconfig.so:x11-fonts/fontconfig \
@@ -26,24 +23,26 @@ RUN_DEPENDS= xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \
PORTSCOUT= limitw:1,even
-USES+= gettext gmake gnome libtool localbase pathfix pkgconfig
+USES= gettext gnome localbase meson pkgconfig tar:xz
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-USE_GNOME= cairo glib20 introspection:build referencehack
-INSTALL_TARGET= install-strip
+USE_GNOME= cairo glib20 introspection:build
VERSION= 1.8.0
-LIBVERSION= 0.4200.0
+LIBVERSION= 0.4200.3
PLIST_SUB+= VERSION=${VERSION} LIBVERSION=${LIBVERSION}
FONTSCALE= ${LOCALBASE}/share/fonts/TTF/luximb.ttf
FONTENCOD= ${LOCALBASE}/share/fonts/encodings/encodings.dir
OPTIONS_SUB= yes
-OPTIONS_DEFINE= X11
+OPTIONS_DEFINE= X11 GTKDOC
OPTIONS_DEFAULT=X11
-X11_CONFIGURE_WITH= xft
+GTKDOC_DESC= Build and install gtk-doc generated documentation
+GTKDOC_MESON_TRUE= enable_docs
+GTKDOC_BUILD_DEPENDS= gtk-doc>=0:textproc/gtk-doc
+
+X11_MESON_TRUE= xft
X11_USE= XORG=x11,xft,xrender
pre-configure:
@@ -54,5 +53,3 @@ pre-configure:
fi
.include <bsd.port.mk>
-
-.endif
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 7c0a9c9cfeee..a5424aa5d49f 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522069031
-SHA256 (gnome2/pango-1.42.0.tar.xz) = 9924d88a3dcedff753f0763814a1605307c5c9c931413b8b47ea7267d1b19446
-SIZE (gnome2/pango-1.42.0.tar.xz) = 824984
+TIMESTAMP = 1536530045
+SHA256 (gnome2/pango-1.42.4.tar.xz) = 1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d
+SIZE (gnome2/pango-1.42.4.tar.xz) = 833876
diff --git a/x11-toolkits/pango/files/patch-meson.build b/x11-toolkits/pango/files/patch-meson.build
new file mode 100644
index 000000000000..4ec6b6d1817a
--- /dev/null
+++ b/x11-toolkits/pango/files/patch-meson.build
@@ -0,0 +1,35 @@
+--- meson.build.orig 2018-04-07 12:06:28.000000000 +0200
++++ meson.build 2018-05-08 15:01:59.098440000 +0200
+@@ -297,11 +297,13 @@
+ pango_deps += freetype_dep
+ endif
+
+-xft_dep = dependency('xft', version: xft_req_version, required: false)
+-if xft_dep.found()
+- pango_conf.set('HAVE_XFT', 1)
+- pango_deps += dependency('xrender', required: false)
+- pango_deps += xft_dep
++if get_option('xft')
++ xft_dep = dependency('xft', version: xft_req_version, required: false)
++ if xft_dep.found()
++ pango_conf.set('HAVE_XFT', 1)
++ pango_deps += dependency('xrender', required: false)
++ pango_deps += xft_dep
++ endif
+ endif
+
+ if host_system == 'darwin'
+@@ -481,9 +483,12 @@
+ [ 'pango.pc' ],
+ [ 'pangowin32.pc', host_system == 'windows' ],
+ [ 'pangoft2.pc', build_pangoft2 ],
+- [ 'pangoxft.pc', xft_dep.found() ],
+ [ 'pangocairo.pc', cairo_dep.found() ],
+ ]
++
++if get_option('xft')
++ pkgconf_files += [[ 'pangoxft.pc', xft_dep.found() ]]
++endif
+
+ foreach pkg: pkgconf_files
+ pkg_name = pkg[0]
diff --git a/x11-toolkits/pango/files/patch-meson_options.txt b/x11-toolkits/pango/files/patch-meson_options.txt
new file mode 100644
index 000000000000..bc7bda3fb530
--- /dev/null
+++ b/x11-toolkits/pango/files/patch-meson_options.txt
@@ -0,0 +1,18 @@
+--- meson_options.txt.orig 2018-05-10 12:18:01.824158000 +0200
++++ meson_options.txt 2018-05-10 12:18:30.158458000 +0200
+@@ -2,7 +2,15 @@
+ description: 'Build API reference for Pango using GTK-Doc',
+ type: 'boolean',
+ value: false)
++option('enable_installed_tests',
++ description: 'Install test programs',
++ type: 'boolean',
++ value: false)
+ option('gir',
+ description: 'Build the GObject introspection data for Pango',
++ type: 'boolean',
++ value: true)
++option('xft',
++ description: 'Build Xft/XRender support',
+ type: 'boolean',
+ value: true)
diff --git a/x11-toolkits/pango/files/patch-pango_meson.build b/x11-toolkits/pango/files/patch-pango_meson.build
new file mode 100644
index 000000000000..a4c5e351072f
--- /dev/null
+++ b/x11-toolkits/pango/files/patch-pango_meson.build
@@ -0,0 +1,111 @@
+--- pango/meson.build.orig 2018-07-17 19:43:45.000000000 -0400
++++ pango/meson.build 2018-09-03 14:20:00.192740000 -0400
+@@ -239,59 +239,62 @@
+ endif
+
+ # Xft
+-if xft_dep.found()
+- pangoxft_headers = [
+- 'pangoxft.h',
+- 'pangoxft-render.h',
+- ]
++if get_option('xft')
++ if xft_dep.found()
++ pangoxft_headers = [
++ 'pangoxft.h',
++ 'pangoxft-render.h',
++ ]
+
+- pangoxft_sources = [
+- 'pangoxft-font.c',
+- 'pangoxft-fontmap.c',
+- 'pangoxft-render.c',
+- ]
++ pangoxft_sources = [
++ 'pangoxft-font.c',
++ 'pangoxft-fontmap.c',
++ 'pangoxft-render.c',
++ ]
+
+ install_headers(pangoxft_headers, subdir: pango_api_path)
++ install_headers(pangoxft_headers, subdir: pango_api_path)
+
+- libpangoxft = library(
+- 'pangoxft-@0@'.format(pango_api_version),
+- sources: pangoxft_sources,
+- version: pango_libversion,
+- soversion: pango_soversion,
+- install: true,
+- dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
+- include_directories: [ root_inc, pango_inc ],
+- c_args: common_cflags + pango_debug_cflags + pango_cflags + [
+- '-DPANGO_DISABLE_DEPRECATION_WARNINGS',
+- ],
+- link_args: common_ldflags,
+- )
+- pangoxft_dep_sources = []
+-
+- if build_gir
+- pangoxft_gir = gnome.generate_gir(
+- libpangoxft,
+- sources: pangoxft_headers + pangoxft_sources,
+- dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoft2_gir_dep ],
+- namespace: 'PangoXft',
+- nsversion: pango_api_version,
+- identifier_prefix: 'PangoXft',
+- symbol_prefix: 'pango_xft',
+- export_packages: 'pangoxft',
+- includes: [ pango_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ],
+- header: 'pango/pangoxft.h',
++ libpangoxft = library(
++ 'pangoxft-@0@'.format(pango_api_version),
++ sources: pangoxft_sources,
++ version: pango_libversion,
++ soversion: pango_soversion,
+ install: true,
+- extra_args: gir_args,
++ dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
++ include_directories: [ root_inc, pango_inc ],
++ c_args: common_cflags + pango_debug_cflags + pango_cflags + [
++ '-DPANGO_DISABLE_DEPRECATION_WARNINGS',
++ ],
++ link_args: common_ldflags,
+ )
+- pangoxft_dep_sources += pangoxft_gir
+- endif
++ pangoxft_dep_sources = []
+
+- libpangoxft_dep = declare_dependency(
+- link_with: libpangoxft,
+- include_directories: root_inc,
+- dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
+- sources: pangoxft_dep_sources,
+- )
++ if build_gir
++ pangoxft_gir = gnome.generate_gir(
++ libpangoxft,
++ sources: pangoxft_headers + pangoxft_sources,
++ dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoft2_gir_dep ],
++ namespace: 'PangoXft',
++ nsversion: pango_api_version,
++ identifier_prefix: 'PangoXft',
++ symbol_prefix: 'pango_xft',
++ export_packages: 'pangoxft',
++ includes: [ pango_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ],
++ header: 'pango/pangoxft.h',
++ install: true,
++ extra_args: gir_args,
++ )
++ pangoxft_dep_sources += pangoxft_gir
++ endif
++
++ libpangoxft_dep = declare_dependency(
++ link_with: libpangoxft,
++ include_directories: root_inc,
++ dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
++ sources: pangoxft_dep_sources,
++ )
++ endif
+ else
+ # For usage as a subproject
+ libpangoxft_dep = dependency('', required: false)
diff --git a/x11-toolkits/pango/files/patch-tests_meson.build b/x11-toolkits/pango/files/patch-tests_meson.build
new file mode 100644
index 000000000000..0d78b0d26961
--- /dev/null
+++ b/x11-toolkits/pango/files/patch-tests_meson.build
@@ -0,0 +1,92 @@
+--- tests/meson.build.orig 2018-04-07 12:00:40.000000000 +0200
++++ tests/meson.build 2018-05-10 12:09:26.358132000 +0200
+@@ -2,8 +2,10 @@
+ '-DSRCDIR=@0@'.format(meson.current_source_dir()),
+ ]
+
+-if xft_dep.found()
+- test_cflags += [ '-DHAVE_X', '-DHAVE_XFT' ]
++if get_option('xft')
++ if xft_dep.found()
++ test_cflags += [ '-DHAVE_X', '-DHAVE_XFT' ]
++ endif
+ endif
+
+ if host_system == 'windows'
+@@ -85,15 +87,18 @@
+ installed_test_datadir = join_paths(pango_datadir, 'installed-tests', 'pango')
+ installed_test_bindir = join_paths(pango_libexecdir, 'installed-tests', 'pango')
+
+-install_data(installed_test_data, install_dir: installed_test_bindir)
+-install_data(installed_test_layouts_data, install_dir: join_paths(installed_test_bindir, 'layouts'))
+-install_data(installed_test_markups_data, install_dir: join_paths(installed_test_bindir, 'markups'))
++if get_option('enable_installed_tests')
++ install_data(installed_test_data, install_dir: installed_test_bindir)
++ install_data(installed_test_layouts_data, install_dir: join_paths(installed_test_bindir, 'layouts'))
++ install_data(installed_test_markups_data, install_dir: join_paths(installed_test_bindir, 'markups'))
++endif
+
+ python = import('python3').find_python()
+ gen_installed_test = files([ 'gen-installed-test.py' ])
+ gen_all_unicode = files([ 'gen-all-unicode.py' ])
+
+-custom_target('all-unicode',
++if get_option('enable_installed_tests')
++ custom_target('all-unicode',
+ output: 'all-unicode.txt',
+ command: [
+ python, gen_all_unicode, '@OUTPUT@'
+@@ -101,29 +106,30 @@
+ install: true,
+ install_dir: installed_test_bindir)
+
+-foreach t: tests
+- name = t[0]
+- src = t.get(1, [ '@0@.c'.format(name) ])
+- deps = t.get(2, [ libpango_dep ])
++ foreach t: tests
++ name = t[0]
++ src = t.get(1, [ '@0@.c'.format(name) ])
++ deps = t.get(2, [ libpango_dep ])
+
+- custom_target(name + '.test',
+- output: name + '.test',
+- command: [
+- python, gen_installed_test,
+- installed_test_bindir,
+- name,
+- '@OUTDIR@',
+- ],
+- install: true,
+- install_dir: installed_test_datadir)
++ custom_target(name + '.test',
++ output: name + '.test',
++ command: [
++ python, gen_installed_test,
++ installed_test_bindir,
++ name,
++ '@OUTDIR@',
++ ],
++ install: true,
++ install_dir: installed_test_datadir)
+
+- bin = executable(name, src,
+- dependencies: deps,
+- include_directories: root_inc,
+- c_args: common_cflags + pango_debug_cflags + test_cflags,
+- cpp_args: common_cppflags + pango_debug_cflags + test_cflags,
+- install: true,
+- install_dir: installed_test_bindir)
++ bin = executable(name, src,
++ dependencies: deps,
++ include_directories: root_inc,
++ c_args: common_cflags + pango_debug_cflags + test_cflags,
++ cpp_args: common_cppflags + pango_debug_cflags + test_cflags,
++ install: true,
++ install_dir: installed_test_bindir)
+
+- test(name, bin, env: test_env)
+-endforeach
++ test(name, bin, env: test_env)
++ endforeach
++endif
diff --git a/x11-toolkits/pango/files/patch-utils_meson.build b/x11-toolkits/pango/files/patch-utils_meson.build
new file mode 100644
index 000000000000..2a065503234f
--- /dev/null
+++ b/x11-toolkits/pango/files/patch-utils_meson.build
@@ -0,0 +1,32 @@
+--- utils/meson.build.orig 2018-09-09 23:55:54.363487000 +0200
++++ utils/meson.build 2018-09-09 23:56:55.810617000 +0200
+@@ -14,12 +14,14 @@
+ pango_view_deps += libpangoft2_dep
+ endif
+
+-if xft_dep.found() and build_pangoft2
+- pango_view_sources += [
+- 'viewer-pangoxft.c',
+- 'viewer-x.c',
+- ]
+- pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ]
++if get_option('xft')
++ if xft_dep.found() and build_pangoft2
++ pango_view_sources += [
++ 'viewer-pangoxft.c',
++ 'viewer-x.c',
++ ]
++ pango_view_deps += [ libpangoft2_dep, libpangoxft_dep, ]
++ endif
+ endif
+
+ if cairo_dep.found()
+@@ -54,7 +56,7 @@
+ help2man, help2man_opts, '--output=@OUTPUT@', pango_view
+ ],
+ install: true,
+- install_dir: join_paths(pango_datadir, 'man/man1'))
++ install_dir: join_paths(pango_prefix, 'man/man1'))
+ endif
+
+ if cairo_dep.found()
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 92c70a39ccea..b9bd7c920e0f 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -1,3 +1,4 @@
+bin/pango-list
bin/pango-view
include/pango-1.0/pango/pango-attributes.h
include/pango-1.0/pango/pango-bidi-type.h
@@ -58,48 +59,69 @@ share/gir-1.0/Pango-1.0.gir
share/gir-1.0/PangoCairo-1.0.gir
share/gir-1.0/PangoFT2-1.0.gir
%%X11%%share/gir-1.0/PangoXft-1.0.gir
-share/gtk-doc/html/pango/PangoEngineLang.html
-share/gtk-doc/html/pango/PangoEngineShape.html
-share/gtk-doc/html/pango/PangoFcDecoder.html
-share/gtk-doc/html/pango/PangoFcFont.html
-share/gtk-doc/html/pango/PangoFcFontMap.html
-share/gtk-doc/html/pango/PangoMarkupFormat.html
-share/gtk-doc/html/pango/PangoRenderer.html
-share/gtk-doc/html/pango/annotation-glossary.html
-share/gtk-doc/html/pango/api-index-full.html
-share/gtk-doc/html/pango/home.png
-share/gtk-doc/html/pango/index.html
-share/gtk-doc/html/pango/layout.gif
-share/gtk-doc/html/pango/left-insensitive.png
-share/gtk-doc/html/pango/left.png
-share/gtk-doc/html/pango/lowlevel.html
-share/gtk-doc/html/pango/pango-Bidirectional-Text.html
-share/gtk-doc/html/pango/pango-Cairo-Rendering.html
-share/gtk-doc/html/pango/pango-CoreText-Fonts.html
-share/gtk-doc/html/pango/pango-Coverage-Maps.html
-share/gtk-doc/html/pango/pango-Engines.html
-share/gtk-doc/html/pango/pango-Fonts.html
-share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
-share/gtk-doc/html/pango/pango-Glyph-Storage.html
-share/gtk-doc/html/pango/pango-Layout-Objects.html
-share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
-share/gtk-doc/html/pango/pango-Modules.html
-share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
-share/gtk-doc/html/pango/pango-Scripts-and-Languages.html
-share/gtk-doc/html/pango/pango-Tab-Stops.html
-share/gtk-doc/html/pango/pango-Text-Attributes.html
-share/gtk-doc/html/pango/pango-Text-Processing.html
-share/gtk-doc/html/pango/pango-Version-Checking.html
-share/gtk-doc/html/pango/pango-Vertical-Text.html
-share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html
-share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html
-share/gtk-doc/html/pango/pango-hierarchy.html
-share/gtk-doc/html/pango/pango.devhelp2
-share/gtk-doc/html/pango/pango.html
-share/gtk-doc/html/pango/rendering.html
-share/gtk-doc/html/pango/right-insensitive.png
-share/gtk-doc/html/pango/right.png
-share/gtk-doc/html/pango/rotated-text.png
-share/gtk-doc/html/pango/style.css
-share/gtk-doc/html/pango/up-insensitive.png
-share/gtk-doc/html/pango/up.png
+%%GTKDOC%%share/gtk-doc/html/pango/PangoEngineLang.html
+%%GTKDOC%%share/gtk-doc/html/pango/PangoEngineShape.html
+%%GTKDOC%%share/gtk-doc/html/pango/PangoFcDecoder.html
+%%GTKDOC%%share/gtk-doc/html/pango/PangoFcFont.html
+%%GTKDOC%%share/gtk-doc/html/pango/PangoFcFontMap.html
+%%GTKDOC%%share/gtk-doc/html/pango/PangoMarkupFormat.html
+%%GTKDOC%%share/gtk-doc/html/pango/PangoRenderer.html
+%%GTKDOC%%share/gtk-doc/html/pango/annotation-glossary.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-10.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-12.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-14.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-16.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-18.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-2.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-20.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-22.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-24.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-26.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-30.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-31-0.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-32-4.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-32.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-34.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-38.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-4.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-40.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-6.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-1-8.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-deprecated.html
+%%GTKDOC%%share/gtk-doc/html/pango/api-index-full.html
+%%GTKDOC%%share/gtk-doc/html/pango/home.png
+%%GTKDOC%%share/gtk-doc/html/pango/index.html
+%%GTKDOC%%share/gtk-doc/html/pango/layout.gif
+%%GTKDOC%%share/gtk-doc/html/pango/left-insensitive.png
+%%GTKDOC%%share/gtk-doc/html/pango/left.png
+%%GTKDOC%%share/gtk-doc/html/pango/lowlevel.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Bidirectional-Text.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Cairo-Rendering.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-CoreText-Fonts.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Coverage-Maps.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Engines.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Fonts.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Glyph-Storage.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Layout-Objects.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Modules.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Scripts-and-Languages.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Tab-Stops.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Text-Attributes.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Text-Processing.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Version-Checking.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Vertical-Text.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango-hierarchy.html
+%%GTKDOC%%share/gtk-doc/html/pango/pango.devhelp2
+%%GTKDOC%%share/gtk-doc/html/pango/pango.html
+%%GTKDOC%%share/gtk-doc/html/pango/rendering.html
+%%GTKDOC%%share/gtk-doc/html/pango/right-insensitive.png
+%%GTKDOC%%share/gtk-doc/html/pango/right.png
+%%GTKDOC%%share/gtk-doc/html/pango/rotated-text.png
+%%GTKDOC%%share/gtk-doc/html/pango/style.css
+%%GTKDOC%%share/gtk-doc/html/pango/up-insensitive.png
+%%GTKDOC%%share/gtk-doc/html/pango/up.png
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index 5a30f49eb6a4..cdec5b10cf16 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= vte
-PORTVERSION= 0.50.3
+PORTVERSION= 0.52.2
PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
@@ -17,11 +17,12 @@ LICENSE= LGPL21
BUILD_DEPENDS= vapigen:lang/vala \
bash:shells/bash
LIB_DEPENDS= libgnutls.so:security/gnutls \
+ libfribidi.so:converters/fribidi \
libpcre2-8.so:devel/pcre2
PORTSCOUT= limitw:1,even
-USES= compiler:c++0x gettext gmake gnome gperf libtool localbase \
+USES= compiler:c++11-lang gettext gmake gnome gperf libtool localbase \
pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -33,4 +34,10 @@ INSTALL_TARGET= install-strip
PLIST_SUB= VERSION=2.91
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} <= 1100000
+EXTRA_PATCHES= ${FILESDIR}/extra-src_app_app.cc
+.endif
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/vte3/distinfo b/x11-toolkits/vte3/distinfo
index baf503f22d90..9abbff8c8abf 100644
--- a/x11-toolkits/vte3/distinfo
+++ b/x11-toolkits/vte3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525457317
-SHA256 (gnome3/vte-0.50.3.tar.xz) = 1b6fe02f4fccf74ca566903edbaa70b154965ee4342c633ed4e537f3524b966e
-SIZE (gnome3/vte-0.50.3.tar.xz) = 1010076
+TIMESTAMP = 1527916018
+SHA256 (gnome3/vte-0.52.2.tar.xz) = 0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af
+SIZE (gnome3/vte-0.52.2.tar.xz) = 1011696
diff --git a/x11-toolkits/vte3/files/extra-src_app_app.cc b/x11-toolkits/vte3/files/extra-src_app_app.cc
new file mode 100644
index 000000000000..ad01a9c2a267
--- /dev/null
+++ b/x11-toolkits/vte3/files/extra-src_app_app.cc
@@ -0,0 +1,13 @@
+# fix on 104-i386 with clang 3.4
+
+--- src/app/app.cc.orig 2018-06-07 17:57:35.192459000 +0200
++++ src/app/app.cc 2018-06-07 17:58:50.068954000 +0200
+@@ -306,7 +306,7 @@
+ else
+ alpha = get_alpha();
+
+- GdkRGBA color{bg_color};
++ GdkRGBA color = bg_color;
+ color.alpha = alpha;
+ return color;
+ }
diff --git a/x11-toolkits/vte3/pkg-plist b/x11-toolkits/vte3/pkg-plist
index bd7dadd6dda1..d9fc3806e9eb 100644
--- a/x11-toolkits/vte3/pkg-plist
+++ b/x11-toolkits/vte3/pkg-plist
@@ -13,7 +13,7 @@ include/vte-%%VERSION%%/vte/vteversion.h
lib/girepository-1.0/Vte-%%VERSION%%.typelib
lib/libvte-%%VERSION%%.so
lib/libvte-%%VERSION%%.so.0
-lib/libvte-%%VERSION%%.so.0.5000.3
+lib/libvte-%%VERSION%%.so.0.5200.2
libdata/pkgconfig/vte-%%VERSION%%.pc
share/gir-1.0/Vte-%%VERSION%%.gir
share/gtk-doc/html/vte-%%VERSION%%/VteRegex.html
@@ -24,6 +24,7 @@ share/gtk-doc/html/vte-%%VERSION%%/api-index-0-44.html
share/gtk-doc/html/vte-%%VERSION%%/api-index-0-46.html
share/gtk-doc/html/vte-%%VERSION%%/api-index-0-48.html
share/gtk-doc/html/vte-%%VERSION%%/api-index-0-50.html
+share/gtk-doc/html/vte-%%VERSION%%/api-index-0-52.html
share/gtk-doc/html/vte-%%VERSION%%/api-index-deprecated.html
share/gtk-doc/html/vte-%%VERSION%%/api-index-full.html
share/gtk-doc/html/vte-%%VERSION%%/ch01.html
@@ -45,7 +46,6 @@ share/gtk-doc/html/vte-%%VERSION%%/up.png
share/gtk-doc/html/vte-%%VERSION%%/vte-%%VERSION%%.devhelp2
share/gtk-doc/html/vte-%%VERSION%%/vte-Version-Information.html
share/gtk-doc/html/vte-%%VERSION%%/vte-Vte-PTY.html
-share/locale/af/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/am/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/an/LC_MESSAGES/vte-%%VERSION%%.mo
share/locale/ang/LC_MESSAGES/vte-%%VERSION%%.mo
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 8534a0e13915..8823792d57cd 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= metacity
-PORTVERSION= 3.18.1
-PORTREVISION= 4
+PORTVERSION= 3.18.3
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -24,12 +23,10 @@ PORTSCOUT= limitw:1,even
USE_XORG= x11 xcomposite xdamage xrender xcursor xinerama xext xrandr
USES= compiler:c11 gettext gmake gnome libtool \
- pathfix pkgconfig tar:xz
+ localbase pathfix pkgconfig tar:xz
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gtk30 intlhack libxml2:build
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.metacity.gschema.xml
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index dc53a2853a25..32e7e78ee440 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/metacity-3.18.1.tar.xz) = 5ccb2343413b6ba4d75f300b494524bde7fe77ec818f7f73e3b232777ce6dad8
-SIZE (gnome3/metacity-3.18.1.tar.xz) = 1667196
+TIMESTAMP = 1538308625
+SHA256 (gnome3/metacity-3.18.3.tar.xz) = 57698150dc70e6381caafc1fb0dff5d215196f17f791554766a35812dfe19bf5
+SIZE (gnome3/metacity-3.18.3.tar.xz) = 1698184
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index a88dc88f5373..72535926d209 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mutter
-PORTVERSION= 3.18.4
-PORTREVISION= 3
+PORTVERSION= 3.28.2
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -15,35 +14,50 @@ LICENSE= GPLv2+
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
LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
- libclutter-1.0.so:graphics/clutter \
libxkbcommon.so:x11/libxkbcommon \
+ libcanberra.so:audio/libcanberra \
libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libupower-glib.so:sysutils/upower
+ libupower-glib.so:sysutils/upower \
+ libjson-glib-1.0.so:devel/json-glib \
+ libxkbfile.so:x11/libxkbfile \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libdrm.so:graphics/libdrm
RUN_DEPENDS= zenity>=3.0.0:x11/zenity \
+ xkeyboard-config>=0:x11/xkeyboard-config \
gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas
PORTSCOUT= limitw:1,even
-USES= compiler:c++0x gettext gmake gmake libtool pathfix \
+USES= compiler:c++0x gettext gmake gmake libtool localbase pathfix \
pkgconfig tar:xz
-USE_GNOME= gnomedesktop3 gtk30 intlhack introspection:build
-USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm xfixes \
- xrender xdamage
+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
-CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --enable-compile-warnings=maximum
+CFLAGS+= -Wno-unknown-warning-option \
+ -Wno-format-nonliteral
+CPPFLAGS+= -fno-omit-frame-pointer
+CONFIGURE_ARGS= --without-libwacom \
+ --disable-wayland
+
+# 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
+
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.mutter.gschema.xml \
org.gnome.mutter.wayland.gschema.xml
-PLIST_SUB= VERSION=${PORTVERSION:R}
-
-post-patch:
- @${REINPLACE_CMD} -e 's|-Wcast-align||g' \
- ${WRKSRC}/configure
-
.include <bsd.port.mk>
diff --git a/x11-wm/mutter/distinfo b/x11-wm/mutter/distinfo
index be5b1cb58937..875961ef0cea 100644
--- a/x11-wm/mutter/distinfo
+++ b/x11-wm/mutter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478470097
-SHA256 (gnome3/mutter-3.18.4.tar.xz) = 3cd2d49ac269139a8860d84dfba4d5d5a8318c1510515b99681916ba8334d393
-SIZE (gnome3/mutter-3.18.4.tar.xz) = 1469140
+TIMESTAMP = 1525954507
+SHA256 (gnome3/mutter-3.28.2.tar.xz) = affa89b9c2b8fe500b7bc560ab1121fea80f90787bc0b04dc04f6bba7fd0f045
+SIZE (gnome3/mutter-3.28.2.tar.xz) = 3692712
diff --git a/x11-wm/mutter/files/patch-src_Makefile.in b/x11-wm/mutter/files/patch-src_Makefile.in
deleted file mode 100644
index 33bc4c2e3a84..000000000000
--- a/x11-wm/mutter/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig 2016-04-21 10:20:11 UTC
-+++ src/Makefile.in
-@@ -1021,7 +1021,7 @@ testboxes_LDADD = $(MUTTER_LIBS) libmutt
- @HAVE_INTROSPECTION_TRUE@ $(libmutterinclude_base_headers) \
- @HAVE_INTROSPECTION_TRUE@ $(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES))
-
--@HAVE_INTROSPECTION_TRUE@@META_GIR@_SCANNERFLAGS = --warn-all --warn-error
-+@HAVE_INTROSPECTION_TRUE@@META_GIR@_SCANNERFLAGS = --warn-all
- dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
- CLEANFILES = $(mutter_built_sources) $(typelib_DATA) $(gir_DATA) \
- $(MUTTER_STAMP_FILES)
diff --git a/x11-wm/mutter/files/patch-src_backends_meta-egl.c b/x11-wm/mutter/files/patch-src_backends_meta-egl.c
new file mode 100644
index 000000000000..3f2500abac24
--- /dev/null
+++ b/x11-wm/mutter/files/patch-src_backends_meta-egl.c
@@ -0,0 +1,81 @@
+$OpenBSD: patch-src_backends_meta-egl_c,v 1.2 2018/04/26 09:19:27 jasper Exp $
+
+Revert non-portable portion of:
+From b7b5fb293d1de3af9e533f2063749fde7a790945 Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniels@collabora.com>
+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
+@@ -67,8 +67,6 @@ struct _MetaEgl
+ PFNEGLSTREAMCONSUMERACQUIREKHRPROC eglStreamConsumerAcquireKHR;
+ PFNEGLSTREAMCONSUMERACQUIREATTRIBNVPROC eglStreamConsumerAcquireAttribNV;
+
+- PFNEGLQUERYDMABUFFORMATSEXTPROC eglQueryDmaBufFormatsEXT;
+- PFNEGLQUERYDMABUFMODIFIERSEXTPROC eglQueryDmaBufModifiersEXT;
+ };
+
+ G_DEFINE_TYPE (MetaEgl, meta_egl, G_TYPE_OBJECT)
+@@ -926,51 +924,6 @@ meta_egl_stream_consumer_acquire (MetaEgl *egl,
+ return TRUE;
+ }
+
+-gboolean
+-meta_egl_query_dma_buf_formats (MetaEgl *egl,
+- EGLDisplay display,
+- EGLint max_formats,
+- EGLint *formats,
+- EGLint *num_formats,
+- GError **error)
+-{
+- if (!is_egl_proc_valid (egl->eglQueryDmaBufFormatsEXT, error))
+- return FALSE;
+-
+- if (!egl->eglQueryDmaBufFormatsEXT (display, max_formats, formats,
+- num_formats))
+- {
+- set_egl_error (error);
+- return FALSE;
+- }
+-
+- return TRUE;
+-}
+-
+-gboolean
+-meta_egl_query_dma_buf_modifiers (MetaEgl *egl,
+- EGLDisplay display,
+- EGLint format,
+- EGLint max_modifiers,
+- EGLuint64KHR *modifiers,
+- EGLBoolean *external_only,
+- EGLint *num_modifiers,
+- GError **error)
+-{
+- if (!is_egl_proc_valid (egl->eglQueryDmaBufModifiersEXT, error))
+- return FALSE;
+-
+- if (!egl->eglQueryDmaBufModifiersEXT (display, format, max_modifiers,
+- modifiers, external_only,
+- num_modifiers))
+- {
+- set_egl_error (error);
+- return FALSE;
+- }
+-
+- return TRUE;
+-}
+-
+ #define GET_EGL_PROC_ADDR(proc) \
+ egl->proc = (void *) eglGetProcAddress (#proc);
+
+@@ -1007,8 +960,6 @@ meta_egl_constructed (GObject *object)
+ GET_EGL_PROC_ADDR (eglStreamConsumerAcquireKHR);
+ GET_EGL_PROC_ADDR (eglStreamConsumerAcquireAttribNV);
+
+- GET_EGL_PROC_ADDR (eglQueryDmaBufFormatsEXT);
+- GET_EGL_PROC_ADDR (eglQueryDmaBufModifiersEXT);
+ }
+
+ #undef GET_EGL_PROC_ADDR
diff --git a/x11-wm/mutter/files/patch-src_compositor_compositor.c b/x11-wm/mutter/files/patch-src_compositor_compositor.c
new file mode 100644
index 000000000000..fe493c81ce34
--- /dev/null
+++ b/x11-wm/mutter/files/patch-src_compositor_compositor.c
@@ -0,0 +1,23 @@
+$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
new file mode 100644
index 000000000000..bc10f1c15d2c
--- /dev/null
+++ b/x11-wm/mutter/files/patch-src_core_main.c
@@ -0,0 +1,23 @@
+$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-descr b/x11-wm/mutter/pkg-descr
index 8d3c6e5ea090..e1b5db0d2d3a 100644
--- a/x11-wm/mutter/pkg-descr
+++ b/x11-wm/mutter/pkg-descr
@@ -3,5 +3,3 @@ designed to integrate well with the GNOME desktop. mutter lacks some
features that may be expected by traditional UNIX or other technical
users; these users may want to investigate other available window man-
agers for use with GNOME or standalone.
-
-WWW: https://wiki.gnome.org/
diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist
index 27735c63d2e6..30f9f2e3c92f 100644
--- a/x11-wm/mutter/pkg-plist
+++ b/x11-wm/mutter/pkg-plist
@@ -1,4 +1,229 @@
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
@@ -14,15 +239,21 @@ 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
@@ -31,17 +262,35 @@ include/mutter/meta/types.h
include/mutter/meta/util.h
include/mutter/meta/window.h
include/mutter/meta/workspace.h
-lib/libmutter.so
-lib/libmutter.so.0
-lib/libmutter.so.0.0.0
-lib/mutter/Meta-3.0.gir
-lib/mutter/Meta-3.0.typelib
+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.pc
+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
libexec/mutter-restart-helper
man/man1/mutter.1.gz
share/GConf/gsettings/mutter-schemas.convert
-share/applications/mutter-wayland.desktop
share/applications/mutter.desktop
share/gnome-control-center/keybindings/50-mutter-navigation.xml
share/gnome-control-center/keybindings/50-mutter-system.xml
@@ -75,7 +324,9 @@ share/locale/eu/LC_MESSAGES/mutter.mo
share/locale/fa/LC_MESSAGES/mutter.mo
share/locale/fi/LC_MESSAGES/mutter.mo
share/locale/fr/LC_MESSAGES/mutter.mo
+share/locale/fur/LC_MESSAGES/mutter.mo
share/locale/ga/LC_MESSAGES/mutter.mo
+share/locale/gd/LC_MESSAGES/mutter.mo
share/locale/gl/LC_MESSAGES/mutter.mo
share/locale/gu/LC_MESSAGES/mutter.mo
share/locale/ha/LC_MESSAGES/mutter.mo
diff --git a/x11/Makefile b/x11/Makefile
index c81d65016352..43f9833d067f 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -74,7 +74,6 @@
SUBDIR += gmrun
SUBDIR += gnome-clipboard-daemon
SUBDIR += gnome-desktop
- SUBDIR += gnome-desktop-reference
SUBDIR += gnome-menus
SUBDIR += gnome-pie
SUBDIR += gnome-session
diff --git a/x11/altyo/Makefile b/x11/altyo/Makefile
index 7ce0aff95f0f..eaffc00cf655 100644
--- a/x11/altyo/Makefile
+++ b/x11/altyo/Makefile
@@ -13,6 +13,8 @@ COMMENT= Drop-down terminal emulator, written in Vala
LICENSE= GPLv3
+BROKEN= Cannot convert from `unowned string' to `unowned char[]?'
+
BUILD_DEPENDS= git:devel/git \
valac:lang/vala
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index cd8c73976554..31fc5ea38204 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cinnamon
PORTVERSION= 2.4.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome3
@@ -27,7 +27,7 @@ LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
libaccountsservice.so:sysutils/accountsservice
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
ca_root_nss>=0:security/ca_root_nss \
- gnome-themes-standard>=3.0.0:x11-themes/gnome-themes-standard \
+ gnome-themes-extra>=3.0.0:x11-themes/gnome-themes-extra \
cinnamon-control-center:sysutils/cinnamon-control-center \
cinnamon-translations>=0:misc/cinnamon-translations \
cinnamon-screensaver:x11/cinnamon-screensaver \
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 420e374a5ec7..9737756c1e34 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -2,24 +2,20 @@
# $FreeBSD$
PORTNAME= gdm
-PORTVERSION= 3.16.4
-PORTREVISION= 5
+PORTVERSION= 3.28.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME 3 version of xdm display manager
+COMMENT= GNOME 3 display manager
BUILD_DEPENDS= zenity>=3.0.0:x11/zenity \
itstool:textproc/itstool \
iso-codes>=0:misc/iso-codes
LIB_DEPENDS= libck-connector.so:sysutils/consolekit2 \
- libdbus-glib-1.so:devel/dbus-glib \
- libupower-glib.so:sysutils/upower \
- libnss3.so:security/nss \
- libfontconfig.so:x11-fonts/fontconfig \
libaccountsservice.so:sysutils/accountsservice \
+ libcanberra.so:audio/libcanberra \
libcanberra-gtk3.so:audio/libcanberra-gtk3
RUN_DEPENDS= zenity>=3.0.0:x11/zenity \
gnome-shell>=3.15.92:x11/gnome-shell \
@@ -33,20 +29,22 @@ RUN_DEPENDS= zenity>=3.0.0:x11/zenity \
# used in scripts
RUN_DEPENDS+= xrdb:x11/xrdb \
setxkbmap:x11/setxkbmap \
+ xsetroot:x11/xsetroot \
+ xhost:x11/xhost \
xmodmap:x11/xmodmap \
xterm:x11/xterm
USERS= gdm
-GROUPS= gdm
+GROUPS= gdm video
PORTSCOUT= limitw:1,even
-USES= cpe gettext gmake libtool pathfix pkgconfig tar:xz
+USES= cpe gettext gmake gnome libtool pathfix pkgconfig tar:xz
CPE_VENDOR= gnome
CPE_VENDOR= gnome_display_manager
-USE_GNOME= dconf intlhack introspection librsvg2
+USE_GNOME= cairo dconf gtk30 intltool introspection
USE_LDCONFIG= yes
-USE_XORG= dmx xorgproto
+USE_XORG= x11 xau xcb xdmcp xorgproto
INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
USE_GNOME_SUBR= yes
@@ -60,6 +58,8 @@ CONFIGURE_ARGS= --disable-static \
--with-dbus-sys=${PREFIX}/etc/dbus-1/system.d \
--with-log-dir=/var/log/gdm \
--localstatedir=/var \
+ --without-selinux \
+ --without-libaudit \
--with-console-kit \
--with-working-directory=${PREFIX}/etc/gdm/home \
--with-sysconfsubdir=gdm \
@@ -68,9 +68,11 @@ CONFIGURE_ARGS= --disable-static \
--with-screenshot-dir=/var/run/gdm/greeter \
--enable-authentication-scheme=pam \
--without-plymouth \
+ --without-systemd \
--with-user=gdm \
--with-group=gdm \
--with-initial-vt=09 \
+ --enable-gdm-xsession \
--disable-wayland-support \
--with-systemd=no
@@ -92,7 +94,6 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
GNOME_LOCALSTATEDIR= /var
OPTIONS_DEFINE= IPV6
-KEYRING_RUN_DEPENDS= ${LOCALBASE}/lib/pam_gnome_keyring.so:security/gnome-keyring
IPV6_CONFIGURE_ENABLE= ipv6
@@ -107,14 +108,15 @@ post-patch:
${WRKSRC}/data/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ -e 's|/bin/bash|/bin/sh|g' \
${WRKSRC}/daemon/gdm-session-worker.c
@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
-e 's|/usr/bin/X|${LOCALBASE}/bin/X|g' \
-e 's|/usr/bin/Xorg|${LOCALBASE}/bin/Xorg|g' \
${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
@${REINPLACE_CMD} -e 's|/at-spi-registryd|/at-spi2-registryd|g' \
- ${WRKSRC}/gui/simple-chooser/gdm-host-chooser.c \
- ${WRKSRC}/gui/simple-chooser/chooser-main.c
+ ${WRKSRC}/chooser/gdm-host-chooser.c \
+ ${WRKSRC}/chooser/chooser-main.c
@${REINPLACE_CMD} -e 's|/etc/X11|${LOCALBASE}/etc/X11|g' \
${WRKSRC}/data/Init.in \
${WRKSRC}/data/PostLogin \
@@ -141,13 +143,22 @@ post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home
${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
- ${INSTALL_DATA} ${WRKDIR}/gdm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
- ${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
- ${INSTALL_DATA} ${WRKDIR}/gdm-password ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password
+ ${INSTALL_DATA} ${WRKDIR}/gdm-autologin \
+ ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
+ ${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment \
+ ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
+ ${INSTALL_DATA} ${WRKDIR}/gdm-password \
+ ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password
- ${INSTALL_DATA} ${WRKDIR}/client.conf ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
+ ${INSTALL_DATA} ${WRKDIR}/client.conf \
+ ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/client.conf.sample
- ${INSTALL_DATA} ${WRKDIR}/locale.conf ${STAGEDIR}${PREFIX}/etc/gdm/
+ ${INSTALL_DATA} ${WRKDIR}/locale.conf \
+ ${STAGEDIR}${PREFIX}/etc/gdm/locale.conf.sample
+
+ @${RM} ${STAGEDIR}${PREFIX}/lib/udev/rules.d/61-gdm.rules
+ @${RMDIR} ${STAGEDIR}${PREFIX}/lib/udev/rules.d
+ @${RMDIR} ${STAGEDIR}${PREFIX}/lib/udev
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 9177a8f63bbd..ea959be91316 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gdm-3.16.4.tar.xz) = 281dd28d729eaab2f67e450b5b162299dec537b6f7e81fa1124e35c89d3942fd
-SIZE (gnome3/gdm-3.16.4.tar.xz) = 1535580
+TIMESTAMP = 1525503166
+SHA256 (gnome/gdm-3.28.1.tar.xz) = 77068fa775bc2c002e85883c250103f6a77361d32ba0cb8a60997b70b397b2fb
+SIZE (gnome/gdm-3.28.1.tar.xz) = 1122164
diff --git a/x11/gdm/files/Makefile.am b/x11/gdm/files/Makefile.am
new file mode 100644
index 000000000000..6bb317816bc5
--- /dev/null
+++ b/x11/gdm/files/Makefile.am
@@ -0,0 +1,18 @@
+$OpenBSD: patch-Makefile_am,v 1.1 2016/10/31 16:15:46 ajacoutot Exp $
+
+REVERT - Linux-PAM
+From 714b6af29b916ac7da0cdab6f83460574ed49cf2 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 15 Aug 2016 13:48:00 -0400
+Subject: pam_gdm: add stub pam module
+
+--- Makefile.am.orig 2017-10-30 16:21:02.000000000 +0100
++++ Makefile.am 2018-01-14 12:30:07.298406000 +0100
+@@ -7,7 +7,6 @@ SUBDIRS = \
+ daemon \
+ libgdm \
+ utils \
+- pam_gdm \
+ po \
+ tests \
+ $(NULL)
diff --git a/x11/gdm/files/configure.ac b/x11/gdm/files/configure.ac
new file mode 100644
index 000000000000..80b14caaa4d2
--- /dev/null
+++ b/x11/gdm/files/configure.ac
@@ -0,0 +1,154 @@
+$OpenBSD: patch-configure_ac,v 1.12 2017/04/17 13:17:07 ajacoutot Exp $
+
+REVERT - Linux-PAM
+From 714b6af29b916ac7da0cdab6f83460574ed49cf2 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 15 Aug 2016 13:48:00 -0400
+Subject: pam_gdm: add stub pam module
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+https://bugzilla.gnome.org/show_bug.cgi?id=722482
+
+--- configure.ac.orig 2017-10-30 16:21:11.000000000 +0100
++++ configure.ac 2018-01-14 13:01:16.646216000 +0100
+@@ -232,12 +232,6 @@ AM_CONDITIONAL(ENABLE_EXHERBO_PAM_CONFIG, test x$with_
+ AM_CONDITIONAL(ENABLE_LFS_PAM_CONFIG, test x$with_default_pam_config = xlfs)
+ AM_CONDITIONAL(ENABLE_ARCH_PAM_CONFIG, test x$with_default_pam_config = xarch)
+
+-AC_CHECK_HEADERS([security/pam_modules.h security/pam_modutil.h security/pam_ext.h],
+- [have_pam=yes],
+- [if test "x$have_pam" = xyes ; then
+- AC_MSG_ERROR([PAM development files not found.])
+- fi])
+-
+ AC_ARG_ENABLE(console-helper,
+ AS_HELP_STRING([--enable-console-helper],
+ [Enable PAM console helper @<:@default=auto@:>@]),,
+@@ -263,7 +257,15 @@ AC_ARG_WITH(tcp-wrappers,
+ [Use TCP Wrappers @<:@default=auto@:>@]),,
+ with_tcp_wrappers=auto)
+
++AC_ARG_WITH(console-kit,
++ AS_HELP_STRING([--with-console-kit],
++ [Add ConsoleKit support @<:@default=auto@:>@]),,
++ with_console_kit=no)
+
++AC_ARG_WITH(systemd,
++ AS_HELP_STRING([--with-systemd],
++ [Add systemd support @<:@default=auto@:>@]),
++ [with_systemd=$withval], [with_systemd=auto])
+ AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
+ [Directory for systemd service files]),
+@@ -548,6 +550,8 @@ fi
+ if test "x$supports_pam_extensions" = "xyes" ; then
+ AM_CONDITIONAL(SUPPORTS_PAM_EXTENSIONS, true)
+ AC_DEFINE(SUPPORTS_PAM_EXTENSIONS, 1, [Define if PAM supports GDMs custom extensions])
++else
++ AM_CONDITIONAL(SUPPORTS_PAM_EXTENSIONS, false)
+ fi
+
+ AC_CHECK_LIB(keyutils, keyctl_read, [
+@@ -655,14 +659,8 @@ dnl --------------------------------------------------
+ dnl - Check for utmp stuff
+ dnl ---------------------------------------------------------------------------
+
+-AC_CHECK_HEADERS(utmp.h utmpx.h libutil.h sys/param.h)
+-AC_CHECK_FUNCS([getutxent updwtmpx updwtmp])
+-AC_CHECK_LIB(util, login, [
+- AC_DEFINE(HAVE_LOGIN, 1, [Define if have login])
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil" ])
+-AC_CHECK_LIB(util, logout, [
+- AC_DEFINE(HAVE_LOGOUT, 1, [Define if have logout])
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil" ])
++AC_CHECK_HEADERS(utmp.h utmpx.h util.h sys/param.h)
++AC_CHECK_FUNCS([getutxent getttyent updwtmpx updwtmp])
+ AC_CHECK_LIB(util, logwtmp, [
+ AC_DEFINE(HAVE_LOGWTMP, 1, [Define if have logwtmp])
+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil" ])
+@@ -911,12 +909,42 @@ AC_SUBST(XINERAMA_LIBS)
+ CPPFLAGS="$xinerama_save_cppflags"
+
+ dnl ---------------------------------------------------------------------------
++dnl - Check for ConsoleKit support
++dnl ---------------------------------------------------------------------------
++
++use_console_kit=no
++if test "x$with_console_kit" != "xno" ; then
++ use_console_kit=yes
++ AC_DEFINE(WITH_CONSOLE_KIT, 1, [Define to enable ConsoleKit support])
++fi
++AM_CONDITIONAL(WITH_CONSOLE_KIT, test x$use_console_kit = xyes)
++AC_SUBST(WITH_CONSOLE_KIT)
++
++dnl ---------------------------------------------------------------------------
+ dnl - Check for systemd support
+ dnl ---------------------------------------------------------------------------
+
+ PKG_CHECK_MODULES(SYSTEMD,
+- [libsystemd])
++ [libsystemd-login >= 186 libsystemd-daemon],
++ [have_systemd=yes], [have_systemd=no])
+
++if test "x$with_systemd" = "xauto" ; then
++ if test x$have_systemd = xno ; then
++ use_systemd=no
++ else
++ use_systemd=yes
++ fi
++else
++ use_systemd="$with_systemd"
++fi
++
++if test "x$use_systemd" != "xno" ; then
++ if test "x$have_systemd" = "xno"; then
++ AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
++ fi
++
++ AC_DEFINE(WITH_SYSTEMD, 1, [Define to enable systemd support])
++fi
+ AC_SUBST(SYSTEMD_CFLAGS)
+ AC_SUBST(SYSTEMD_LIBS)
+
+@@ -1111,6 +1139,14 @@ fi
+ AC_SUBST(GDM_CUSTOM_CONF)
+ AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf')
+
++AC_ARG_WITH(consolekit-directory,
++ [AC_HELP_STRING([--with-consolekit-directory],
++ [Specify the directory of ck-get-x11-display-device @<:@default=libexecdir@:>@])],,
++ [with_consolekit_directory="\${libexecdir}"])
++
++CONSOLEKIT_DIR=$with_consolekit_directory
++AC_SUBST(CONSOLEKIT_DIR)
++
+ AC_ARG_WITH(gnome-settings-daemon-directory,
+ [AC_HELP_STRING([--with-gnome-settings-daemon-directory],
+ [Specify the directory of gnome-settings-daemon used by the chooser @<:@default=libexecdir@:>@])],,
+@@ -1601,6 +1637,7 @@ echo "
+ dmconfdir: ${dmconfdir}
+ localstatedir: ${localstatedir}
+ datadir: ${datadir}
++ consolekit location: ${with_consolekit_directory}
+ gnome-settings-daemon location: ${with_gnome_settings_daemon_directory}
+ gnome-session-check-accel location: ${with_check_accelerated_directory}
+ source code location: ${srcdir}
+@@ -1631,6 +1668,8 @@ echo \
+ " Xinerama support: ${XINERAMA_SUPPORT}
+ XDMCP support: ${XDMCP_SUPPORT}
+ SELinux support: ${use_selinux}
++ ConsoleKit support: ${use_console_kit}
++ systemd support: ${use_systemd}
+ systemd unit dir: ${with_systemdsystemunitdir}
+ plymouth support: ${use_plymouth}
+ wayland support: ${enable_wayland_support}
+@@ -1639,3 +1678,4 @@ echo \
+ Enable documentation: ${enable_documentation}
+ Install GDM's Xsession: ${enable_gdm_xsession}
+ "
++
diff --git a/x11/gdm/files/daemon_Makefile.am b/x11/gdm/files/daemon_Makefile.am
new file mode 100644
index 000000000000..72d55fb06926
--- /dev/null
+++ b/x11/gdm/files/daemon_Makefile.am
@@ -0,0 +1,33 @@
+--- daemon/Makefile.am.orig 2017-10-30 16:21:02.000000000 +0100
++++ daemon/Makefile.am 2018-01-14 12:30:11.501517000 +0100
+@@ -21,6 +21,7 @@ AM_CPPFLAGS = \
+ -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
+ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
+ -DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
++ -DCONSOLEKIT_DIR=\"$(CONSOLEKIT_DIR)\" \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(DAEMON_CFLAGS) \
+ $(XLIB_CFLAGS) \
+@@ -267,6 +268,11 @@ EXTRA_gdm_SOURCES = \
+ $(XDMCP_SOURCES) \
+ $(NULL)
+
++CONSOLE_KIT_SOURCES = \
++ $(NULL)
++
++EXTRA_gdm_SOURCES += $(CONSOLE_KIT_SOURCES)
++
+ gdm_LDADD = \
+ $(top_builddir)/common/libgdmcommon.la \
+ $(XLIB_LIBS) \
+@@ -277,6 +283,10 @@ gdm_LDADD = \
+ $(JOURNALD_LIBS) \
+ $(EXTRA_DAEMON_LIBS) \
+ $(NULL)
++
++if WITH_CONSOLE_KIT
++gdm_SOURCES += $(CONSOLE_KIT_SOURCES)
++endif
+
+ CLEANFILES = \
+ gdm-display-glue.c \
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 05fd987a8e3b..2469b55ea9a9 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -52,14 +52,6 @@ gdm_start()
sleep 1
iter=$(expr ${iter} + 1)
done
- iter=0
- while ! %%LOCALBASE%%/bin/lshal >/dev/null 2>&1 ; do
- if [ ${iter} -eq 60 ]; then
- break
- fi
- sleep 1
- iter=$(expr ${iter} + 1)
- done
LANG=${gdm_lang} ${command} ${gdm_flags} ) &
}
diff --git a/x11/gdm/files/patch-CVE-2015-7496 b/x11/gdm/files/patch-CVE-2015-7496
deleted file mode 100644
index 69aefec50100..000000000000
--- a/x11/gdm/files/patch-CVE-2015-7496
+++ /dev/null
@@ -1,207 +0,0 @@
-From 05e5fc24b0f803098c1d05dae86f5eb05bd0c2a4 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Sun, 15 Nov 2015 14:07:53 -0500
-Subject: session: Cancel worker proxy async ops when freeing conversations
-
-We need to cancel ongoing async ops for worker proxies when freeing
-conversations or we'll crash when the completion handler runs and we
-access free'd memory.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758032
-
----
-
-From 5ac224602f1d603aac5eaa72e1760d3e33a26f0a Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Fri, 13 Nov 2015 11:14:59 -0500
-Subject: session: disconnect signals from worker proxy when conversation is
- freed
-
-We don't want an outstanding reference on the worker proxy to lead to
-signal handlers getting dispatched after the conversation is freed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758032
-
----
-
-
---- daemon/gdm-session.c.orig 2015-11-18 10:47:55.522178000 +0100
-+++ daemon/gdm-session.c 2015-11-18 10:48:00.450095000 +0100
-@@ -73,6 +73,7 @@ typedef struct
- GDBusMethodInvocation *pending_invocation;
- GdmDBusWorkerManager *worker_manager_interface;
- GdmDBusWorker *worker_proxy;
-+ GCancellable *worker_cancellable;
- char *session_id;
- guint32 is_stopping : 1;
-
-@@ -1031,6 +1032,8 @@ register_worker (GdmDBusWorkerManager *
-
- g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (conversation->worker_proxy), G_MAXINT);
-
-+ conversation->worker_cancellable = g_cancellable_new ();
-+
- g_signal_connect (conversation->worker_proxy,
- "username-changed",
- G_CALLBACK (worker_on_username_changed), conversation);
-@@ -1666,7 +1669,28 @@ free_conversation (GdmSessionConversatio
- g_free (conversation->starting_username);
- g_free (conversation->session_id);
- g_clear_object (&conversation->worker_manager_interface);
-- g_clear_object (&conversation->worker_proxy);
-+
-+ if (conversation->worker_proxy != NULL) {
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_username_changed),
-+ conversation);
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_session_exited),
-+ conversation);
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_reauthenticated),
-+ conversation);
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_saved_language_name_read),
-+ conversation);
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_saved_session_name_read),
-+ conversation);
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_cancel_pending_query),
-+ conversation);
-+ g_clear_object (&conversation->worker_proxy);
-+ }
- g_clear_object (&conversation->session);
- g_free (conversation);
- }
-@@ -1828,6 +1852,9 @@ close_conversation (GdmSessionConversati
- g_clear_object (&conversation->worker_manager_interface);
- }
-
-+ g_cancellable_cancel (conversation->worker_cancellable);
-+ g_clear_object (&conversation->worker_cancellable);
-+
- if (conversation->worker_proxy != NULL) {
- GDBusConnection *connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (conversation->worker_proxy));
- g_dbus_connection_close_sync (connection, NULL, NULL);
-@@ -1996,7 +2023,7 @@ send_setup (GdmSession *self,
- display_hostname,
- self->priv->display_is_local,
- self->priv->display_is_initial,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_setup_complete_cb,
- conversation);
- }
-@@ -2062,7 +2089,7 @@ send_setup_for_user (GdmSession *self,
- display_hostname,
- self->priv->display_is_local,
- self->priv->display_is_initial,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_setup_complete_cb,
- conversation);
- }
-@@ -2124,7 +2151,7 @@ send_setup_for_program (GdmSession *self
- self->priv->display_is_local,
- self->priv->display_is_initial,
- log_file,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_setup_complete_cb,
- conversation);
- }
-@@ -2182,7 +2209,7 @@ gdm_session_authenticate (GdmSession *se
- conversation = find_conversation_by_name (self, service_name);
- if (conversation != NULL) {
- gdm_dbus_worker_call_authenticate (conversation->worker_proxy,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_authenticate_cb,
- conversation);
- }
-@@ -2199,7 +2226,7 @@ gdm_session_authorize (GdmSession *self,
- conversation = find_conversation_by_name (self, service_name);
- if (conversation != NULL) {
- gdm_dbus_worker_call_authorize (conversation->worker_proxy,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_authorize_cb,
- conversation);
- }
-@@ -2216,7 +2243,7 @@ gdm_session_accredit (GdmSession *self,
- conversation = find_conversation_by_name (self, service_name);
- if (conversation != NULL) {
- gdm_dbus_worker_call_establish_credentials (conversation->worker_proxy,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_establish_credentials_cb,
- conversation);
- }
-@@ -2230,7 +2257,8 @@ send_environment_variable (const char
- {
- gdm_dbus_worker_call_set_environment_variable (conversation->worker_proxy,
- key, value,
-- NULL, NULL, NULL);
-+ conversation->worker_cancellable,
-+ NULL, NULL);
- }
-
- static void
-@@ -2418,7 +2446,8 @@ send_display_mode (GdmSession *self,
- mode = gdm_session_get_display_mode (self);
- gdm_dbus_worker_call_set_session_display_mode (conversation->worker_proxy,
- gdm_session_display_mode_to_string (mode),
-- NULL, NULL, NULL);
-+ conversation->worker_cancellable,
-+ NULL, NULL);
- }
-
- static void
-@@ -2434,7 +2463,8 @@ send_session_type (GdmSession *self,
- gdm_dbus_worker_call_set_environment_variable (conversation->worker_proxy,
- "XDG_SESSION_TYPE",
- session_type,
-- NULL, NULL, NULL);
-+ conversation->worker_cancellable,
-+ NULL, NULL);
- }
-
- void
-@@ -2452,7 +2482,7 @@ gdm_session_open_session (GdmSession *se
- send_session_type (self, conversation);
-
- gdm_dbus_worker_call_open (conversation->worker_proxy,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_opened, conversation);
- }
- }
-@@ -2638,7 +2668,7 @@ gdm_session_start_session (GdmSession *s
-
- gdm_dbus_worker_call_start_program (conversation->worker_proxy,
- program,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_start_program_cb,
- conversation);
- g_free (program);
-@@ -2770,7 +2800,7 @@ gdm_session_start_reauthentication (GdmS
- gdm_dbus_worker_call_start_reauthentication (conversation->worker_proxy,
- (int) pid_of_caller,
- (int) uid_of_caller,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_reauthentication_started_cb,
- conversation);
- }
-@@ -3032,7 +3062,8 @@ gdm_session_select_session (GdmSession *
-
- gdm_dbus_worker_call_set_session_name (conversation->worker_proxy,
- get_session_name (self),
-- NULL, NULL, NULL);
-+ conversation->worker_cancellable,
-+ NULL, NULL);
- }
- }
-
diff --git a/x11/gdm/files/patch-Makefile.in b/x11/gdm/files/patch-Makefile.in
new file mode 100644
index 000000000000..1589e0c8ed27
--- /dev/null
+++ b/x11/gdm/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig 2018-01-14 11:27:57.277621000 +0100
++++ Makefile.in 2018-01-14 11:28:53.422079000 +0100
+@@ -162,7 +162,7 @@
+ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+-DIST_SUBDIRS = data common pam-extensions daemon libgdm utils pam_gdm \
++DIST_SUBDIRS = data common pam-extensions daemon libgdm utils \
+ po tests chooser docs
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/data/dconf/gdm.in AUTHORS COPYING ChangeLog \
+@@ -472,7 +472,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ NULL =
+-SUBDIRS = data common pam-extensions daemon libgdm utils pam_gdm po \
++SUBDIRS = data common pam-extensions daemon libgdm utils po \
+ tests $(NULL) $(am__append_1) $(am__append_2)
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ EXTRA_DIST = \
diff --git a/x11/gdm/files/patch-common_gdm-common.c b/x11/gdm/files/patch-common_gdm-common.c
new file mode 100644
index 000000000000..567c0853796e
--- /dev/null
+++ b/x11/gdm/files/patch-common_gdm-common.c
@@ -0,0 +1,413 @@
+$OpenBSD: patch-common_gdm-common_c,v 1.4 2015/10/18 13:25:54 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+--- common/gdm-common.c.orig Sun Oct 18 14:26:27 2015
++++ common/gdm-common.c Sun Oct 18 14:24:34 2015
+@@ -39,12 +39,25 @@
+ #include "mkdtemp.h"
+ #endif
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-login.h>
++#endif
+
+ #define GDM_DBUS_NAME "org.gnome.DisplayManager"
+ #define GDM_DBUS_LOCAL_DISPLAY_FACTORY_PATH "/org/gnome/DisplayManager/LocalDisplayFactory"
+ #define GDM_DBUS_LOCAL_DISPLAY_FACTORY_INTERFACE "org.gnome.DisplayManager.LocalDisplayFactory"
+
++#ifdef WITH_CONSOLE_KIT
++#define CK_NAME "org.freedesktop.ConsoleKit"
++#define CK_PATH "/org/freedesktop/ConsoleKit"
++#define CK_INTERFACE "org.freedesktop.ConsoleKit"
++
++#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
++#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
++#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
++#endif
++
+ G_DEFINE_QUARK (gdm-common-error, gdm_common_error);
+
+ const char *
+@@ -343,15 +356,306 @@ create_transient_display (GDBusConnection *connection,
+ return TRUE;
+ }
+
++#ifdef WITH_CONSOLE_KIT
++
+ static gboolean
+-activate_session_id (GDBusConnection *connection,
+- const char *seat_id,
+- const char *session_id)
++get_current_session_id (GDBusConnection *connection,
++ char **session_id)
+ {
+ GError *local_error = NULL;
+ GVariant *reply;
+
+ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ CK_MANAGER_PATH,
++ CK_MANAGER_INTERFACE,
++ "GetCurrentSession",
++ NULL, /* parameters */
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine session: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(o)", session_id);
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static gboolean
++get_seat_id_for_session (GDBusConnection *connection,
++ const char *session_id,
++ char **seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ session_id,
++ CK_SESSION_INTERFACE,
++ "GetSeatId",
++ NULL, /* parameters */
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine seat: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(o)", seat_id);
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static char *
++get_current_seat_id (GDBusConnection *connection)
++{
++ gboolean res;
++ char *session_id;
++ char *seat_id;
++
++ session_id = NULL;
++ seat_id = NULL;
++
++ res = get_current_session_id (connection, &session_id);
++ if (res) {
++ res = get_seat_id_for_session (connection, session_id, &seat_id);
++ }
++ g_free (session_id);
++
++ return seat_id;
++}
++
++static gboolean
++activate_session_id_for_ck (GDBusConnection *connection,
++ const char *seat_id,
++ const char *session_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "ActivateSession",
++ g_variant_new ("(o)", session_id),
++ NULL,
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to activate session: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static gboolean
++session_is_login_window (GDBusConnection *connection,
++ const char *session_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ const char *value;
++ gboolean ret;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ session_id,
++ CK_SESSION_INTERFACE,
++ "GetSessionType",
++ NULL,
++ G_VARIANT_TYPE ("(s)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine session type: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(&s)", &value);
++
++ if (value == NULL || value[0] == '\0' || strcmp (value, "LoginWindow") != 0) {
++ ret = FALSE;
++ } else {
++ ret = TRUE;
++ }
++
++ g_variant_unref (reply);
++
++ return ret;
++}
++
++static gboolean
++seat_can_activate_sessions (GDBusConnection *connection,
++ const char *seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ gboolean ret;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "CanActivateSessions",
++ NULL,
++ G_VARIANT_TYPE ("(b)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine if can activate sessions: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(b)", &ret);
++ g_variant_unref (reply);
++
++ return ret;
++}
++
++static const char **
++seat_get_sessions (GDBusConnection *connection,
++ const char *seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ const char **value;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "GetSessions",
++ NULL,
++ G_VARIANT_TYPE ("(ao)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to list sessions: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(^ao)", &value);
++ g_variant_unref (reply);
++
++ return value;
++}
++
++static gboolean
++get_login_window_session_id_for_ck (GDBusConnection *connection,
++ const char *seat_id,
++ char **session_id)
++{
++ gboolean can_activate_sessions;
++ const char **sessions;
++ int i;
++
++ *session_id = NULL;
++ sessions = NULL;
++
++ g_debug ("checking if seat can activate sessions");
++
++ can_activate_sessions = seat_can_activate_sessions (connection, seat_id);
++ if (! can_activate_sessions) {
++ g_debug ("seat is unable to activate sessions");
++ return FALSE;
++ }
++
++ sessions = seat_get_sessions (connection, seat_id);
++ for (i = 0; sessions [i] != NULL; i++) {
++ const char *ssid;
++
++ ssid = sessions [i];
++
++ if (session_is_login_window (connection, ssid)) {
++ *session_id = g_strdup (ssid);
++ break;
++ }
++ }
++ g_free (sessions);
++
++ return TRUE;
++}
++
++static gboolean
++goto_login_session_for_ck (GDBusConnection *connection,
++ GError **error)
++{
++ gboolean ret;
++ gboolean res;
++ char *session_id;
++ char *seat_id;
++
++ ret = FALSE;
++
++ /* First look for any existing LoginWindow sessions on the seat.
++ If none are found, create a new one. */
++
++ seat_id = get_current_seat_id (connection);
++ if (seat_id == NULL || seat_id[0] == '\0') {
++ g_debug ("seat id is not set; can't switch sessions");
++ g_set_error (error, GDM_COMMON_ERROR, 0, _("Could not identify the current session."));
++
++ return FALSE;
++ }
++
++ res = get_login_window_session_id_for_ck (connection, seat_id, &session_id);
++ if (! res) {
++ g_set_error (error, GDM_COMMON_ERROR, 1, _("User unable to switch sessions."));
++ return FALSE;
++ }
++
++ if (session_id != NULL) {
++ res = activate_session_id_for_ck (connection, seat_id, session_id);
++ if (res) {
++ ret = TRUE;
++ }
++ }
++
++ if (! ret && g_strcmp0 (seat_id, "/org/freedesktop/ConsoleKit/Seat1") == 0) {
++ res = create_transient_display (connection, error);
++ if (res) {
++ ret = TRUE;
++ }
++ }
++
++ return ret;
++}
++#endif
++
++#ifdef WITH_SYSTEMD
++
++static gboolean
++activate_session_id_for_systemd (GDBusConnection *connection,
++ const char *seat_id,
++ const char *session_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
+ "org.freedesktop.login1",
+ "/org/freedesktop/login1",
+ "org.freedesktop.login1.Manager",
+@@ -373,8 +677,8 @@ activate_session_id (GDBusConnection *connection,
+ }
+
+ static gboolean
+-get_login_window_session_id (const char *seat_id,
+- char **session_id)
++get_login_window_session_id_for_systemd (const char *seat_id,
++ char **session_id)
+ {
+ gboolean ret;
+ int res, i;
+@@ -442,8 +746,8 @@ out:
+ }
+
+ static gboolean
+-goto_login_session (GDBusConnection *connection,
+- GError **error)
++goto_login_session_for_systemd (GDBusConnection *connection,
++ GError **error)
+ {
+ gboolean ret;
+ int res;
+@@ -497,9 +801,9 @@ goto_login_session (GDBusConnection *connection,
+ return FALSE;
+ }
+
+- res = get_login_window_session_id (seat_id, &session_id);
++ res = get_login_window_session_id_for_systemd (seat_id, &session_id);
+ if (res && session_id != NULL) {
+- res = activate_session_id (connection, seat_id, session_id);
++ res = activate_session_id_for_systemd (connection, seat_id, session_id);
+
+ if (res) {
+ ret = TRUE;
+@@ -518,6 +822,7 @@ goto_login_session (GDBusConnection *connection,
+
+ return ret;
+ }
++#endif
+
+ gboolean
+ gdm_goto_login_session (GError **error)
+@@ -533,7 +838,17 @@ gdm_goto_login_session (GError **error)
+ return FALSE;
+ }
+
+- return goto_login_session (connection, error);
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return goto_login_session_for_systemd (connection, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return goto_login_session_for_ck (connection, error);
++#else
++ return FALSE;
++#endif
+ }
+
+ static void
diff --git a/x11/gdm/files/patch-common_gdm-common.h b/x11/gdm/files/patch-common_gdm-common.h
new file mode 100644
index 000000000000..bcc6ec09f739
--- /dev/null
+++ b/x11/gdm/files/patch-common_gdm-common.h
@@ -0,0 +1,20 @@
+$OpenBSD: patch-common_gdm-common_h,v 1.2 2016/04/15 14:11:09 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+--- common/gdm-common.h.orig Thu Apr 14 07:27:26 2016
++++ common/gdm-common.h Fri Apr 15 15:05:26 2016
+@@ -31,6 +31,9 @@
+ expr; \
+ } while G_UNLIKELY (errno == EINTR);
+
++/* check if logind is running */
++#define LOGIND_RUNNING() (access("/run/systemd/seats/", F_OK) >= 0)
++
+ GQuark gdm_common_error_quark (void);
+ #define GDM_COMMON_ERROR gdm_common_error_quark()
+
diff --git a/x11/gdm/files/patch-common_gdm-log.c b/x11/gdm/files/patch-common_gdm-log.c
new file mode 100644
index 000000000000..be0bb062fe82
--- /dev/null
+++ b/x11/gdm/files/patch-common_gdm-log.c
@@ -0,0 +1,56 @@
+$OpenBSD: patch-common_gdm-log_c,v 1.1 2015/10/18 13:25:54 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+--- common/gdm-log.c.orig 2018-02-19 19:16:32.000000000 +0100
++++ common/gdm-log.c 2018-04-05 21:59:25.290775000 +0200
+@@ -30,7 +30,9 @@
+ #include <unistd.h>
+
+ #include <syslog.h>
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
++#endif
+
+ #include <glib.h>
+ #include <glib/gstdio.h>
+@@ -125,12 +127,35 @@ gdm_log_set_debug (gboolean debug)
+ void
+ gdm_log_init (void)
+ {
++ const char *prg_name;
++ int options;
++
+ if (initialized)
+ return;
+
+ initialized = TRUE;
+
++#ifdef WITH_SYSTEMD
++ is_sd_booted = sd_booted () > 0;
++#endif
++
+ g_log_set_default_handler (gdm_log_default_handler, NULL);
++
++ /* Only set up syslog if !systemd, otherwise with systemd
++ * enabled, we keep the default GLib log handler which goes to
++ * stderr, which is routed to the appropriate place in the
++ * systemd service file.
++ */
++ if (!is_sd_booted) {
++ prg_name = g_get_prgname ();
++
++ options = LOG_PID;
++#ifdef LOG_PERROR
++ options |= LOG_PERROR;
++#endif
++
++ openlog (prg_name, options, LOG_DAEMON);
++ }
+ }
+
+ void
diff --git a/x11/gdm/files/patch-config.h.in b/x11/gdm/files/patch-config.h.in
index d17901da1124..ff945d66ca43 100644
--- a/x11/gdm/files/patch-config.h.in
+++ b/x11/gdm/files/patch-config.h.in
@@ -1,12 +1,69 @@
---- config.h.in.orig 2007-11-02 20:48:28.000000000 -0400
-+++ config.h.in 2007-11-02 20:49:39.000000000 -0400
-@@ -23,6 +23,9 @@
- #undef HAVE_LC_MESSAGES
- #undef HAVE_LIBSM
+--- config.h.in.orig 2018-01-14 13:03:01.638908000 +0100
++++ config.h.in 2018-01-14 13:03:20.000000000 +0100
+@@ -113,6 +113,9 @@
+ /* Define to 1 if you have the <execinfo.h> header file. */
+ #undef HAVE_EXECINFO_H
+
++/* Define to 1 if you have the `getttyent' function. */
++#undef HAVE_GETTTYENT
++
+ /* Define to 1 if you have the `getutxent' function. */
+ #undef HAVE_GETUTXENT
+
+@@ -128,21 +131,12 @@
+ /* Define if we have libgen.h */
+ #undef HAVE_LIBGEN_H
+
+-/* Define to 1 if you have the <libutil.h> header file. */
+-#undef HAVE_LIBUTIL_H
+-
+ /* Define if have libxdmcp */
#undef HAVE_LIBXDMCP
-+#undef HAVE_LOGIN
-+#undef HAVE_LOGOUT
-+#undef HAVE_LOGWTMP
+
+-/* Define if have login */
+-#undef HAVE_LOGIN
+-
+ /* Define if we have logincap */
#undef HAVE_LOGINCAP
- #undef HAVE_LOGINDEVPERM
- #undef HAVE_LOGINRESTRICTIONS
+
+-/* Define if have logout */
+-#undef HAVE_LOGOUT
+-
+ /* Define if have logwtmp */
+ #undef HAVE_LOGWTMP
+
+@@ -167,9 +161,6 @@
+ /* Define to 1 if you have the <security/pam_ext.h> header file. */
+ #undef HAVE_SECURITY_PAM_EXT_H
+
+-/* Define to 1 if you have the <security/pam_modules.h> header file. */
+-#undef HAVE_SECURITY_PAM_MODULES_H
+-
+ /* Define to 1 if you have the <security/pam_modutil.h> header file. */
+ #undef HAVE_SECURITY_PAM_MODUTIL_H
+
+@@ -239,6 +230,9 @@
+ /* Define to 1 if you have the `updwtmpx' function. */
+ #undef HAVE_UPDWTMPX
+
++/* Define to 1 if you have the <util.h> header file. */
++#undef HAVE_UTIL_H
++
+ /* Define to 1 if you have the <utmpx.h> header file. */
+ #undef HAVE_UTMPX_H
+
+@@ -372,8 +366,14 @@
+ /* Version number of package */
+ #undef VERSION
+
++/* Define to enable ConsoleKit support */
++#undef WITH_CONSOLE_KIT
++
+ /* Define to enable plymouth support */
+ #undef WITH_PLYMOUTH
++
++/* Define to enable systemd support */
++#undef WITH_SYSTEMD
+
+ /* Define xevie option */
+ #undef XEVIE_OPTION
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
new file mode 100644
index 000000000000..c683d50161f5
--- /dev/null
+++ b/x11/gdm/files/patch-configure
@@ -0,0 +1,431 @@
+--- configure.orig 2018-01-14 13:01:10.629609000 +0100
++++ configure 2018-01-14 13:02:06.272152000 +0100
+@@ -677,6 +677,7 @@ HAVE_ADT_TRUE
+ XEVIE_OPTION
+ CHECK_ACCELERATED_DIR
+ GNOME_SETTINGS_DAEMON_DIR
++CONSOLEKIT_DIR
+ GDM_OLD_CONF
+ GDM_CUSTOM_CONF
+ GDM_DEFAULTS_CONF
+@@ -697,6 +698,9 @@ JOURNALD_LIBS
+ JOURNALD_CFLAGS
+ SYSTEMD_LIBS
+ SYSTEMD_CFLAGS
++WITH_CONSOLE_KIT
++WITH_CONSOLE_KIT_FALSE
++WITH_CONSOLE_KIT_TRUE
+ XINERAMA_LIBS
+ LIBWRAP_LIBS
+ OS_SOLARIS_FALSE
+@@ -983,6 +987,8 @@ enable_authentication_scheme
+ with_xinerama
+ with_xdmcp
+ with_tcp_wrappers
++with_console_kit
++with_systemd
+ with_systemdsystemunitdir
+ enable_systemd_journal
+ enable_wayland_support
+@@ -1002,6 +1008,7 @@ with_log_dir
+ with_at_bindir
+ with_defaults_conf
+ with_custom_conf
++with_consolekit_directory
+ with_gnome_settings_daemon_directory
+ with_check_accelerated_directory
+ with_xevie
+@@ -1748,6 +1755,8 @@ Optional Packages:
+ --with-xinerama Add Xinerama support [default=auto]
+ --with-xdmcp Add XDMCP (remote login) support [default=auto]
+ --with-tcp-wrappers Use TCP Wrappers [default=auto]
++ --with-console-kit Add ConsoleKit support [default=auto]
++ --with-systemd Add systemd support [default=auto]
+ --with-systemdsystemunitdir=DIR
+ Directory for systemd service files
+ --with-plymouth Add plymouth support [default=yes]
+@@ -1776,6 +1785,9 @@ Optional Packages:
+ --with-custom-conf=<FILENAME>
+ FILENAME to give to custom configuration file
+ [default=GDMCONFDIR/custom.conf]
++ --with-consolekit-directory
++ Specify the directory of ck-get-x11-display-device
++ [default=libexecdir]
+ --with-gnome-settings-daemon-directory
+ Specify the directory of gnome-settings-daemon used
+ by the chooser [default=libexecdir]
+@@ -20860,24 +20872,6 @@ else
+ fi
+
+
+-for ac_header in security/pam_modules.h security/pam_modutil.h security/pam_ext.h
+-do :
+- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+- have_pam=yes
+-else
+- if test "x$have_pam" = xyes ; then
+- as_fn_error $? "PAM development files not found." "$LINENO" 5
+- fi
+-fi
+-
+-done
+-
+-
+ # Check whether --enable-console-helper was given.
+ if test "${enable_console_helper+set}" = set; then :
+ enableval=$enable_console_helper;
+@@ -20922,7 +20916,23 @@ fi
+
+
+
++# Check whether --with-console-kit was given.
++if test "${with_console_kit+set}" = set; then :
++ withval=$with_console_kit;
++else
++ with_console_kit=no
++fi
+
++
++
++# Check whether --with-systemd was given.
++if test "${with_systemd+set}" = set; then :
++ withval=$with_systemd; with_systemd=$withval
++else
++ with_systemd=auto
++fi
++
++
+ # Check whether --with-systemdsystemunitdir was given.
+ if test "${with_systemdsystemunitdir+set}" = set; then :
+ withval=$with_systemdsystemunitdir; with_systemdsystemunitdir=$withval
+@@ -21764,8 +21774,17 @@ fi
+
+ $as_echo "#define SUPPORTS_PAM_EXTENSIONS 1" >>confdefs.h
+
++else
++ if false; then
++ SUPPORTS_PAM_EXTENSIONS_TRUE=
++ SUPPORTS_PAM_EXTENSIONS_FALSE='#'
++else
++ SUPPORTS_PAM_EXTENSIONS_TRUE='#'
++ SUPPORTS_PAM_EXTENSIONS_FALSE=
+ fi
+
++fi
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keyctl_read in -lkeyutils" >&5
+ $as_echo_n "checking for keyctl_read in -lkeyutils... " >&6; }
+ if ${ac_cv_lib_keyutils_keyctl_read+:} false; then :
+@@ -22008,7 +22027,7 @@ fi
+
+
+
+-for ac_header in utmp.h utmpx.h libutil.h sys/param.h
++for ac_header in utmp.h utmpx.h util.h sys/param.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+@@ -22021,7 +22040,7 @@ fi
+
+ done
+
+-for ac_func in getutxent updwtmpx updwtmp
++for ac_func in getutxent getttyent updwtmpx updwtmp
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -22033,94 +22052,6 @@ _ACEOF
+ fi
+ done
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for login in -lutil" >&5
+-$as_echo_n "checking for login in -lutil... " >&6; }
+-if ${ac_cv_lib_util_login+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lutil $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char login ();
+-int
+-main ()
+-{
+-return login ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_util_login=yes
+-else
+- ac_cv_lib_util_login=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_login" >&5
+-$as_echo "$ac_cv_lib_util_login" >&6; }
+-if test "x$ac_cv_lib_util_login" = xyes; then :
+-
+-
+-$as_echo "#define HAVE_LOGIN 1" >>confdefs.h
+-
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for logout in -lutil" >&5
+-$as_echo_n "checking for logout in -lutil... " >&6; }
+-if ${ac_cv_lib_util_logout+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lutil $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char logout ();
+-int
+-main ()
+-{
+-return logout ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_util_logout=yes
+-else
+- ac_cv_lib_util_logout=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_logout" >&5
+-$as_echo "$ac_cv_lib_util_logout" >&6; }
+-if test "x$ac_cv_lib_util_logout" = xyes; then :
+-
+-
+-$as_echo "#define HAVE_LOGOUT 1" >>confdefs.h
+-
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+-fi
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for logwtmp in -lutil" >&5
+ $as_echo_n "checking for logwtmp in -lutil... " >&6; }
+ if ${ac_cv_lib_util_logwtmp+:} false; then :
+@@ -23207,7 +23138,25 @@ fi
+ CPPFLAGS="$xinerama_save_cppflags"
+
+
++use_console_kit=no
++if test "x$with_console_kit" != "xno" ; then
++ use_console_kit=yes
+
++$as_echo "#define WITH_CONSOLE_KIT 1" >>confdefs.h
++
++fi
++ if test x$use_console_kit = xyes; then
++ WITH_CONSOLE_KIT_TRUE=
++ WITH_CONSOLE_KIT_FALSE='#'
++else
++ WITH_CONSOLE_KIT_TRUE='#'
++ WITH_CONSOLE_KIT_FALSE=
++fi
++
++
++
++
++
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
+ $as_echo_n "checking for SYSTEMD... " >&6; }
+@@ -23216,12 +23165,12 @@ if test -n "$SYSTEMD_CFLAGS"; then
+ pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 186 libsystemd-daemon\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 186 libsystemd-daemon") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
++ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login >= 186 libsystemd-daemon" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -23233,12 +23182,12 @@ if test -n "$SYSTEMD_LIBS"; then
+ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 186 libsystemd-daemon\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 186 libsystemd-daemon") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
++ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-login >= 186 libsystemd-daemon" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -23259,50 +23208,49 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
++ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login >= 186 libsystemd-daemon" 2>&1`
+ else
+- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
++ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login >= 186 libsystemd-daemon" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SYSTEMD_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (libsystemd) were not met:
+-
+-$SYSTEMD_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables SYSTEMD_CFLAGS
+-and SYSTEMD_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
++ have_systemd=no
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables SYSTEMD_CFLAGS
+-and SYSTEMD_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++ have_systemd=no
+ else
+ SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
+ SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
++ have_systemd=yes
++fi
+
++if test "x$with_systemd" = "xauto" ; then
++ if test x$have_systemd = xno ; then
++ use_systemd=no
++ else
++ use_systemd=yes
++ fi
++else
++ use_systemd="$with_systemd"
+ fi
+
++if test "x$use_systemd" != "xno" ; then
++ if test "x$have_systemd" = "xno"; then
++ as_fn_error $? "Systemd support explicitly required, but systemd not found" "$LINENO" 5
++ fi
+
+
++$as_echo "#define WITH_SYSTEMD 1" >>confdefs.h
+
++fi
+
++
++
++
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JOURNALD" >&5
+ $as_echo_n "checking for JOURNALD... " >&6; }
+@@ -23727,6 +23675,18 @@ GDM_OLD_CONF='${gdmconfdir}/gdm.conf'
+
+
+
++# Check whether --with-consolekit-directory was given.
++if test "${with_consolekit_directory+set}" = set; then :
++ withval=$with_consolekit_directory;
++else
++ with_consolekit_directory="\${libexecdir}"
++fi
++
++
++CONSOLEKIT_DIR=$with_consolekit_directory
++
++
++
+ # Check whether --with-gnome-settings-daemon-directory was given.
+ if test "${with_gnome_settings_daemon_directory+set}" = set; then :
+ withval=$with_gnome_settings_daemon_directory;
+@@ -24829,6 +24789,10 @@ if test -z "${SUPPORTS_PAM_EXTENSIONS_TRUE}" && test -
+ as_fn_error $? "conditional \"SUPPORTS_PAM_EXTENSIONS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${SUPPORTS_PAM_EXTENSIONS_TRUE}" && test -z "${SUPPORTS_PAM_EXTENSIONS_FALSE}"; then
++ as_fn_error $? "conditional \"SUPPORTS_PAM_EXTENSIONS\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${XDMCP_SUPPORT_TRUE}" && test -z "${XDMCP_SUPPORT_FALSE}"; then
+ as_fn_error $? "conditional \"XDMCP_SUPPORT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -24841,6 +24805,10 @@ if test -z "${OS_SOLARIS_TRUE}" && test -z "${OS_SOLAR
+ as_fn_error $? "conditional \"OS_SOLARIS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${WITH_CONSOLE_KIT_TRUE}" && test -z "${WITH_CONSOLE_KIT_FALSE}"; then
++ as_fn_error $? "conditional \"WITH_CONSOLE_KIT\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${INSTALL_SYSTEMD_UNITS_TRUE}" && test -z "${INSTALL_SYSTEMD_UNITS_FALSE}"; then
+ as_fn_error $? "conditional \"INSTALL_SYSTEMD_UNITS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -27325,6 +27293,7 @@ echo "
+ dmconfdir: ${dmconfdir}
+ localstatedir: ${localstatedir}
+ datadir: ${datadir}
++ consolekit location: ${with_consolekit_directory}
+ gnome-settings-daemon location: ${with_gnome_settings_daemon_directory}
+ gnome-session-check-accel location: ${with_check_accelerated_directory}
+ source code location: ${srcdir}
+@@ -27354,6 +27323,8 @@ echo \
+ " Xinerama support: ${XINERAMA_SUPPORT}
+ XDMCP support: ${XDMCP_SUPPORT}
+ SELinux support: ${use_selinux}
++ ConsoleKit support: ${use_console_kit}
++ systemd support: ${use_systemd}
+ systemd unit dir: ${with_systemdsystemunitdir}
+ plymouth support: ${use_plymouth}
+ wayland support: ${enable_wayland_support}
+@@ -27362,3 +27333,4 @@ echo \
+ Enable documentation: ${enable_documentation}
+ Install GDM's Xsession: ${enable_gdm_xsession}
+ "
++
diff --git a/x11/gdm/files/patch-daemon_Makefile.in b/x11/gdm/files/patch-daemon_Makefile.in
index 4b6e01c7fe7d..91ba64a88646 100644
--- a/x11/gdm/files/patch-daemon_Makefile.in
+++ b/x11/gdm/files/patch-daemon_Makefile.in
@@ -1,10 +1,94 @@
---- daemon/Makefile.in.orig 2013-04-12 00:53:59.667693353 +0000
-+++ daemon/Makefile.in 2013-04-12 00:54:27.682691596 +0000
-@@ -752,6 +752,7 @@
- gdm_session_worker_LDFLAGS = \
- $(XLIB_LIBS) \
- $(PAM_LIBS) \
-+ $(EXTRA_DAEMON_LIBS) \
+--- daemon/Makefile.in.orig 2018-01-14 12:25:16.930784000 +0100
++++ daemon/Makefile.in 2018-01-14 12:25:17.007460000 +0100
+@@ -101,6 +101,7 @@ libexec_PROGRAMS = gdm-session-worker$(EXEEXT) \
+
+ sbin_PROGRAMS = gdm$(EXEEXT) $(am__EXEEXT_1)
+ @XDMCP_SUPPORT_TRUE@am__append_4 = $(XDMCP_SOURCES)
++@WITH_CONSOLE_KIT_TRUE@am__append_5 = $(CONSOLE_KIT_SOURCES)
+ subdir = daemon
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+@@ -139,6 +140,8 @@ am__objects_2 = gdm-xdmcp-display-factory.$(OBJEXT) \
+ gdm-xdmcp-display.$(OBJEXT) \
+ gdm-xdmcp-chooser-display.$(OBJEXT) $(am__objects_1)
+ @XDMCP_SUPPORT_TRUE@am__objects_3 = $(am__objects_2)
++am__objects_4 = $(am__objects_1)
++@WITH_CONSOLE_KIT_TRUE@am__objects_5 = $(am__objects_4)
+ am_gdm_OBJECTS = main.$(OBJEXT) gdm-display-access-file.$(OBJEXT) \
+ gdm-display-store.$(OBJEXT) gdm-display-factory.$(OBJEXT) \
+ gdm-local-display-factory.$(OBJEXT) gdm-display.$(OBJEXT) \
+@@ -148,7 +151,7 @@ am_gdm_OBJECTS = main.$(OBJEXT) gdm-display-access-fil
+ gdm-session-record.$(OBJEXT) \
+ gdm-session-worker-common.$(OBJEXT) \
+ gdm-session-worker-job.$(OBJEXT) gdm-dbus-util.$(OBJEXT) \
+- $(am__objects_1) $(am__objects_3)
++ $(am__objects_1) $(am__objects_3) $(am__objects_5)
+ nodist_gdm_OBJECTS = gdm-display-glue.$(OBJEXT) \
+ gdm-local-display-factory-glue.$(OBJEXT) \
+ gdm-manager-glue.$(OBJEXT) gdm-local-display-glue.$(OBJEXT) \
+@@ -175,16 +178,16 @@ am__gdm_session_worker_SOURCES_DIST = session-worker-m
+ $(top_srcdir)/pam-extensions/gdm-pam-extensions.h \
+ gdm-session-linux-auditor.h gdm-session-linux-auditor.c \
+ gdm-session-solaris-auditor.h gdm-session-solaris-auditor.c
+-@HAVE_LIBAUDIT_TRUE@am__objects_4 = \
++@HAVE_LIBAUDIT_TRUE@am__objects_6 = \
+ @HAVE_LIBAUDIT_TRUE@ gdm-session-linux-auditor.$(OBJEXT)
+-@HAVE_ADT_TRUE@am__objects_5 = gdm-session-solaris-auditor.$(OBJEXT)
++@HAVE_ADT_TRUE@am__objects_7 = gdm-session-solaris-auditor.$(OBJEXT)
+ am_gdm_session_worker_OBJECTS = session-worker-main.$(OBJEXT) \
+ gdm-session.$(OBJEXT) gdm-session-settings.$(OBJEXT) \
+ gdm-session-auditor.$(OBJEXT) gdm-session-record.$(OBJEXT) \
+ gdm-session-worker.$(OBJEXT) gdm-session-worker-job.$(OBJEXT) \
+ gdm-session-worker-common.$(OBJEXT) gdm-dbus-util.$(OBJEXT) \
+- $(am__objects_1) $(am__objects_1) $(am__objects_4) \
+- $(am__objects_5)
++ $(am__objects_1) $(am__objects_1) $(am__objects_6) \
++ $(am__objects_7)
+ nodist_gdm_session_worker_OBJECTS = gdm-session-glue.$(OBJEXT) \
+ gdm-session-worker-glue.$(OBJEXT) \
+ gdm-session-enum-types.$(OBJEXT) $(am__objects_1)
+@@ -310,6 +313,7 @@ CHECK_CFLAGS = @CHECK_CFLAGS@
+ CHECK_LIBS = @CHECK_LIBS@
+ COMMON_CFLAGS = @COMMON_CFLAGS@
+ COMMON_LIBS = @COMMON_LIBS@
++CONSOLEKIT_DIR = @CONSOLEKIT_DIR@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -466,6 +470,7 @@ SYSTEMD_X_SERVER = @SYSTEMD_X_SERVER@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
++WITH_CONSOLE_KIT = @WITH_CONSOLE_KIT@
+ XDMCP_LIBS = @XDMCP_LIBS@
+ XEVIE_OPTION = @XEVIE_OPTION@
+ XGETTEXT = @XGETTEXT@
+@@ -571,6 +576,7 @@ AM_CPPFLAGS = \
+ -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
+ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
+ -DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
++ -DCONSOLEKIT_DIR=\"$(CONSOLEKIT_DIR)\" \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(DAEMON_CFLAGS) \
+ $(XLIB_CFLAGS) \
+@@ -674,7 +680,8 @@ gdm_SOURCES = main.c gdm-display-access-file.c \
+ gdm-session-record.c gdm-session-record.h \
+ gdm-session-worker-common.c gdm-session-worker-common.h \
+ gdm-session-worker-job.c gdm-session-worker-job.h \
+- gdm-dbus-util.c gdm-dbus-util.h $(NULL) $(am__append_4)
++ gdm-dbus-util.c gdm-dbus-util.h $(NULL) $(am__append_4) \
++ $(am__append_5)
+ nodist_gdm_SOURCES = \
+ gdm-display-glue.h \
+ gdm-display-glue.c \
+@@ -701,8 +708,8 @@ XDMCP_SOURCES = \
+ gdm-xdmcp-chooser-display.h \
+ $(NULL)
+
+-EXTRA_gdm_SOURCES = \
+- $(XDMCP_SOURCES) \
++EXTRA_gdm_SOURCES = $(XDMCP_SOURCES) $(NULL) $(CONSOLE_KIT_SOURCES)
++CONSOLE_KIT_SOURCES = \
$(NULL)
- gdm_session_worker_LDADD = \
+ gdm_LDADD = \
diff --git a/x11/gdm/files/patch-daemon_gdm-launch-environment.c b/x11/gdm/files/patch-daemon_gdm-launch-environment.c
new file mode 100644
index 000000000000..cd14eaa21b58
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-launch-environment.c
@@ -0,0 +1,37 @@
+$OpenBSD: patch-daemon_gdm-launch-environment_c,v 1.8 2017/04/17 13:17:07 ajacoutot Exp $
+
+XXX fix+push upstream
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From a9cacb929470eb82582396984c61d5b611bfeb1a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 14:33:40 -0400
+Subject: session: drop session-type property
+
+--- daemon/gdm-launch-environment.c.orig Wed Apr 12 15:47:09 2017
++++ daemon/gdm-launch-environment.c Mon Apr 17 14:17:28 2017
+@@ -197,6 +197,9 @@ build_launch_environment (GdmLaunchEnvironment *launch
+ char *seat_id;
+
+ seat_id = launch_environment->priv->x11_display_seat_id;
++ if (g_str_has_prefix (seat_id, "/org/freedesktop/ConsoleKit/")) {
++ seat_id += strlen ("/org/freedesktop/ConsoleKit/");
++ }
+
+ g_hash_table_insert (hash, g_strdup ("GDM_SEAT_ID"), g_strdup (seat_id));
+ }
+@@ -224,6 +227,8 @@ on_session_setup_complete (GdmSession *session,
+ gdm_session_set_environment_variable (launch_environment->priv->session, key, value);
+ }
+ g_hash_table_destroy (hash);
++
++ gdm_session_select_session_type (launch_environment->priv->session, "LoginWindow");
+ }
+
+ static void
diff --git a/x11/gdm/files/patch-daemon_gdm-local-display-factory.c b/x11/gdm/files/patch-daemon_gdm-local-display-factory.c
new file mode 100644
index 000000000000..8ed9f5e00239
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-local-display-factory.c
@@ -0,0 +1,132 @@
+$OpenBSD: patch-daemon_gdm-local-display-factory_c,v 1.6 2017/03/03 13:01:26 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+--- daemon/gdm-local-display-factory.c.orig Wed Mar 1 16:58:36 2017
++++ daemon/gdm-local-display-factory.c Fri Mar 3 12:00:56 2017
+@@ -42,6 +42,8 @@
+
+ #define GDM_LOCAL_DISPLAY_FACTORY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LOCAL_DISPLAY_FACTORY, GdmLocalDisplayFactoryPrivate))
+
++#define CK_SEAT1_PATH "/org/freedesktop/ConsoleKit/Seat1"
++
+ #define GDM_DBUS_PATH "/org/gnome/DisplayManager"
+ #define GDM_LOCAL_DISPLAY_FACTORY_DBUS_PATH GDM_DBUS_PATH "/LocalDisplayFactory"
+ #define GDM_MANAGER_DBUS_NAME "org.gnome.DisplayManager.LocalDisplayFactory"
+@@ -57,8 +59,10 @@ struct GdmLocalDisplayFactoryPrivate
+ /* FIXME: this needs to be per seat? */
+ guint num_failures;
+
++#ifdef WITH_SYSTEMD
+ guint seat_new_id;
+ guint seat_removed_id;
++#endif
+ };
+
+ enum {
+@@ -206,8 +210,10 @@ gdm_local_display_factory_create_transient_display (Gd
+
+ g_debug ("GdmLocalDisplayFactory: Creating transient display");
+
+-#ifdef ENABLE_USER_DISPLAY_SERVER
+- display = gdm_local_display_new ();
++#if defined ENABLE_USER_DISPLAY_SERVER && defined WITH_SYSTEMD
++ if (LOGIND_RUNNING() > 0) {
++ display = gdm_local_display_new ();
++ }
+ #else
+ if (display == NULL) {
+ guint32 num;
+@@ -289,7 +295,7 @@ on_display_status_changed (GdmDisplay *dis
+ /* reset num failures */
+ factory->priv->num_failures = 0;
+
+- gdm_local_display_factory_sync_seats (factory);
++ create_display (factory, seat_id, session_type, is_initial);
+ }
+ break;
+ case GDM_DISPLAY_FAILED:
+@@ -368,7 +374,7 @@ create_display (GdmLocalDisplayFactory *factory,
+
+ g_debug ("GdmLocalDisplayFactory: Adding display on seat %s", seat_id);
+
+-#ifdef ENABLE_USER_DISPLAY_SERVER
++#if defined ENABLE_USER_DISPLAY_SERVER && defined WITH_SYSTEMD
+ if (g_strcmp0 (seat_id, "seat0") == 0) {
+ display = gdm_local_display_new ();
+ if (session_type != NULL) {
+@@ -400,6 +406,8 @@ create_display (GdmLocalDisplayFactory *factory,
+ return display;
+ }
+
++#ifdef WITH_SYSTEMD
++
+ static void
+ delete_display (GdmLocalDisplayFactory *factory,
+ const char *seat_id) {
+@@ -536,6 +544,7 @@ gdm_local_display_factory_stop_monitor (GdmLocalDispla
+ factory->priv->seat_removed_id = 0;
+ }
+ }
++#endif
+
+ static void
+ on_display_added (GdmDisplayStore *display_store,
+@@ -576,6 +585,7 @@ static gboolean
+ gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
+ {
+ GdmLocalDisplayFactory *factory = GDM_LOCAL_DISPLAY_FACTORY (base_factory);
++ GdmDisplay *display;
+ GdmDisplayStore *store;
+
+ g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
+@@ -594,8 +604,17 @@ gdm_local_display_factory_start (GdmDisplayFactory *ba
+ factory,
+ 0);
+
+- gdm_local_display_factory_start_monitor (factory);
+- return gdm_local_display_factory_sync_seats (factory);
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ gdm_local_display_factory_start_monitor (factory);
++ return gdm_local_display_factory_sync_seats (factory);
++ }
++#endif
++
++ /* On ConsoleKit just create Seat1, and that's it. */
++ display = create_display (factory, CK_SEAT1_PATH, NULL, TRUE);
++
++ return display != NULL;
+ }
+
+ static gboolean
+@@ -606,7 +625,9 @@ gdm_local_display_factory_stop (GdmDisplayFactory *bas
+
+ g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
+
++#ifdef WITH_SYSTEMD
+ gdm_local_display_factory_stop_monitor (factory);
++#endif
+
+ store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
+
+@@ -762,7 +783,9 @@ gdm_local_display_factory_finalize (GObject *object)
+
+ g_hash_table_destroy (factory->priv->used_display_numbers);
+
++#ifdef WITH_SYSTEMD
+ gdm_local_display_factory_stop_monitor (factory);
++#endif
+
+ G_OBJECT_CLASS (gdm_local_display_factory_parent_class)->finalize (object);
+ }
diff --git a/x11/gdm/files/patch-daemon_gdm-manager.c b/x11/gdm/files/patch-daemon_gdm-manager.c
new file mode 100644
index 000000000000..af1ada894ddd
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-manager.c
@@ -0,0 +1,946 @@
+$OpenBSD: patch-daemon_gdm-manager_c,v 1.14 2017/05/10 10:18:15 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 21905303afbd508f3bf599ad219c9209413c53a2 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 5 Apr 2017 12:11:20 -0400
+Subject: manager: stop transient greeter session when done with it
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 22c332baaf8ad6d7082c5b01250bae70934c2fd1 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 4 Apr 2017 17:07:04 -0400
+Subject: manager: make sure we end up on a login screen
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+
+--- daemon/gdm-manager.c.orig 2017-10-24 21:33:58.000000000 +0200
++++ daemon/gdm-manager.c 2018-01-14 13:33:21.588929000 +0100
+@@ -36,7 +36,9 @@
+
+ #include <act/act-user-manager.h>
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-login.h>
++#endif
+
+ #include "gdm-common.h"
+
+@@ -63,6 +65,15 @@
+
+ #define INITIAL_SETUP_USERNAME "gnome-initial-setup"
+
++#define CK_NAME "org.freedesktop.ConsoleKit"
++#define CK_PATH "/org/freedesktop/ConsoleKit"
++#define CK_INTERFACE "org.freedesktop.ConsoleKit"
++
++#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
++#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
++#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
++
+ typedef struct
+ {
+ GdmManager *manager;
+@@ -206,9 +217,10 @@ plymouth_quit_without_transition (void)
+ }
+ #endif
+
++#ifdef WITH_SYSTEMD
+ static char *
+-get_session_id_for_pid (pid_t pid,
+- GError **error)
++get_session_id_for_pid_systemd (pid_t pid,
++ GError **error)
+ {
+ char *session, *gsession;
+ int ret;
+@@ -233,11 +245,61 @@ get_session_id_for_pid (pid_t pid,
+ return NULL;
+ }
+ }
++#endif
+
++#ifdef WITH_CONSOLE_KIT
++static char *
++get_session_id_for_pid_consolekit (GDBusConnection *connection,
++ pid_t pid,
++ GError **error)
++{
++ GVariant *reply;
++ char *retval;
++
++ reply = g_dbus_connection_call_sync (connection,
++ "org.freedesktop.ConsoleKit",
++ "/org/freedesktop/ConsoleKit/Manager",
++ "org.freedesktop.ConsoleKit.Manager",
++ "GetSessionForUnixProcess",
++ g_variant_new ("(u)", pid),
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, error);
++ if (reply == NULL) {
++ return NULL;
++ }
++
++ g_variant_get (reply, "(o)", &retval);
++ g_variant_unref (reply);
++
++ return retval;
++}
++#endif
++
++static char *
++get_session_id_for_pid (GDBusConnection *connection,
++ pid_t pid,
++ GError **error)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return get_session_id_for_pid_systemd (pid, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return get_session_id_for_pid_consolekit (connection, pid, error);
++#endif
++
++ return NULL;
++}
++
++#ifdef WITH_SYSTEMD
+ static gboolean
+-get_uid_for_session_id (const char *session_id,
+- uid_t *uid,
+- GError **error)
++get_uid_for_systemd_session_id (const char *session_id,
++ uid_t *uid,
++ GError **error)
+ {
+ int ret;
+
+@@ -254,8 +316,62 @@ get_uid_for_session_id (const char *session_id,
+
+ return TRUE;
+ }
++#endif
+
++#ifdef WITH_CONSOLE_KIT
+ static gboolean
++get_uid_for_consolekit_session_id (GDBusConnection *connection,
++ const char *session_id,
++ uid_t *out_uid,
++ GError **error)
++{
++ GVariant *reply;
++ guint32 uid;
++
++ reply = g_dbus_connection_call_sync (connection,
++ "org.freedesktop.ConsoleKit",
++ session_id,
++ "org.freedesktop.ConsoleKit.Session",
++ "GetUnixUser",
++ NULL,
++ G_VARIANT_TYPE ("(u)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ error);
++ if (reply == NULL) {
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(u)", &uid);
++ g_variant_unref (reply);
++
++ *out_uid = (uid_t) uid;
++
++ return TRUE;
++}
++#endif
++
++static gboolean
++get_uid_for_session_id (GDBusConnection *connection,
++ const char *session_id,
++ uid_t *uid,
++ GError **error)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return get_uid_for_systemd_session_id (session_id, uid, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return get_uid_for_consolekit_session_id (connection, session_id, uid, error);
++#endif
++
++ return FALSE;
++}
++
++static gboolean
+ lookup_by_session_id (const char *id,
+ GdmDisplay *display,
+ gpointer user_data)
+@@ -267,11 +383,51 @@ lookup_by_session_id (const char *id,
+ return g_strcmp0 (current, looking_for) == 0;
+ }
+
++#ifdef WITH_CONSOLE_KIT
+ static gboolean
+-is_login_session (GdmManager *self,
+- const char *session_id,
+- GError **error)
++is_consolekit_login_session (GdmManager *self,
++ GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
+ {
++ GVariant *reply;
++ char *session_type = NULL;
++
++ reply = g_dbus_connection_call_sync (connection,
++ "org.freedesktop.ConsoleKit",
++ session_id,
++ "org.freedesktop.ConsoleKit.Session",
++ "GetSessionType",
++ NULL,
++ G_VARIANT_TYPE ("(s)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ error);
++ if (reply == NULL) {
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(s)", &session_type);
++ g_variant_unref (reply);
++
++ if (g_strcmp0 (session_type, "LoginWindow") != 0) {
++ g_free (session_type);
++
++ return FALSE;
++ }
++
++ g_free (session_type);
++ return TRUE;
++}
++#endif
++
++#ifdef WITH_SYSTEMD
++static gboolean
++is_systemd_login_session (GdmManager *self,
++ const char *session_id,
++ GError **error)
++{
+ char *session_class = NULL;
+ int ret;
+
+@@ -295,12 +451,33 @@ is_login_session (GdmManager *self,
+ g_free (session_class);
+ return TRUE;
+ }
++#endif
+
+ static gboolean
+-activate_session_id (GdmManager *manager,
+- const char *seat_id,
+- const char *session_id)
++is_login_session (GdmManager *self,
++ GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
+ {
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return is_systemd_login_session (self, session_id, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return is_consolekit_login_session (self, connection, session_id, error);
++#endif
++
++ return FALSE;
++}
++
++#ifdef WITH_SYSTEMD
++static gboolean
++activate_session_id_for_systemd (GdmManager *manager,
++ const char *seat_id,
++ const char *session_id)
++{
+ GError *error = NULL;
+ GVariant *reply;
+
+@@ -326,16 +503,75 @@ activate_session_id (GdmManager *manager,
+
+ return TRUE;
+ }
++#endif
+
++#ifdef WITH_CONSOLE_KIT
+ static gboolean
+-session_unlock (GdmManager *manager,
+- const char *ssid)
++activate_session_id_for_ck (GdmManager *manager,
++ const char *seat_id,
++ const char *session_id)
+ {
+ GError *error = NULL;
+ GVariant *reply;
+
+- g_debug ("Unlocking session %s", ssid);
++ reply = g_dbus_connection_call_sync (manager->priv->connection,
++ CK_NAME,
++ seat_id,
++ "org.freedesktop.ConsoleKit.Seat",
++ "ActivateSession",
++ g_variant_new ("(o)", session_id),
++ NULL, /* expected reply */
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++ if (reply == NULL) {
++ g_debug ("GdmManager: ConsoleKit %s raised:\n %s\n\n",
++ g_dbus_error_get_remote_error (error), error->message);
++ g_error_free (error);
+
++ /* It is very likely that the "error" just reported is
++ * that the session is already active. Unfortunately,
++ * ConsoleKit doesn't use proper error codes and it
++ * translates the error message, so we have no real way
++ * to detect this case...
++ */
++ return TRUE;
++ }
++
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++#endif
++
++static gboolean
++activate_session_id (GdmManager *manager,
++ const char *seat_id,
++ const char *session_id)
++{
++
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return activate_session_id_for_systemd (manager, seat_id, session_id);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return activate_session_id_for_ck (manager, seat_id, session_id);
++#else
++ return FALSE;
++#endif
++}
++
++#ifdef WITH_SYSTEMD
++static gboolean
++session_unlock_for_systemd (GdmManager *manager,
++ const char *ssid)
++{
++ GError *error = NULL;
++ GVariant *reply;
++
+ reply = g_dbus_connection_call_sync (manager->priv->connection,
+ "org.freedesktop.login1",
+ "/org/freedesktop/login1",
+@@ -358,7 +594,60 @@ session_unlock (GdmManager *manager,
+
+ return TRUE;
+ }
++#endif
+
++#ifdef WITH_CONSOLE_KIT
++static gboolean
++session_unlock_for_ck (GdmManager *manager,
++ const char *ssid)
++{
++ GError *error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (manager->priv->connection,
++ CK_NAME,
++ ssid,
++ CK_SESSION_INTERFACE,
++ "Unlock",
++ NULL, /* parameters */
++ NULL, /* expected reply */
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++ if (reply == NULL) {
++ g_debug ("GdmManager: ConsoleKit %s raised:\n %s\n\n",
++ g_dbus_error_get_remote_error (error), error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++#endif
++
++static gboolean
++session_unlock (GdmManager *manager,
++ const char *ssid)
++{
++
++ g_debug ("Unlocking session %s", ssid);
++
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return session_unlock_for_systemd (manager, ssid);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return session_unlock_for_ck (manager, ssid);
++#else
++ return TRUE;
++#endif
++}
++
+ static GdmSession *
+ find_session_for_user_on_seat (GdmManager *manager,
+ const char *username,
+@@ -389,11 +678,44 @@ find_session_for_user_on_seat (GdmManager *manager,
+ return NULL;
+ }
+
++#ifdef WITH_CONSOLE_KIT
+ static gboolean
+-is_remote_session (GdmManager *self,
+- const char *session_id,
+- GError **error)
++is_consolekit_remote_session (GdmManager *self,
++ GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
+ {
++ GVariant *reply;
++ gboolean is_remote;
++
++ reply = g_dbus_connection_call_sync (connection,
++ "org.freedesktop.ConsoleKit",
++ session_id,
++ "org.freedesktop.ConsoleKit.Session",
++ "IsLocal",
++ NULL,
++ G_VARIANT_TYPE ("(b)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ error);
++ if (reply == NULL) {
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(b)", &is_remote);
++ g_variant_unref (reply);
++
++ return is_remote;
++}
++#endif
++
++#ifdef WITH_SYSTEMD
++static gboolean
++is_systemd_remote_session (GdmManager *self,
++ const char *session_id,
++ GError **error)
++{
+ char *seat;
+ int ret;
+ gboolean is_remote;
+@@ -418,10 +740,31 @@ is_remote_session (GdmManager *self,
+
+ return is_remote;
+ }
++#endif
+
++static gboolean
++is_remote_session (GdmManager *self,
++ GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return is_systemd_remote_session (self, session_id, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return is_consolekit_remote_session (self, connection, session_id, error);
++#endif
++
++ return FALSE;
++}
++
++#ifdef WITH_SYSTEMD
+ static char *
+-get_seat_id_for_session_id (const char *session_id,
+- GError **error)
++get_seat_id_for_systemd_session_id (const char *session_id,
++ GError **error)
+ {
+ int ret;
+ char *seat, *out_seat;
+@@ -446,11 +789,62 @@ get_seat_id_for_session_id (const char *session_id,
+
+ return out_seat;
+ }
++#endif
+
++#ifdef WITH_CONSOLE_KIT
+ static char *
+-get_tty_for_session_id (const char *session_id,
+- GError **error)
++get_seat_id_for_consolekit_session_id (GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
+ {
++ GVariant *reply;
++ char *retval;
++
++ reply = g_dbus_connection_call_sync (connection,
++ "org.freedesktop.ConsoleKit",
++ session_id,
++ "org.freedesktop.ConsoleKit.Session",
++ "GetSeatId",
++ NULL,
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ error);
++ if (reply == NULL) {
++ return NULL;
++ }
++
++ g_variant_get (reply, "(o)", &retval);
++ g_variant_unref (reply);
++
++ return retval;
++}
++#endif
++
++static char *
++get_seat_id_for_session_id (GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return get_seat_id_for_systemd_session_id (session_id, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return get_seat_id_for_consolekit_session_id (connection, session_id, error);
++#endif
++
++ return NULL;
++}
++
++#ifdef WITH_SYSTEMD
++static char *
++get_tty_for_systemd_session_id (const char *session_id,
++ GError **error)
++{
+ int ret;
+ char *tty, *out_tty;
+
+@@ -473,7 +867,21 @@ get_tty_for_session_id (const char *session_id,
+
+ return out_tty;
+ }
++#endif
+
++static char *
++get_tty_for_session_id (const char *session_id,
++ GError **error)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return get_tty_for_systemd_session_id (session_id, error);
++ }
++#endif
++
++ return NULL;
++}
++
+ static void
+ get_display_and_details_for_bus_sender (GdmManager *self,
+ GDBusConnection *connection,
+@@ -516,7 +924,7 @@ get_display_and_details_for_bus_sender (GdmManager
+ goto out;
+ }
+
+- session_id = get_session_id_for_pid (pid, &error);
++ session_id = get_session_id_for_pid (connection, pid, &error);
+
+ if (session_id == NULL) {
+ g_debug ("GdmManager: Error while retrieving session id for sender: %s",
+@@ -530,7 +938,7 @@ get_display_and_details_for_bus_sender (GdmManager
+ }
+
+ if (out_is_login_screen != NULL) {
+- *out_is_login_screen = is_login_session (self, session_id, &error);
++ *out_is_login_screen = is_login_session (self, connection, session_id, &error);
+
+ if (error != NULL) {
+ g_debug ("GdmManager: Error while checking if sender is login screen: %s",
+@@ -540,7 +948,7 @@ get_display_and_details_for_bus_sender (GdmManager
+ }
+ }
+
+- if (!get_uid_for_session_id (session_id, &session_uid, &error)) {
++ if (!get_uid_for_session_id (connection, session_id, &session_uid, &error)) {
+ g_debug ("GdmManager: Error while retrieving uid for session: %s",
+ error->message);
+ g_error_free (error);
+@@ -557,7 +965,7 @@ get_display_and_details_for_bus_sender (GdmManager
+ }
+
+ if (out_seat_id != NULL) {
+- *out_seat_id = get_seat_id_for_session_id (session_id, &error);
++ *out_seat_id = get_seat_id_for_session_id (connection, session_id, &error);
+
+ if (error != NULL) {
+ g_debug ("GdmManager: Error while retrieving seat id for session: %s",
+@@ -567,7 +975,7 @@ get_display_and_details_for_bus_sender (GdmManager
+ }
+
+ if (out_is_remote != NULL) {
+- *out_is_remote = is_remote_session (self, session_id, &error);
++ *out_is_remote = is_remote_session (self, connection, session_id, &error);
+
+ if (error != NULL) {
+ g_debug ("GdmManager: Error while retrieving remoteness for session: %s",
+@@ -725,29 +1133,6 @@ out:
+ return recorded;
+ }
+
+-static GdmSession *
+-find_user_session_for_display (GdmManager *self,
+- GdmDisplay *display)
+-{
+-
+- GList *node = self->priv->user_sessions;
+-
+- while (node != NULL) {
+- GdmSession *session = node->data;
+- GdmDisplay *candidate_display;
+- GList *next_node = node->next;
+-
+- candidate_display = get_display_for_user_session (session);
+-
+- if (candidate_display == display)
+- return session;
+-
+- node = next_node;
+- }
+-
+- return NULL;
+-}
+-
+ static gboolean
+ gdm_manager_handle_register_display (GdmDBusManager *manager,
+ GDBusMethodInvocation *invocation,
+@@ -787,7 +1172,7 @@ gdm_manager_handle_register_display (GdmDBusManager
+ }
+ }
+
+- session = find_user_session_for_display (self, display);
++ session = get_user_session_for_display (display);
+
+ if (session != NULL) {
+ GPid pid;
+@@ -961,7 +1346,8 @@ on_reauthentication_client_rejected (GdmSession
+ * same audit session, ignore it since it doesn't "own" the
+ * reauthentication session
+ */
+- client_session_id = get_session_id_for_pid (pid_of_client,
++ client_session_id = get_session_id_for_pid (self->priv->connection,
++ pid_of_client,
+ NULL);
+ session_id = g_object_get_data (G_OBJECT (session), "caller-session-id");
+
+@@ -1173,16 +1559,20 @@ static gboolean
+ display_is_on_seat0 (GdmDisplay *display)
+ {
+ gboolean is_on_seat0 = TRUE;
+- char *seat_id = NULL;
+
+- g_object_get (G_OBJECT (display), "seat-id", &seat_id, NULL);
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ char *seat_id = NULL;
+
+- if (g_strcmp0 (seat_id, "seat0") != 0) {
+- is_on_seat0 = FALSE;
+- }
++ g_object_get (G_OBJECT (display), "seat-id", &seat_id, NULL);
+
+- g_free (seat_id);
++ if (g_strcmp0 (seat_id, "seat0") != 0) {
++ is_on_seat0 = FALSE;
++ }
+
++ g_free (seat_id);
++ }
++#endif
+ return is_on_seat0;
+ }
+
+@@ -1320,133 +1710,6 @@ maybe_start_pending_initial_login (GdmManager *manager
+ g_free (user_session_seat_id);
+ }
+
+-static gboolean
+-get_login_window_session_id (const char *seat_id,
+- char **session_id)
+-{
+- gboolean ret;
+- int res, i;
+- char **sessions;
+- char *service_id;
+- char *service_class;
+- char *state;
+-
+- res = sd_seat_get_sessions (seat_id, &sessions, NULL, NULL);
+- if (res < 0) {
+- g_debug ("Failed to determine sessions: %s", strerror (-res));
+- return FALSE;
+- }
+-
+- if (sessions == NULL || sessions[0] == NULL) {
+- *session_id = NULL;
+- ret = TRUE;
+- goto out;
+- }
+-
+- for (i = 0; sessions[i]; i ++) {
+-
+- res = sd_session_get_class (sessions[i], &service_class);
+- if (res < 0) {
+- g_debug ("failed to determine class of session %s: %s", sessions[i], strerror (-res));
+- ret = FALSE;
+- goto out;
+- }
+-
+- if (strcmp (service_class, "greeter") != 0) {
+- free (service_class);
+- continue;
+- }
+-
+- free (service_class);
+-
+- ret = sd_session_get_state (sessions[i], &state);
+- if (ret < 0) {
+- g_debug ("failed to determine state of session %s: %s", sessions[i], strerror (-res));
+- ret = FALSE;
+- goto out;
+- }
+-
+- if (g_strcmp0 (state, "closing") == 0) {
+- free (state);
+- continue;
+- }
+- free (state);
+-
+- res = sd_session_get_service (sessions[i], &service_id);
+- if (res < 0) {
+- g_debug ("failed to determine service of session %s: %s", sessions[i], strerror (-res));
+- ret = FALSE;
+- goto out;
+- }
+-
+- if (strcmp (service_id, "gdm-launch-environment") == 0) {
+- *session_id = g_strdup (sessions[i]);
+- ret = TRUE;
+-
+- free (service_id);
+- goto out;
+- }
+-
+- free (service_id);
+- }
+-
+- *session_id = NULL;
+- ret = TRUE;
+-
+-out:
+- if (sessions) {
+- for (i = 0; sessions[i]; i ++) {
+- free (sessions[i]);
+- }
+-
+- free (sessions);
+- }
+-
+- return ret;
+-}
+-
+-static void
+-activate_login_window_session_on_seat (GdmManager *self,
+- const char *seat_id)
+-{
+- char *session_id;
+-
+- if (!get_login_window_session_id (seat_id, &session_id)) {
+- return;
+- }
+-
+- activate_session_id (self, seat_id, session_id);
+-}
+-
+-static void
+-maybe_activate_other_session (GdmManager *self,
+- GdmDisplay *old_display)
+-{
+- char *seat_id = NULL;
+- char *session_id;
+- int ret;
+-
+- g_object_get (G_OBJECT (old_display),
+- "seat-id", &seat_id,
+- NULL);
+-
+- ret = sd_seat_get_active (seat_id, &session_id, NULL);
+-
+- if (ret == 0) {
+- GdmDisplay *display;
+-
+- display = gdm_display_store_find (self->priv->display_store,
+- lookup_by_session_id,
+- (gpointer) session_id);
+-
+- if (display == NULL) {
+- activate_login_window_session_on_seat (self, seat_id);
+- }
+- }
+-
+- g_free (seat_id);
+-}
+-
+ static const char *
+ get_username_for_greeter_display (GdmManager *manager,
+ GdmDisplay *display)
+@@ -1692,7 +1955,6 @@ on_display_status_changed (GdmDisplay *display,
+ manager->priv->ran_once = TRUE;
+ }
+ maybe_start_pending_initial_login (manager, display);
+- maybe_activate_other_session (manager, display);
+ break;
+ default:
+ break;
+@@ -2027,11 +2289,57 @@ on_user_session_died (GdmSession *session,
+ }
+
+ static char *
++query_ck_for_display_device (GdmManager *manager,
++ GdmDisplay *display)
++{
++ char *out;
++ char *command;
++ char *display_name = NULL;
++ int status;
++ gboolean res;
++ GError *error;
++
++ g_object_get (G_OBJECT (display),
++ "x11-display-name", &display_name,
++ NULL);
++
++ error = NULL;
++ command = g_strdup_printf (CONSOLEKIT_DIR "/ck-get-x11-display-device --display %s",
++ display_name);
++ g_free (display_name);
++
++ g_debug ("GdmManager: Running helper %s", command);
++ out = NULL;
++ res = g_spawn_command_line_sync (command,
++ &out,
++ NULL,
++ &status,
++ &error);
++ if (! res) {
++ g_warning ("GdmManager: Could not run helper %s: %s", command, error->message);
++ g_error_free (error);
++ } else {
++ out = g_strstrip (out);
++ g_debug ("GdmManager: Got tty: '%s'", out);
++ }
++
++ g_free (command);
++
++ return out;
++}
++
++static char *
+ get_display_device (GdmManager *manager,
+ GdmDisplay *display)
+ {
+- /* systemd finds the display device out on its own based on the display */
+- return NULL;
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ /* systemd finds the display device out on its own based on the display */
++ return NULL;
++ }
++#endif
++
++ return query_ck_for_display_device (manager, display);
+ }
+
+ static void
+@@ -2040,25 +2348,6 @@ on_session_reauthenticated (GdmSession *session,
+ GdmManager *manager)
+ {
+ gboolean fail_if_already_switched = FALSE;
+-
+- if (gdm_session_get_display_mode (session) == GDM_SESSION_DISPLAY_MODE_REUSE_VT) {
+- const char *seat_id;
+- char *session_id;
+-
+- seat_id = gdm_session_get_display_seat_id (session);
+- if (get_login_window_session_id (seat_id, &session_id)) {
+- GdmDisplay *display = gdm_display_store_find (manager->priv->display_store,
+- lookup_by_session_id,
+- (gpointer) session_id);
+-
+- if (display != NULL) {
+- gdm_display_stop_greeter_session (display);
+- gdm_display_unmanage (display);
+- gdm_display_finish (display);
+- }
+- g_free (session_id);
+- }
+- }
+
+ /* There should already be a session running, so jump to its
+ * VT. In the event we're already on the right VT, (i.e. user
diff --git a/x11/gdm/files/patch-daemon_gdm-server.c b/x11/gdm/files/patch-daemon_gdm-server.c
new file mode 100644
index 000000000000..22325e63a15f
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-server.c
@@ -0,0 +1,167 @@
+--- daemon/gdm-server.c.orig 2017-05-05 16:40:44.000000000 +0200
++++ daemon/gdm-server.c 2017-06-08 10:39:30.725180000 +0200
+@@ -43,7 +43,9 @@
+ #include <linux/vt.h>
+ #endif
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
++#endif
+
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+ #include <systemd/sd-journal.h>
+@@ -122,23 +124,65 @@
+
+ G_DEFINE_TYPE (GdmServer, gdm_server, G_TYPE_OBJECT)
+
++static char *
++_gdm_server_query_ck_for_display_device (GdmServer *server)
++{
++ char *out;
++ char *command;
++ int status;
++ gboolean res;
++ GError *error;
++
++ g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
++
++ error = NULL;
++ command = g_strdup_printf (CONSOLEKIT_DIR "/ck-get-x11-display-device --display %s",
++ server->priv->display_name);
++
++ g_debug ("GdmServer: Running helper %s", command);
++ out = NULL;
++ res = g_spawn_command_line_sync (command,
++ &out,
++ NULL,
++ &status,
++ &error);
++ if (! res) {
++ g_warning ("Could not run helper: %s", error->message);
++ g_error_free (error);
++ } else {
++ out = g_strstrip (out);
++ g_debug ("GdmServer: Got tty: '%s'", out);
++ }
++
++ g_free (command);
++
++ return out;
++}
++
+ char *
+ gdm_server_get_display_device (GdmServer *server)
+ {
+- /* systemd finds the display device out on its own based on the display */
+- return NULL;
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ /* systemd finds the display device out on its own based on the display */
++ return NULL;
++ }
++#endif
++
++ if (server->priv->display_device == NULL) {
++ server->priv->display_device =
++ _gdm_server_query_ck_for_display_device (server);
++
++ g_object_notify (G_OBJECT (server), "display-device");
++ }
++
++ return g_strdup (server->priv->display_device);
+ }
+
+ static void
+ gdm_server_ready (GdmServer *server)
+ {
+ g_debug ("GdmServer: Got USR1 from X server - emitting READY");
+-
+- gdm_run_script (GDMCONFDIR "/Init", GDM_USERNAME,
+- server->priv->display_name,
+- NULL, /* hostname */
+- server->priv->auth_file);
+-
+ g_signal_emit (server, signals[READY], 0);
+ }
+
+@@ -226,8 +270,10 @@
+ debug_options = "";
+ }
+
+-#define X_SERVER_ARG_FORMAT " -background none -noreset -verbose %s%s"
++ #define X_SERVER_ARG_FORMAT " -background none -noreset -verbose %s%s"
+
++#ifdef WITH_SYSTEMD
++
+ /* This is a temporary hack to work around the fact that XOrg
+ * currently lacks support for multi-seat hotplugging for
+ * display devices. This bit should be removed as soon as XOrg
+@@ -242,6 +288,10 @@
+ * wasn't booted using systemd, or b) the wrapper tool is
+ * missing, or c) we are running for the main seat 'seat0'. */
+
++ if (!LOGIND_RUNNING()) {
++ goto fallback;
++ }
++
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+ /* For systemd, we don't have a log file but instead log to stdout,
+ so set it to the xserver's built-in default verbosity */
+@@ -264,8 +314,9 @@
+ return;
+
+ fallback:
+- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++#endif
+
++ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
+ }
+
+ static gboolean
+@@ -315,10 +366,12 @@
+ argv[len++] = g_strdup (server->priv->auth_file);
+ }
+
+- if (server->priv->display_seat_id != NULL) {
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING() && server->priv->display_seat_id != NULL) {
+ argv[len++] = g_strdup ("-seat");
+ argv[len++] = g_strdup (server->priv->display_seat_id);
+ }
++#endif
+
+ /* If we were compiled with Xserver >= 1.17 we need to specify
+ * '-listen tcp' as the X server dosen't listen on tcp sockets
+@@ -657,18 +710,14 @@
+ g_signal_emit (server, signals [DIED], 0, num);
+ }
+
++ active_servers = g_slist_remove (active_servers, server);
++
+ g_spawn_close_pid (server->priv->pid);
+ server->priv->pid = -1;
+
+ g_object_unref (server);
+ }
+
+-static void
+-prune_active_servers_list (GdmServer *server)
+-{
+- active_servers = g_slist_remove (active_servers, server);
+-}
+-
+ static gboolean
+ gdm_server_spawn (GdmServer *server,
+ const char *vtarg,
+@@ -707,11 +756,6 @@
+ g_free (freeme);
+
+ active_servers = g_slist_append (active_servers, server);
+-
+- g_object_weak_ref (G_OBJECT (server),
+- (GWeakNotify)
+- prune_active_servers_list,
+- server);
+
+ gdm_server_launch_sigusr1_thread_if_needed ();
+
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker-job.c b/x11/gdm/files/patch-daemon_gdm-session-worker-job.c
new file mode 100644
index 000000000000..cd7f6b0c27f1
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker-job.c
@@ -0,0 +1,20 @@
+$OpenBSD: patch-daemon_gdm-session-worker-job_c,v 1.1 2015/10/18 13:25:54 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+--- daemon/gdm-session-worker-job.c.orig Mon Sep 21 16:12:33 2015
++++ daemon/gdm-session-worker-job.c Sun Oct 18 14:23:39 2015
+@@ -36,7 +36,9 @@
+ #include <sys/prctl.h>
+ #endif
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
++#endif
+
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+ #include <systemd/sd-journal.h>
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c
new file mode 100644
index 000000000000..121ca11a0232
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c
@@ -0,0 +1,611 @@
+$OpenBSD: patch-daemon_gdm-session-worker_c,v 1.15 2017/03/12 12:58:03 nigel Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From a9cacb929470eb82582396984c61d5b611bfeb1a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 14:33:40 -0400
+Subject: session: drop session-type property
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 6942fb9b16bab7173bbd295fb19a9770289dbe0e Mon Sep 17 00:00:00 2001
+From: Tim Lunn <tim@feathertop.org>
+Date: Mon, 11 Apr 2016 23:18:10 +1000
+Subject: gdm-session: set PAM_TTY when initialising pam
+
+--- daemon/gdm-session-worker.c.orig 2017-10-31 18:16:51.000000000 +0100
++++ daemon/gdm-session-worker.c 2018-01-17 17:38:41.826277000 +0100
+@@ -28,9 +28,11 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#ifdef WITH_SYSTEMD
+ #include <sys/ioctl.h>
+ #include <sys/vt.h>
+ #include <sys/kd.h>
++#endif
+ #include <errno.h>
+ #include <grp.h>
+ #include <pwd.h>
+@@ -49,7 +51,9 @@
+
+ #include <X11/Xauth.h>
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
++#endif
+
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+ #include <systemd/sd-journal.h>
+@@ -93,7 +97,7 @@
+ #endif
+
+ #ifndef GDM_SESSION_DEFAULT_PATH
+-#define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin"
++#define GDM_SESSION_DEFAULT_PATH "%%LOCALBASE%%/bin:/usr/bin:/bin"
+ #endif
+
+ #ifndef GDM_SESSION_ROOT_UID
+@@ -136,6 +140,10 @@ struct GdmSessionWorkerPrivate
+
+ int exit_code;
+
++#ifdef WITH_CONSOLE_KIT
++ char *session_cookie;
++#endif
++
+ pam_handle_t *pam_handle;
+
+ GPid child_pid;
+@@ -150,6 +158,7 @@ struct GdmSessionWorkerPrivate
+ char *hostname;
+ char *username;
+ char *log_file;
++ char *session_type;
+ char *session_id;
+ uid_t uid;
+ gid_t gid;
+@@ -223,6 +232,204 @@ G_DEFINE_TYPE_WITH_CODE (GdmSessionWorker,
+ G_IMPLEMENT_INTERFACE (GDM_DBUS_TYPE_WORKER,
+ worker_interface_init))
+
++#ifdef WITH_CONSOLE_KIT
++static gboolean
++open_ck_session (GdmSessionWorker *worker)
++{
++ GDBusConnection *system_bus;
++ GVariantBuilder builder;
++ GVariant *parameters;
++ GVariant *in_args;
++ struct passwd *pwent;
++ GVariant *reply;
++ GError *error = NULL;
++ const char *display_name;
++ const char *display_device;
++ const char *display_hostname;
++ const char *session_type;
++ gint32 uid;
++
++ g_assert (worker->priv->session_cookie == NULL);
++
++ if (worker->priv->x11_display_name != NULL) {
++ display_name = worker->priv->x11_display_name;
++ } else {
++ display_name = "";
++ }
++ if (worker->priv->hostname != NULL) {
++ display_hostname = worker->priv->hostname;
++ } else {
++ display_hostname = "";
++ }
++ if (worker->priv->display_device != NULL) {
++ display_device = worker->priv->display_device;
++ } else {
++ display_device = "";
++ }
++
++ if (worker->priv->session_type != NULL) {
++ session_type = worker->priv->session_type;
++ } else {
++ session_type = "";
++ }
++
++ g_assert (worker->priv->username != NULL);
++
++ gdm_get_pwent_for_name (worker->priv->username, &pwent);
++ if (pwent == NULL) {
++ goto out;
++ }
++
++ uid = (gint32) pwent->pw_uid;
++
++ error = NULL;
++ system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++
++ if (system_bus == NULL) {
++ g_warning ("Couldn't create connection to system bus: %s",
++ error->message);
++
++ g_error_free (error);
++ goto out;
++ }
++
++ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(sv)"));
++ g_variant_builder_add_parsed (&builder, "('unix-user', <%i>)", uid);
++ g_variant_builder_add_parsed (&builder, "('x11-display-device', <%s>)", display_device);
++ g_variant_builder_add_parsed (&builder, "('x11-display', <%s>)", display_name);
++ g_variant_builder_add_parsed (&builder, "('remote-host-name', <%s>)", display_hostname);
++ g_variant_builder_add_parsed (&builder, "('is-local', <%b>)", worker->priv->display_is_local);
++ g_variant_builder_add_parsed (&builder, "('session-type', <%s>)", session_type);
++
++ parameters = g_variant_builder_end (&builder);
++ in_args = g_variant_new_tuple (&parameters, 1);
++
++ reply = g_dbus_connection_call_sync (system_bus,
++ "org.freedesktop.ConsoleKit",
++ "/org/freedesktop/ConsoleKit/Manager",
++ "org.freedesktop.ConsoleKit.Manager",
++ "OpenSessionWithParameters",
++ in_args,
++ G_VARIANT_TYPE ("(s)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++
++ if (! reply) {
++ g_warning ("%s\n", error->message);
++ g_clear_error (&error);
++ goto out;
++ }
++
++ g_variant_get (reply, "(s)", &worker->priv->session_cookie);
++
++ g_variant_unref (reply);
++
++out:
++ return worker->priv->session_cookie != NULL;
++}
++
++static void
++close_ck_session (GdmSessionWorker *worker)
++{
++ GDBusConnection *system_bus;
++ GVariant *reply;
++ GError *error = NULL;
++ gboolean was_closed;
++
++ if (worker->priv->session_cookie == NULL) {
++ return;
++ }
++
++ error = NULL;
++ system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++
++ if (system_bus == NULL) {
++ g_warning ("Couldn't create connection to system bus: %s",
++ error->message);
++
++ g_error_free (error);
++ goto out;
++ }
++
++ reply = g_dbus_connection_call_sync (system_bus,
++ "org.freedesktop.ConsoleKit",
++ "/org/freedesktop/ConsoleKit/Manager",
++ "org.freedesktop.ConsoleKit.Manager",
++ "CloseSession",
++ g_variant_new ("(s)", worker->priv->session_cookie),
++ G_VARIANT_TYPE ("(b)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++
++ if (! reply) {
++ g_warning ("%s", error->message);
++ g_clear_error (&error);
++ goto out;
++ }
++
++ g_variant_get (reply, "(b)", &was_closed);
++
++ if (!was_closed) {
++ g_warning ("Unable to close ConsoleKit session");
++ }
++
++ g_variant_unref (reply);
++
++out:
++ g_clear_pointer (&worker->priv->session_cookie,
++ (GDestroyNotify) g_free);
++}
++
++static char *
++get_ck_session_id (GdmSessionWorker *worker)
++{
++ GDBusConnection *system_bus;
++ GVariant *reply;
++ GError *error = NULL;
++ char *session_id = NULL;
++
++ error = NULL;
++ system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++
++ if (system_bus == NULL) {
++ g_warning ("Couldn't create connection to system bus: %s",
++ error->message);
++
++ g_error_free (error);
++ goto out;
++ }
++
++ reply = g_dbus_connection_call_sync (system_bus,
++ "org.freedesktop.ConsoleKit",
++ "/org/freedesktop/ConsoleKit/Manager",
++ "org.freedesktop.ConsoleKit.Manager",
++ "GetSessionForCookie",
++ g_variant_new ("(s)", worker->priv->session_cookie),
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++
++ if (reply == NULL) {
++ g_warning ("%s", error->message);
++ g_clear_error (&error);
++ goto out;
++ }
++
++ g_variant_get (reply, "(o)", &session_id);
++
++ g_variant_unref (reply);
++
++out:
++ return session_id;
++}
++#endif
++
+ /* adapted from glib script_execute */
+ static void
+ script_execute (const gchar *file,
+@@ -674,7 +881,9 @@ gdm_session_worker_process_pam_message (GdmSessionWork
+ char *user_answer;
+ gboolean res;
+ char *utf8_msg;
++#ifdef PAM_RADIO_TYPE
+ char *msg;
++#endif
+
+ if (response != NULL) {
+ *response = NULL;
+@@ -878,6 +1087,7 @@ gdm_session_worker_stop_auditor (GdmSessionWorker *wor
+ worker->priv->auditor = NULL;
+ }
+
++#ifdef WITH_SYSTEMD
+ static void
+ on_release_display (int signal)
+ {
+@@ -1003,6 +1213,7 @@ jump_to_vt (GdmSessionWorker *worker,
+
+ close (active_vt_tty_fd);
+ }
++#endif
+
+ static void
+ gdm_session_worker_uninitialize_pam (GdmSessionWorker *worker,
+@@ -1033,11 +1244,13 @@ gdm_session_worker_uninitialize_pam (GdmSessionWorker
+
+ gdm_session_worker_stop_auditor (worker);
+
++#ifdef WITH_SYSTEMD
+ if (g_strcmp0 (worker->priv->display_seat_id, "seat0") == 0) {
+ if (worker->priv->login_vt != worker->priv->session_vt) {
+ jump_to_vt (worker, worker->priv->login_vt);
+ }
+ }
++#endif
+
+ worker->priv->login_vt = 0;
+ worker->priv->session_vt = 0;
+@@ -1088,6 +1301,7 @@ _get_xauth_for_pam (const char *x11_authority_file)
+ }
+ #endif
+
++#ifdef WITH_SYSTEMD
+ static gboolean
+ ensure_login_vt (GdmSessionWorker *worker)
+ {
+@@ -1099,7 +1313,7 @@ ensure_login_vt (GdmSessionWorker *worker)
+
+ if (fd < 0) {
+ g_debug ("GdmSessionWorker: couldn't open VT master: %m");
+- return FALSE;
++ return FALSE;
+ }
+
+ if (ioctl (fd, VT_GETSTATE, &vt_state) < 0) {
+@@ -1113,6 +1327,7 @@ out:
+ close (fd);
+ return got_login_vt;
+ }
++#endif
+
+ static gboolean
+ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
+@@ -1129,7 +1344,6 @@ gdm_session_worker_initialize_pam (GdmSessionWorker
+ {
+ struct pam_conv pam_conversation;
+ int error_code;
+- char tty_string[256];
+
+ g_assert (worker->priv->pam_handle == NULL);
+
+@@ -1196,10 +1410,12 @@ gdm_session_worker_initialize_pam (GdmSessionWorker
+ }
+ }
+
++#ifdef WITH_SYSTEMD
+ /* set seat ID */
+- if (seat_id != NULL && seat_id[0] != '\0') {
++ if (seat_id != NULL && seat_id[0] != '\0' && LOGIND_RUNNING()) {
+ gdm_session_worker_set_environment_variable (worker, "XDG_SEAT", seat_id);
+ }
++#endif
+
+ if (strcmp (service, "gdm-launch-environment") == 0) {
+ gdm_session_worker_set_environment_variable (worker, "XDG_SESSION_CLASS", "greeter");
+@@ -1208,6 +1424,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker
+ g_debug ("GdmSessionWorker: state SETUP_COMPLETE");
+ worker->priv->state = GDM_SESSION_WORKER_STATE_SETUP_COMPLETE;
+
++#ifdef WITH_SYSTEMD
+ /* Temporarily set PAM_TTY with the currently active VT (login screen)
+ PAM_TTY will be reset with the users VT right before the user session is opened */
+ ensure_login_vt (worker);
+@@ -1215,6 +1432,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker
+ pam_set_item (worker->priv->pam_handle, PAM_TTY, tty_string);
+ if (!display_is_local)
+ worker->priv->password_is_required = TRUE;
++#endif
+
+ out:
+ if (error_code != PAM_SUCCESS) {
+@@ -1509,7 +1727,7 @@ _lookup_passwd_info (const char *username,
+ if (passwd_entry->pw_shell != NULL && passwd_entry->pw_shell[0] != '\0') {
+ *shellp = g_strdup (passwd_entry->pw_shell);
+ } else {
+- *shellp = g_strdup ("/bin/bash");
++ *shellp = g_strdup ("/bin/sh");
+ }
+ }
+ ret = TRUE;
+@@ -1762,6 +1980,26 @@ gdm_session_worker_get_environment (GdmSessionWorker *
+ return (const char * const *) pam_getenvlist (worker->priv->pam_handle);
+ }
+
++#ifdef WITH_CONSOLE_KIT
++static void
++register_ck_session (GdmSessionWorker *worker)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return;
++ }
++#endif
++
++ open_ck_session (worker);
++
++ if (worker->priv->session_cookie != NULL) {
++ gdm_session_worker_set_environment_variable (worker,
++ "XDG_SESSION_COOKIE",
++ worker->priv->session_cookie);
++ }
++}
++#endif
++
+ static gboolean
+ run_script (GdmSessionWorker *worker,
+ const char *dir)
+@@ -1792,6 +2030,9 @@ session_worker_child_watch (GPid pid,
+ : WIFSIGNALED (status) ? WTERMSIG (status)
+ : -1);
+
++#ifdef WITH_CONSOLE_KIT
++ close_ck_session (worker);
++#endif
+
+ gdm_session_worker_uninitialize_pam (worker, PAM_SUCCESS);
+
+@@ -1982,6 +2223,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
+
+ error_code = PAM_SUCCESS;
+
++#ifdef WITH_SYSTEMD
+ /* If we're in new vt mode, jump to the new vt now. There's no need to jump for
+ * the other two modes: in the logind case, the session will activate itself when
+ * ready, and in the reuse server case, we're already on the correct VT. */
+@@ -1990,6 +2232,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
+ jump_to_vt (worker, worker->priv->session_vt);
+ }
+ }
++#endif
+
+ if (!worker->priv->is_program_session && !run_script (worker, GDMCONFDIR "/PostLogin")) {
+ g_set_error (error,
+@@ -2054,6 +2297,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
+ _exit (EXIT_FAILURE);
+ }
+
++#ifdef WITH_SYSTEMD
+ /* Take control of the tty
+ */
+ if (needs_controlling_terminal) {
+@@ -2061,6 +2305,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
+ g_debug ("GdmSessionWorker: could not take control of tty: %m");
+ }
+ }
++#endif
+
+ #ifdef HAVE_LOGINCAP
+ if (setusercontext (NULL, passwd_entry, passwd_entry->pw_uid, LOGIN_SETALL) < 0) {
+@@ -2205,11 +2450,13 @@ gdm_session_worker_start_session (GdmSessionWorker *w
+ return TRUE;
+ }
+
++#ifdef WITH_SYSTEMD
+ static gboolean
+ set_up_for_new_vt (GdmSessionWorker *worker)
+ {
+ int fd;
+ char vt_string[256], tty_string[256];
++ struct vt_stat vt_state = { 0 };
+ int session_vt = 0;
+
+ fd = open ("/dev/tty0", O_RDWR | O_NOCTTY);
+@@ -2219,6 +2466,11 @@ set_up_for_new_vt (GdmSessionWorker *worker)
+ return FALSE;
+ }
+
++ if (ioctl (fd, VT_GETSTATE, &vt_state) < 0) {
++ g_debug ("GdmSessionWorker: couldn't get current VT: %m");
++ goto fail;
++ }
++
+ if (worker->priv->display_is_initial) {
+ session_vt = atoi (GDM_INITIAL_VT);
+ } else {
+@@ -2228,6 +2480,7 @@ set_up_for_new_vt (GdmSessionWorker *worker)
+ }
+ }
+
++ worker->priv->login_vt = vt_state.v_active;
+ worker->priv->session_vt = session_vt;
+
+ close (fd);
+@@ -2290,6 +2543,7 @@ fail:
+ close (fd);
+ return FALSE;
+ }
++#endif
+
+ static gboolean
+ set_up_for_current_vt (GdmSessionWorker *worker,
+@@ -2357,12 +2611,14 @@ set_up_for_current_vt (GdmSessionWorker *worker,
+ }
+ #endif
+
++#ifdef WITH_SYSTEMD
+ if (g_strcmp0 (worker->priv->display_seat_id, "seat0") == 0) {
+ g_debug ("GdmSessionWorker: setting XDG_VTNR to current vt");
+ set_xdg_vtnr_to_current_vt (worker);
+ } else {
+ g_debug ("GdmSessionWorker: not setting XDG_VTNR since not seat0");
+ }
++#endif
+
+ return TRUE;
+ out:
+@@ -2386,6 +2642,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
+ return FALSE;
+ }
+ break;
++#ifdef WITH_SYSTEMD
+ case GDM_SESSION_DISPLAY_MODE_NEW_VT:
+ case GDM_SESSION_DISPLAY_MODE_LOGIND_MANAGED:
+ if (!set_up_for_new_vt (worker)) {
+@@ -2396,6 +2653,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
+ return FALSE;
+ }
+ break;
++#endif
+ }
+
+ flags = 0;
+@@ -2417,8 +2675,18 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
+ g_debug ("GdmSessionWorker: state SESSION_OPENED");
+ worker->priv->state = GDM_SESSION_WORKER_STATE_SESSION_OPENED;
+
++#ifdef WITH_SYSTEMD
+ session_id = gdm_session_worker_get_environment_variable (worker, "XDG_SESSION_ID");
++#endif
+
++#ifdef WITH_CONSOLE_KIT
++ register_ck_session (worker);
++
++ if (session_id == NULL) {
++ session_id = get_ck_session_id (worker);
++ }
++#endif
++
+ if (session_id != NULL) {
+ g_free (worker->priv->session_id);
+ worker->priv->session_id = session_id;
+@@ -2523,6 +2791,19 @@ gdm_session_worker_handle_set_session_name (GdmDBusWor
+ }
+
+ static gboolean
++gdm_session_worker_handle_set_session_type (GdmDBusWorker *object,
++ GDBusMethodInvocation *invocation,
++ const char *session_type)
++{
++ GdmSessionWorker *worker = GDM_SESSION_WORKER (object);
++ g_debug ("GdmSessionWorker: session type set to %s", session_type);
++ g_free (worker->priv->session_type);
++ worker->priv->session_type = g_strdup (session_type);
++ gdm_dbus_worker_complete_set_session_type (object, invocation);
++ return TRUE;
++}
++
++static gboolean
+ gdm_session_worker_handle_set_session_display_mode (GdmDBusWorker *object,
+ GDBusMethodInvocation *invocation,
+ const char *str)
+@@ -2949,6 +3230,7 @@ gdm_session_worker_handle_open (GdmDBusWorker
+ return TRUE;
+ }
+
++#ifdef SUPPORTS_PAM_EXTENSIONS
+ static char **
+ filter_extensions (const char * const *extensions)
+ {
+@@ -2974,6 +3256,7 @@ filter_extensions (const char * const *extensions)
+
+ return filtered_extensions;
+ }
++#endif
+
+ static gboolean
+ gdm_session_worker_handle_initialize (GdmDBusWorker *object,
+@@ -2993,8 +3276,10 @@ gdm_session_worker_handle_initialize (GdmDBusWorker
+ while (g_variant_iter_loop (&iter, "{sv}", &key, &value)) {
+ if (g_strcmp0 (key, "service") == 0) {
+ worker->priv->service = g_variant_dup_string (value, NULL);
++#ifdef SUPPORTS_PAM_EXTENSIONS
+ } else if (g_strcmp0 (key, "extensions") == 0) {
+ worker->priv->extensions = filter_extensions (g_variant_get_strv (value, NULL));
++#endif
+ } else if (g_strcmp0 (key, "username") == 0) {
+ worker->priv->username = g_variant_dup_string (value, NULL);
+ } else if (g_strcmp0 (key, "is-program-session") == 0) {
+@@ -3434,6 +3719,7 @@ worker_interface_init (GdmDBusWorkerIface *interface)
+ interface->handle_open = gdm_session_worker_handle_open;
+ interface->handle_set_language_name = gdm_session_worker_handle_set_language_name;
+ interface->handle_set_session_name = gdm_session_worker_handle_set_session_name;
++ interface->handle_set_session_type = gdm_session_worker_handle_set_session_type;
+ interface->handle_set_session_display_mode = gdm_session_worker_handle_set_session_display_mode;
+ interface->handle_set_environment_variable = gdm_session_worker_handle_set_environment_variable;
+ interface->handle_start_program = gdm_session_worker_handle_start_program;
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.xml b/x11/gdm/files/patch-daemon_gdm-session-worker.xml
new file mode 100644
index 000000000000..185ce246bc24
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker.xml
@@ -0,0 +1,12 @@
+--- daemon/gdm-session-worker.xml.orig 2015-07-20 13:13:42 UTC
++++ daemon/gdm-session-worker.xml
+@@ -13,6 +13,9 @@
+ <method name="SetSessionName">
+ <arg name="session_name" direction="in" type="s" />
+ </method>
++ <method name="SetSessionType">
++ <arg name="session_type" direction="in" type="s"/>
++ </method>
+ <method name="SetSessionDisplayMode">
+ <arg name="mode" direction="in" type="s"/>
+ </method>
diff --git a/x11/gdm/files/patch-daemon_gdm-session.c b/x11/gdm/files/patch-daemon_gdm-session.c
new file mode 100644
index 000000000000..a7c1f80f44be
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-session.c
@@ -0,0 +1,56 @@
+$OpenBSD: patch-daemon_gdm-session_c,v 1.12 2017/05/10 10:18:15 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From a9cacb929470eb82582396984c61d5b611bfeb1a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 14:33:40 -0400
+Subject: session: drop session-type property
+
+Index: daemon/gdm-session.c
+--- daemon/gdm-session.c.orig
++++ daemon/gdm-session.c
+@@ -3076,6 +3076,10 @@ gdm_session_bypasses_xsession (GdmSession *self)
+ g_return_val_if_fail (self != NULL, FALSE);
+ g_return_val_if_fail (GDM_IS_SESSION (self), FALSE);
+
++ if (!LOGIND_RUNNING()) {
++ return GDM_SESSION_DISPLAY_MODE_REUSE_VT;
++ }
++
+ #ifdef ENABLE_WAYLAND_SUPPORT
+ if (gdm_session_is_wayland_session (self)) {
+ bypasses_xsession = TRUE;
+@@ -3168,6 +3172,27 @@ gdm_session_select_program (GdmSession *self,
+ g_free (self->priv->selected_program);
+
+ self->priv->selected_program = g_strdup (text);
++}
++
++void
++gdm_session_select_session_type (GdmSession *self,
++ const char *text)
++{
++ GHashTableIter iter;
++ gpointer key, value;
++
++ g_debug ("GdmSession: selecting session type '%s'", text);
++
++ g_hash_table_iter_init (&iter, self->priv->conversations);
++ while (g_hash_table_iter_next (&iter, &key, &value)) {
++ GdmSessionConversation *conversation;
++
++ conversation = (GdmSessionConversation *) value;
++
++ gdm_dbus_worker_call_set_session_type (conversation->worker_proxy,
++ text,
++ NULL, NULL, NULL);
++ }
+ }
+
+ void
diff --git a/x11/gdm/files/patch-daemon_gdm-session.h b/x11/gdm/files/patch-daemon_gdm-session.h
new file mode 100644
index 000000000000..dc8dd0dbf735
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-session.h
@@ -0,0 +1,19 @@
+$OpenBSD: patch-daemon_gdm-session_h,v 1.4 2016/04/26 08:25:04 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From a9cacb929470eb82582396984c61d5b611bfeb1a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 12 Jun 2015 14:33:40 -0400
+Subject: session: drop session-type property
+
+--- daemon/gdm-session.h.orig Tue Apr 19 07:00:04 2016
++++ daemon/gdm-session.h Tue Apr 26 10:02:48 2016
+@@ -180,6 +180,8 @@ void gdm_session_answer_query
+ const char *text);
+ void gdm_session_select_program (GdmSession *session,
+ const char *command_line);
++void gdm_session_select_session_type (GdmSession *session,
++ const char *session_type);
+ void gdm_session_select_session (GdmSession *session,
+ const char *session_name);
+ void gdm_session_select_user (GdmSession *session,
diff --git a/x11/gdm/files/patch-data_Init.in b/x11/gdm/files/patch-data_Init.in
new file mode 100644
index 000000000000..b89e85ebedf8
--- /dev/null
+++ b/x11/gdm/files/patch-data_Init.in
@@ -0,0 +1,13 @@
+$OpenBSD: patch-data_Init_in,v 1.7 2015/04/15 14:47:00 ajacoutot Exp $
+--- data/Init.in.orig Thu Apr 2 15:52:42 2015
++++ data/Init.in Wed Apr 15 16:43:30 2015
+@@ -6,6 +6,9 @@
+ PATH="@X_PATH@:$PATH"
+ OLD_IFS=$IFS
+
++# enhance fade in look
++xsetroot -solid black
++
+ gdmwhich () {
+ COMMAND="$1"
+ OUTPUT=
diff --git a/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop b/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
index 8a72f4aa949e..8ed03d6e8f6c 100644
--- a/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
+++ b/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
@@ -1,5 +1,5 @@
---- data/applications/mime-dummy-handler.desktop.orig 2015-06-18 15:47:40.000000000 +0200
-+++ data/applications/mime-dummy-handler.desktop 2015-07-03 09:30:57.146642000 +0200
+--- data/applications/mime-dummy-handler.desktop.orig 2015-05-29 13:27:05.000000000 +0200
++++ data/applications/mime-dummy-handler.desktop 2015-06-04 07:47:55.014724000 +0200
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
diff --git a/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings b/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
index 7ca2158505d8..7e421494d96d 100644
--- a/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
+++ b/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
@@ -1,5 +1,5 @@
---- data/dconf/defaults/00-upstream-settings.orig 2015-06-18 15:47:40.000000000 +0200
-+++ data/dconf/defaults/00-upstream-settings 2015-07-03 09:32:09.925298000 +0200
+--- data/dconf/defaults/00-upstream-settings.orig 2015-05-29 13:27:05.000000000 +0200
++++ data/dconf/defaults/00-upstream-settings 2015-06-04 07:49:07.773567000 +0200
@@ -13,7 +13,7 @@
show-desktop-icons=false
diff --git a/x11/gdm/files/patch-data_pam-redhat_gdm-autologin.pam b/x11/gdm/files/patch-data_pam-redhat_gdm-autologin.pam
new file mode 100644
index 000000000000..e7653c42b323
--- /dev/null
+++ b/x11/gdm/files/patch-data_pam-redhat_gdm-autologin.pam
@@ -0,0 +1,10 @@
+--- data/pam-redhat/gdm-autologin.pam.orig 2015-07-20 13:13:44 UTC
++++ data/pam-redhat/gdm-autologin.pam
+@@ -8,6 +8,7 @@ password include system-auth
+ session required pam_selinux.so close
+ session required pam_loginuid.so
+ session optional pam_console.so
++-session optional pam_ck_connector.so
+ session required pam_selinux.so open
+ session optional pam_keyinit.so force revoke
+ session required pam_namespace.so
diff --git a/x11/gdm/files/patch-data_pam-redhat_gdm-fingerprint.pam b/x11/gdm/files/patch-data_pam-redhat_gdm-fingerprint.pam
new file mode 100644
index 000000000000..9ce2f7729d58
--- /dev/null
+++ b/x11/gdm/files/patch-data_pam-redhat_gdm-fingerprint.pam
@@ -0,0 +1,10 @@
+--- data/pam-redhat/gdm-fingerprint.pam.orig 2015-07-20 13:13:44 UTC
++++ data/pam-redhat/gdm-fingerprint.pam
+@@ -9,6 +9,7 @@ password include fingerprint-au
+ session required pam_selinux.so close
+ session required pam_loginuid.so
+ session optional pam_console.so
++-session optional pam_ck_connector.so
+ session required pam_selinux.so open
+ session optional pam_keyinit.so force revoke
+ session required pam_namespace.so
diff --git a/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam b/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
new file mode 100644
index 000000000000..de3e5c3c78b3
--- /dev/null
+++ b/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
@@ -0,0 +1,10 @@
+--- data/pam-redhat/gdm-password.pam.orig 2015-07-20 13:13:44 UTC
++++ data/pam-redhat/gdm-password.pam
+@@ -12,6 +12,7 @@ password substack password-auth
+ session required pam_selinux.so close
+ session required pam_loginuid.so
+ session optional pam_console.so
++-session optional pam_ck_connector.so
+ session required pam_selinux.so open
+ session optional pam_keyinit.so force revoke
+ session required pam_namespace.so
diff --git a/x11/gdm/files/patch-data_pam-redhat_gdm-pin.pam b/x11/gdm/files/patch-data_pam-redhat_gdm-pin.pam
new file mode 100644
index 000000000000..14dff49185ee
--- /dev/null
+++ b/x11/gdm/files/patch-data_pam-redhat_gdm-pin.pam
@@ -0,0 +1,10 @@
+--- data/pam-redhat/gdm-pin.pam.orig 2015-07-20 13:13:44 UTC
++++ data/pam-redhat/gdm-pin.pam
+@@ -13,6 +13,7 @@ password optional pam_pin.so
+ session required pam_selinux.so close
+ session required pam_loginuid.so
+ session optional pam_console.so
++-session optional pam_ck_connector.so
+ session required pam_selinux.so open
+ session optional pam_keyinit.so force revoke
+ session required pam_namespace.so
diff --git a/x11/gdm/files/patch-data_pam-redhat_gdm-smartcard.pam b/x11/gdm/files/patch-data_pam-redhat_gdm-smartcard.pam
new file mode 100644
index 000000000000..e7acf1de5372
--- /dev/null
+++ b/x11/gdm/files/patch-data_pam-redhat_gdm-smartcard.pam
@@ -0,0 +1,10 @@
+--- data/pam-redhat/gdm-smartcard.pam.orig 2015-07-20 13:13:44 UTC
++++ data/pam-redhat/gdm-smartcard.pam
+@@ -9,6 +9,7 @@ password include smartcard-auth
+ session required pam_selinux.so close
+ session required pam_loginuid.so
+ session optional pam_console.so
++-session optional pam_ck_connector.so
+ session required pam_selinux.so open
+ session optional pam_keyinit.so force revoke
+ session required pam_namespace.so
diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
deleted file mode 100644
index b7ed323184f3..000000000000
--- a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2010-01-13 14:29:00.000000000 +0000
-+++ gui/simple-chooser/gdm-host-chooser-widget.c 2010-01-17 13:04:14.000000000 +0000
-@@ -543,6 +543,8 @@ xdmcp_init (GdmHostChooserWidget *widget
- #ifdef ENABLE_IPV6
- widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0);
- if (widget->priv->socket_fd != -1) {
-+ int off = 0;
-+ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off));
- widget->priv->have_ipv6 = TRUE;
- }
- #endif
diff --git a/x11/gdm/files/patch-libgdm_gdm-user-switching.c b/x11/gdm/files/patch-libgdm_gdm-user-switching.c
new file mode 100644
index 000000000000..cedffff73382
--- /dev/null
+++ b/x11/gdm/files/patch-libgdm_gdm-user-switching.c
@@ -0,0 +1,412 @@
+--- libgdm/gdm-user-switching.c.orig 2015-07-20 13:13:45 UTC
++++ libgdm/gdm-user-switching.c
+@@ -31,12 +31,25 @@
+ #include <glib-object.h>
+ #include <gio/gio.h>
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-login.h>
++#endif
+
+ #include "common/gdm-common.h"
+ #include "gdm-user-switching.h"
+ #include "gdm-client.h"
+
++#ifdef WITH_CONSOLE_KIT
++#define CK_NAME "org.freedesktop.ConsoleKit"
++#define CK_PATH "/org/freedesktop/ConsoleKit"
++#define CK_INTERFACE "org.freedesktop.ConsoleKit"
++
++#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
++#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
++#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
++#endif
++
+ static gboolean
+ create_transient_display (GDBusConnection *connection,
+ GCancellable *cancellable,
+@@ -67,12 +80,304 @@ create_transient_display (GDBusConnectio
+ return TRUE;
+ }
+
++#ifdef WITH_CONSOLE_KIT
++
+ static gboolean
+-activate_session_id (GDBusConnection *connection,
+- GCancellable *cancellable,
+- const char *seat_id,
+- const char *session_id,
+- GError **error)
++get_current_session_id (GDBusConnection *connection,
++ char **session_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ CK_MANAGER_PATH,
++ CK_MANAGER_INTERFACE,
++ "GetCurrentSession",
++ NULL, /* parameters */
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine session: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(o)", session_id);
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static gboolean
++get_seat_id_for_session (GDBusConnection *connection,
++ const char *session_id,
++ char **seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ session_id,
++ CK_SESSION_INTERFACE,
++ "GetSeatId",
++ NULL, /* parameters */
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine seat: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(o)", seat_id);
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static char *
++get_current_seat_id (GDBusConnection *connection)
++{
++ gboolean res;
++ char *session_id;
++ char *seat_id;
++
++ session_id = NULL;
++ seat_id = NULL;
++
++ res = get_current_session_id (connection, &session_id);
++ if (res) {
++ res = get_seat_id_for_session (connection, session_id, &seat_id);
++ }
++ g_free (session_id);
++
++ return seat_id;
++}
++
++static gboolean
++activate_session_id_for_ck (GDBusConnection *connection,
++ GCancellable *cancellable,
++ const char *seat_id,
++ const char *session_id,
++ GError **error)
++{
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "ActivateSession",
++ g_variant_new ("(o)", session_id),
++ NULL,
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, error);
++ if (reply == NULL) {
++ g_prefix_error (error, _("Unable to activate session: "));
++ return FALSE;
++ }
++
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static gboolean
++session_is_login_window (GDBusConnection *connection,
++ const char *session_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ const char *value;
++ gboolean ret;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ session_id,
++ CK_SESSION_INTERFACE,
++ "GetSessionType",
++ NULL,
++ G_VARIANT_TYPE ("(s)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine session type: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(&s)", &value);
++
++ if (value == NULL || value[0] == '\0' || strcmp (value, "LoginWindow") != 0) {
++ ret = FALSE;
++ } else {
++ ret = TRUE;
++ }
++
++ g_variant_unref (reply);
++
++ return ret;
++}
++
++static gboolean
++seat_can_activate_sessions (GDBusConnection *connection,
++ const char *seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ gboolean ret;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "CanActivateSessions",
++ NULL,
++ G_VARIANT_TYPE ("(b)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine if can activate sessions: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(b)", &ret);
++ g_variant_unref (reply);
++
++ return ret;
++}
++
++static const char **
++seat_get_sessions (GDBusConnection *connection,
++ const char *seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ const char **value;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "GetSessions",
++ NULL,
++ G_VARIANT_TYPE ("(ao)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to list sessions: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(^ao)", &value);
++ g_variant_unref (reply);
++
++ return value;
++}
++
++static gboolean
++get_login_window_session_id_for_ck (GDBusConnection *connection,
++ const char *seat_id,
++ char **session_id)
++{
++ gboolean can_activate_sessions;
++ const char **sessions;
++ int i;
++
++ *session_id = NULL;
++ sessions = NULL;
++
++ g_debug ("checking if seat can activate sessions");
++
++ can_activate_sessions = seat_can_activate_sessions (connection, seat_id);
++ if (! can_activate_sessions) {
++ g_debug ("seat is unable to activate sessions");
++ return FALSE;
++ }
++
++ sessions = seat_get_sessions (connection, seat_id);
++ for (i = 0; sessions [i] != NULL; i++) {
++ const char *ssid;
++
++ ssid = sessions [i];
++
++ if (session_is_login_window (connection, ssid)) {
++ *session_id = g_strdup (ssid);
++ break;
++ }
++ }
++ g_free (sessions);
++
++ return TRUE;
++}
++
++static gboolean
++goto_login_session_for_ck (GDBusConnection *connection,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret;
++ gboolean res;
++ char *session_id;
++ char *seat_id;
++
++ ret = FALSE;
++
++ /* First look for any existing LoginWindow sessions on the seat.
++ If none are found, create a new one. */
++
++ seat_id = get_current_seat_id (connection);
++ if (seat_id == NULL || seat_id[0] == '\0') {
++ g_debug ("seat id is not set; can't switch sessions");
++ g_set_error (error, GDM_CLIENT_ERROR, 0, _("Could not identify the current session."));
++
++ return FALSE;
++ }
++
++ res = get_login_window_session_id_for_ck (connection, seat_id, &session_id);
++ if (! res) {
++ g_set_error (error, GDM_CLIENT_ERROR, 0, _("User unable to switch sessions."));
++ return FALSE;
++ }
++
++ if (session_id != NULL) {
++ res = activate_session_id_for_ck (connection, cancellable, seat_id, session_id, error);
++ if (res) {
++ ret = TRUE;
++ }
++ }
++
++ if (! ret && g_strcmp0 (seat_id, "/org/freedesktop/ConsoleKit/Seat1") == 0) {
++ res = create_transient_display (connection, cancellable, error);
++ if (res) {
++ ret = TRUE;
++ }
++ }
++
++ return ret;
++}
++#endif
++
++#ifdef WITH_SYSTEMD
++
++static gboolean
++activate_session_id_for_systemd (GDBusConnection *connection,
++ GCancellable *cancellable,
++ const char *seat_id,
++ const char *session_id,
++ GError **error)
+ {
+ GVariant *reply;
+
+@@ -97,8 +402,8 @@ activate_session_id (GDBusConnection *c
+ }
+
+ static gboolean
+-get_login_window_session_id (const char *seat_id,
+- char **session_id)
++get_login_window_session_id_for_systemd (const char *seat_id,
++ char **session_id)
+ {
+ gboolean ret;
+ int res, i;
+@@ -182,9 +487,9 @@ out:
+ }
+
+ static gboolean
+-goto_login_session (GDBusConnection *connection,
+- GCancellable *cancellable,
+- GError **error)
++goto_login_session_for_systemd (GDBusConnection *connection,
++ GCancellable *cancellable,
++ GError **error)
+ {
+ gboolean ret;
+ int res;
+@@ -238,9 +543,9 @@ goto_login_session (GDBusConnection *co
+ return FALSE;
+ }
+
+- res = get_login_window_session_id (seat_id, &session_id);
++ res = get_login_window_session_id_for_systemd (seat_id, &session_id);
+ if (res && session_id != NULL) {
+- res = activate_session_id (connection, cancellable, seat_id, session_id, error);
++ res = activate_session_id_for_systemd (connection, cancellable, seat_id, session_id, error);
+
+ if (res) {
+ ret = TRUE;
+@@ -259,10 +564,11 @@ goto_login_session (GDBusConnection *co
+
+ return ret;
+ }
++#endif
+
+ gboolean
+ gdm_goto_login_session_sync (GCancellable *cancellable,
+- GError **error)
++ GError **error)
+ {
+ GDBusConnection *connection;
+ gboolean retval;
+@@ -271,8 +577,23 @@ gdm_goto_login_session_sync (GCancellabl
+ if (!connection)
+ return FALSE;
+
+- retval = goto_login_session (connection, cancellable, error);
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ retval = goto_login_session_for_systemd (connection,
++ cancellable,
++ error);
++
++ g_object_unref (connection);
++ return retval;
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ retval = goto_login_session_for_ck (connection, cancellable, error);
+
+ g_object_unref (connection);
+ return retval;
++#else
++ return FALSE;
++#endif
+ }
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 4c85d41bf4a1..6c694fc15cf1 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -7,8 +7,8 @@ etc/dbus-1/system.d/gdm.conf
@sample %%ETCDIR%%/PreSession/Default.sample
%%ETCDIR%%/Xsession
@sample %%ETCDIR%%/custom.conf.sample
-%%ETCDIR%%/home/.pulse/client.conf
-%%ETCDIR%%/locale.conf
+@sample %%ETCDIR%%/home/.pulse/client.conf.sample
+@sample %%ETCDIR%%/locale.conf.sample
etc/pam.d/gdm-autologin
etc/pam.d/gdm-launch-environment
etc/pam.d/gdm-password
@@ -31,13 +31,12 @@ share/dconf/profile/gdm
%%DATADIR%%/gdb-cmd
%%DATADIR%%/gdm.schemas
%%DATADIR%%/greeter-dconf-defaults
-%%DATADIR%%/greeter/applications/gnome-shell-wayland.desktop
-%%DATADIR%%/greeter/applications/gnome-shell.desktop
%%DATADIR%%/greeter/applications/mime-dummy-handler.desktop
%%DATADIR%%/greeter/applications/mimeapps.list
%%DATADIR%%/greeter/autostart/orca-autostart.desktop
%%DATADIR%%/locale.alias
share/gir-1.0/Gdm-1.0.gir
+share/gnome-session/sessions/gnome-login.session
share/help/C/gdm/index.docbook
share/help/C/gdm/legal.xml
share/help/ca/gdm/index.docbook
@@ -68,6 +67,8 @@ share/help/oc/gdm/index.docbook
share/help/oc/gdm/legal.xml
share/help/pt_BR/gdm/index.docbook
share/help/pt_BR/gdm/legal.xml
+share/help/ro/gdm/index.docbook
+share/help/ro/gdm/legal.xml
share/help/ru/gdm/index.docbook
share/help/ru/gdm/legal.xml
share/help/sl/gdm/index.docbook
@@ -76,6 +77,8 @@ share/help/sv/gdm/index.docbook
share/help/sv/gdm/legal.xml
share/help/te/gdm/index.docbook
share/help/te/gdm/legal.xml
+share/help/tr/gdm/index.docbook
+share/help/tr/gdm/legal.xml
share/help/uk/gdm/index.docbook
share/help/uk/gdm/legal.xml
share/help/zh_CN/gdm/index.docbook
@@ -134,6 +137,7 @@ share/locale/is/LC_MESSAGES/gdm.mo
share/locale/it/LC_MESSAGES/gdm.mo
share/locale/ja/LC_MESSAGES/gdm.mo
share/locale/ka/LC_MESSAGES/gdm.mo
+share/locale/kab/LC_MESSAGES/gdm.mo
share/locale/kk/LC_MESSAGES/gdm.mo
share/locale/km/LC_MESSAGES/gdm.mo
share/locale/kn/LC_MESSAGES/gdm.mo
@@ -195,13 +199,13 @@ share/pixmaps/gdm-xnest.png
share/pixmaps/gdm.png
share/pixmaps/nobody.png
share/pixmaps/nohost.png
-@exec mkdir -p %D/share/xsessions
-@exec dconf update
-@unexec dconf update
+@postexec mkdir -p %D/share/xsessions
+@postexec dconf update
+@postunexec dconf update
@mode 1775
@dir etc/gdm/home
@mode
-@unexec rm -rf %D/etc/gdm/home/.gconf*
+@postunexec rm -rf %D/etc/gdm/home/.gconf*
@dir %%ETCDIR%%/Sessions
@dir %%ETCDIR%%/home/.local/share/applications
@dir etc/dm
@@ -211,4 +215,4 @@ share/pixmaps/nohost.png
@dir /var/run/gdm/greeter
@dir /var/run/gdm/
@dir /var/log/gdm/
-@unexec rm -fr /var/gdm
+@postunexec rm -fr /var/gdm
diff --git a/x11/gnome-desktop-reference/Makefile b/x11/gnome-desktop-reference/Makefile
deleted file mode 100644
index eadb3d80b013..000000000000
--- a/x11/gnome-desktop-reference/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 2
-
-REFERENCE_SRC= ${WRKSRC}/docs/reference/gnome-desktop3
-
-.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11/gnome-desktop-reference/pkg-descr b/x11/gnome-desktop-reference/pkg-descr
deleted file mode 100644
index d5ada3acbb15..000000000000
--- a/x11/gnome-desktop-reference/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port contains the programming reference for x11/gnome-desktop.
-
-WWW: https://www.gnome.org/
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index f317b2e72289..3ed8017684e6 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-desktop
-PORTVERSION= 3.18.2
-PORTREVISION= 1
+PORTVERSION= 3.28.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -16,27 +15,25 @@ LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB
-USES= tar:xz
-
-.if !defined(REFERENCE_PORT)
PORTSCOUT= limitw:1,even
BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \
gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
xkeyboard-config>=0:x11/xkeyboard-config \
- libxkbfile>=0:x11/libxkbfile \
itstool:textproc/itstool
RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
- xkeyboard-config>=0:x11/xkeyboard-config \
- libxkbfile>=0:x11/libxkbfile
+ cantarell-fonts>=0:x11-fonts/cantarell-fonts \
+ xkeyboard-config>=0:x11/xkeyboard-config
-USES+= bison gettext gmake gnome libtool localbase pathfix pkgconfig python:3.4+
-USE_GNOME= gtk30 intlhack introspection:build referencehack
-USE_XORG= x11 xrandr xext
+USES= bison gettext gmake gnome libtool localbase pathfix \
+ pkgconfig python:3.4+ tar:xz
+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"
+CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \
+ --disable-udev
INSTALL_TARGET= install-strip
post-patch:
@@ -46,5 +43,3 @@ post-patch:
${WRKSRC}/desktop-docs/lgpl/Makefile.in
.include <bsd.port.mk>
-
-.endif
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index fb2cff555234..8f9da2dfff79 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-desktop-3.18.2.tar.xz) = ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56
-SIZE (gnome3/gnome-desktop-3.18.2.tar.xz) = 1091568
+TIMESTAMP = 1525954310
+SHA256 (gnome3/gnome-desktop-3.28.2.tar.xz) = 605087bff17c61bc167ccb5a61ed4d06eab922fcce384576ed2a3577214c8330
+SIZE (gnome3/gnome-desktop-3.28.2.tar.xz) = 1077556
diff --git a/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c b/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c
deleted file mode 100644
index 2892239bb633..000000000000
--- a/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnome-desktop/gnome-languages.c.orig 2016-01-08 00:52:40.415603000 +0100
-+++ libgnome-desktop/gnome-languages.c 2016-01-08 01:30:53.511431000 +0100
-@@ -229,7 +231,7 @@
- {
- char *name;
-
-- g_assert (language[0] != 0);
-+ g_assert (language == NULL || language[0] != 0);
- g_assert (territory == NULL || territory[0] != 0);
- g_assert (codeset == NULL || codeset[0] != 0);
- g_assert (modifier == NULL || modifier[0] != 0);
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 12df042647f3..6cbaf46d6015 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -11,8 +11,8 @@ 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.12
-lib/libgnome-desktop-3.so.12.0.0
+lib/libgnome-desktop-3.so.17
+lib/libgnome-desktop-3.so.17.0.0
libdata/pkgconfig/gnome-desktop-3.0.pc
libexec/gnome-rr-debug
share/gir-1.0/GnomeDesktop-3.0.gir
@@ -32,7 +32,6 @@ 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/index.sgml
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
@@ -87,7 +86,6 @@ share/help/oc/gpl/index.docbook
share/help/oc/lgpl/index.docbook
share/help/pa/gpl/index.docbook
share/help/pa/lgpl/index.docbook
-share/help/pl/fdl/index.docbook
share/help/pt_BR/fdl/index.docbook
share/help/pt_BR/gpl/index.docbook
share/help/pt_BR/lgpl/index.docbook
@@ -108,7 +106,6 @@ share/help/vi/lgpl/index.docbook
share/help/zh_CN/fdl/index.docbook
share/help/zh_CN/gpl/index.docbook
share/help/zh_CN/lgpl/index.docbook
-share/libgnome-desktop-3.0/pnp.ids
share/locale/af/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/am/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/an/LC_MESSAGES/gnome-desktop-3.0.mo
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 9e0c7d8d97ce..5d9952cca701 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-session
-PORTVERSION= 3.18.1.2
-PORTREVISION= 2
+PORTVERSION= 3.28.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -14,24 +13,23 @@ COMMENT= Session component for the GNOME 3 desktop
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libjson-glib-1.0.so:devel/json-glib \
- libupower-glib.so:sysutils/upower
+BUILD_DEPENDS= xmlto:textproc/xmlto
+LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
+ libepoxy.so:graphics/libepoxy
RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit2 \
- ${LOCALBASE}/bin/xdpyinfo:x11/xdpyinfo
+ dbus-daemon:devel/dbus
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome localbase:ldflags pathfix \
- pkgconfig tar:xz
-USE_GNOME= gnomedesktop3 gtk30 intlhack intlhack libxslt:build
-USE_XORG= ice sm xau xext xtst xrender xtrans xcomposite
-USE_GL= gl
+USES= gettext gnome localbase:ldflags meson pkgconfig python:3.6+,build tar:xz
+USE_GNOME= gnomedesktop3 gtk30
+USE_XORG= ice sm x11 xcomposite xtrans
+USE_GL= egl gl glesv2
INSTALLS_ICONS= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-docbook-docs \
- --enable-consolekit \
- --enable-gconf=no
+MESON_ARGS= -Dsystemd=false \
+ -Dsystemd_journal=false \
+ -Dconsolekit=true
+BINARY_ALIAS= python3=${PYTHON_VERSION}
GLIB_SCHEMAS= org.gnome.SessionManager.gschema.xml
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 480f61145a78..03ee0d36e289 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-session-3.18.1.2.tar.xz) = b37d823d57ff2e3057401a426279954699cfe1e44e59a4cbdd941687ff928a45
-SIZE (gnome3/gnome-session-3.18.1.2.tar.xz) = 758552
+TIMESTAMP = 1524855068
+SHA256 (gnome3/gnome-session-3.28.1.tar.xz) = b893f75c8d34dbdbbc5c56429a17b59136ac7402e12f384da856dcfc725cd592
+SIZE (gnome3/gnome-session-3.28.1.tar.xz) = 480196
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 67125a764943..e5b818f8e586 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -1,29 +1,22 @@
bin/gnome-session
+bin/gnome-session-custom-session
bin/gnome-session-inhibit
bin/gnome-session-quit
libexec/gnome-session-binary
libexec/gnome-session-check-accelerated
-libexec/gnome-session-check-accelerated-helper
+libexec/gnome-session-check-accelerated-gl-helper
+libexec/gnome-session-check-accelerated-gles-helper
libexec/gnome-session-failed
-man/man1/gnome-session.1.gz
man/man1/gnome-session-inhibit.1.gz
man/man1/gnome-session-quit.1.gz
+man/man1/gnome-session.1.gz
share/GConf/gsettings/gnome-session.convert
%%DATADIR%%/hardware-compatibility
%%DATADIR%%/sessions/gnome-dummy.session
-%%DATADIR%%/sessions/gnome-wayland.session
-%%DATADIR%%/session-properties.ui
%%DATADIR%%/sessions/gnome.session
-share/icons/hicolor/16x16/apps/session-properties.png
-share/icons/hicolor/22x22/apps/session-properties.png
-share/icons/hicolor/24x24/apps/session-properties.png
-share/icons/hicolor/32x32/apps/session-properties.png
-share/icons/hicolor/48x48/apps/session-properties.png
-share/icons/hicolor/scalable/apps/session-properties.svg
-share/icons/hicolor/symbolic/apps/session-properties-symbolic.svg
share/locale/af/LC_MESSAGES/gnome-session-3.0.mo
-share/locale/an/LC_MESSAGES/gnome-session-3.0.mo
share/locale/am/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/an/LC_MESSAGES/gnome-session-3.0.mo
share/locale/ar/LC_MESSAGES/gnome-session-3.0.mo
share/locale/as/LC_MESSAGES/gnome-session-3.0.mo
share/locale/ast/LC_MESSAGES/gnome-session-3.0.mo
@@ -129,5 +122,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-3.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-session-3.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-3.0.mo
share/locale/zu/LC_MESSAGES/gnome-session-3.0.mo
-share/wayland-sessions/gnome-wayland.desktop
+share/wayland-sessions/gnome.desktop
+share/xsessions/gnome-xorg.desktop
share/xsessions/gnome.desktop
diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile
index 2b8e60f6c7bb..ebca33a0df6c 100644
--- a/x11/gnome-shell-extensions/Makefile
+++ b/x11/gnome-shell-extensions/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-shell-extensions
-PORTVERSION= 3.18.4
+PORTVERSION= 3.28.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -10,16 +10,21 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME desktop shell extensions
-LIB_DEPENDS= libgtop-2.0.so:devel/libgtop
-RUN_DEPENDS= gnome-shell>=3.12.0:x11/gnome-shell
+LICENSE= GPLv2
+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
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome pathfix pkgconfig tar:xz
+NO_ARCH= yes
+USES= gettext gnome meson pkgconfig tar:xz
USE_GNOME= glib20 gnomedesktop3 intlhack
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-extensions=all
+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 \
diff --git a/x11/gnome-shell-extensions/distinfo b/x11/gnome-shell-extensions/distinfo
index 21ae0e652ee6..551336673f0c 100644
--- a/x11/gnome-shell-extensions/distinfo
+++ b/x11/gnome-shell-extensions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-shell-extensions-3.18.4.tar.xz) = 8ae470f894aad914a56d447e3b07dc99e2f36c30ef3ec386f6f03f619599b73a
-SIZE (gnome3/gnome-shell-extensions-3.18.4.tar.xz) = 234108
+TIMESTAMP = 1525374861
+SHA256 (gnome3/gnome-shell-extensions-3.28.1.tar.xz) = e9c602338b529c8282e7d13e075703028ea384a1d946f3e8ce760e6c5b469058
+SIZE (gnome3/gnome-shell-extensions-3.28.1.tar.xz) = 199180
diff --git a/x11/gnome-shell-extensions/pkg-descr b/x11/gnome-shell-extensions/pkg-descr
index 0d40cd5f2234..9103d25eadb6 100644
--- a/x11/gnome-shell-extensions/pkg-descr
+++ b/x11/gnome-shell-extensions/pkg-descr
@@ -1,4 +1,4 @@
-A set of basic extensions for gnome-shell.
+A set of basic extensions for gnome-shell.
More extensions are available on https://extensions.gnome.org/
In future release this will be more intergrated.
diff --git a/x11/gnome-shell-extensions/pkg-plist b/x11/gnome-shell-extensions/pkg-plist
index 88fa907a6039..057fe92c24f2 100644
--- a/x11/gnome-shell-extensions/pkg-plist
+++ b/x11/gnome-shell-extensions/pkg-plist
@@ -71,6 +71,7 @@ share/locale/af/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/an/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/ar/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/as/LC_MESSAGES/gnome-shell-extensions.mo
+share/locale/be/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/bg/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/bn_IN/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/bs/LC_MESSAGES/gnome-shell-extensions.mo
@@ -89,10 +90,12 @@ share/locale/fa/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/fi/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/fr/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/fur/LC_MESSAGES/gnome-shell-extensions.mo
+share/locale/gd/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/gl/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/gu/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/he/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/hi/LC_MESSAGES/gnome-shell-extensions.mo
+share/locale/hr/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/hu/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/id/LC_MESSAGES/gnome-shell-extensions.mo
share/locale/is/LC_MESSAGES/gnome-shell-extensions.mo
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 71c3838b49cd..2cf835e97563 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-shell
-PORTVERSION= 3.18.5
-PORTREVISION= 10
+PORTVERSION= 3.28.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -11,63 +10,63 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Next generation GNOME desktop shell
-LICENSE= GPLv2+
+LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
- nss>=0:security/nss \
+BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \
+ sassc:textproc/sassc \
gnome-control-center:sysutils/gnome-control-center
LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
- libcaribou.so:accessibility/caribou \
- libmutter.so:x11-wm/mutter \
+ libdrm.so:graphics/libdrm \
+ libmutter-2.so:x11-wm/mutter \
libatk-bridge-2.0.so:accessibility/at-spi2-atk \
- libnspr4.so:devel/nspr \
libsoup-2.4.so:devel/libsoup \
libjson-glib-1.0.so:devel/json-glib \
libsecret-1.so:security/libsecret \
- libgcr-3.so:security/gcr \
- libtelepathy-glib.so:net-im/telepathy-glib \
- libibus-1.0.so:textproc/ibus \
+ libpolkit-agent-1.so:sysutils/polkit \
+ libp11-kit.so:security/p11-kit \
libical.so:devel/libical \
- libmozjs-24.so:lang/spidermonkey24 \
+ libgcr-3.so:security/gcr \
libicuuc.so:devel/icu \
libpulse.so:audio/pulseaudio \
libcroco-0.6.so:textproc/libcroco \
- libdbus-glib-1.so:devel/dbus-glib \
libcanberra.so:audio/libcanberra \
libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libp11-kit.so:security/p11-kit \
- libpolkit-gobject-1.so:sysutils/polkit \
- libcogl.so:graphics/cogl \
- libclutter-1.0.so:graphics/clutter \
libgjs.so:lang/gjs
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
- nss>=0:security/nss \
- gnome-control-center:sysutils/gnome-control-center \
- ca_root_nss>=0:security/ca_root_nss \
- gkbd-keyboard-display:x11/libgnomekbd
+RUN_DEPENDS= gnome-control-center:sysutils/gnome-control-center
PORTSCOUT= limitw:1,even
-USES= compiler:c11 cpe gettext gmake gnome libtool localbase \
- pathfix pkgconfig python:3.4+ sqlite tar:xz webplugin:native
-USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 gtk30 intltool \
- introspection libxml2
-USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
-USE_GL= egl
+USES= compiler:c11 cpe gettext gl gnome libtool localbase meson \
+ pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz webplugin:native
+USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 introspection \
+ libxslt:build libxml2
+USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xtst
+USE_GL= egl gbm
USE_GSTREAMER1= yes
-GNU_CONFIGURE= yes
+USE_PERL5= build
USE_LDCONFIG= yes
+SHEBANG_FILES= src/gnome-shell-perf-tool.in \
+ src/gnome-shell-extension-tool.in
+
WEBPLUGIN_NAME= libgnome-shell-browser-plugin.so
WEBPLUGIN_DIR= ${PREFIX}/lib/mozilla/plugins/
WEBPLUGIN_FILES=libgnome-shell-browser-plugin.so
-INSTALL_TARGET= install-strip
+
+MESON_ARGS= -Dsystemd=false \
+ -Dnetworkmanager=false
CPE_VENDOR= gnome
GLIB_SCHEMAS= org.gnome.shell.gschema.xml
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
+
.include <bsd.port.mk>
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
index 8470830495c9..82138dfaa693 100644
--- a/x11/gnome-shell/distinfo
+++ b/x11/gnome-shell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493586851
-SHA256 (gnome3/gnome-shell-3.18.5.tar.xz) = 6fc9cd8b43b1ca0669e1c5a9de092a67eea648e38585f0cdb960f08a16c6cb20
-SIZE (gnome3/gnome-shell-3.18.5.tar.xz) = 1591860
+TIMESTAMP = 1525955404
+SHA256 (gnome3/gnome-shell-3.28.2.tar.xz) = 27e690c0c4bb0faac2892b9772d3160aa3c6b09523a873b1c2b63c21634236ad
+SIZE (gnome3/gnome-shell-3.28.2.tar.xz) = 1432208
diff --git a/x11/gnome-shell/files/patch-js_gdm_loginDialog.js b/x11/gnome-shell/files/patch-js_gdm_loginDialog.js
deleted file mode 100644
index 826af5f8b034..000000000000
--- a/x11/gnome-shell/files/patch-js_gdm_loginDialog.js
+++ /dev/null
@@ -1,23 +0,0 @@
---- js/gdm/loginDialog.js.orig 2012-03-24 21:19:24.000000000 -0500
-+++ js/gdm/loginDialog.js 2012-03-24 21:21:23.000000000 -0500
-@@ -301,11 +301,17 @@
- this.actor.connect('key-focus-in', Lang.bind(this, this._moveFocusToItems));
- },
-
-- _moveFocusToItems: function() {
-- let hasItems = Object.keys(this._items).length > 0;
-+ _hasItems: function() {
-+ for (let userName in this._items) {
-+ return true;
-+ }
-+ return false;
-+ },
-
-- if (!hasItems)
-+ _moveFocusToItems: function() {
-+ if (!this._hasItems()) {
- return;
-+ }
-
- if (global.stage.get_key_focus() != this.actor)
- return;
diff --git a/x11/gnome-shell/files/patch-js_misc_loginManager.js b/x11/gnome-shell/files/patch-js_misc_loginManager.js
index 37aec6ba827a..f4900004eebb 100644
--- a/x11/gnome-shell/files/patch-js_misc_loginManager.js
+++ b/x11/gnome-shell/files/patch-js_misc_loginManager.js
@@ -1,6 +1,30 @@
---- js/misc/loginManager.js.orig 2014-10-13 22:57:05.000000000 +0200
-+++ js/misc/loginManager.js 2014-10-23 19:53:12.854065483 +0200
-@@ -46,6 +46,32 @@
+$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);
@@ -33,7 +57,7 @@
function haveSystemd() {
return GLib.access("/run/systemd/seats", 0) >= 0;
}
-@@ -75,7 +101,7 @@
+@@ -78,7 +101,7 @@ function canLock() {
-1, null);
let version = result.deep_unpack()[0].deep_unpack();
@@ -42,7 +66,7 @@
} catch(e) {
return false;
}
-@@ -93,7 +119,7 @@
+@@ -96,7 +119,7 @@ function getLoginManager() {
if (haveSystemd())
_loginManager = new LoginManagerSystemd();
else
@@ -51,35 +75,35 @@
}
return _loginManager;
-@@ -110,6 +136,9 @@
- Lang.bind(this, this._prepareForSleep));
+@@ -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: function(callback) {
+ getCurrentSessionProxy(callback) {
if (this._currentSession) {
callback (this._currentSession);
-@@ -177,13 +206,35 @@
+@@ -188,13 +214,35 @@ var LoginManagerSystemd = new Lang.Class({
});
Signals.addSignalMethods(LoginManagerSystemd.prototype);
--const LoginManagerDummy = new Lang.Class({
+-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: function(callback) {
+ 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
@@ -101,8 +125,8 @@
+ }));
},
- canSuspend: function(asyncCallback) {
-@@ -203,4 +254,4 @@
+ canSuspend(asyncCallback) {
+@@ -214,4 +262,4 @@ var LoginManagerDummy = new Lang.Class({
callback(null);
}
});
diff --git a/x11/gnome-shell/files/patch-js_ui_screenShield.js b/x11/gnome-shell/files/patch-js_ui_screenShield.js
new file mode 100644
index 000000000000..7c05eacea297
--- /dev/null
+++ b/x11/gnome-shell/files/patch-js_ui_screenShield.js
@@ -0,0 +1,21 @@
+$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/files/patch-js_ui_sessionMode.js b/x11/gnome-shell/files/patch-js_ui_sessionMode.js
deleted file mode 100644
index 011ddcffd0c2..000000000000
--- a/x11/gnome-shell/files/patch-js_ui_sessionMode.js
+++ /dev/null
@@ -1,29 +0,0 @@
---- js/ui/sessionMode.js.orig 2014-02-19 20:54:46.000000000 +0000
-+++ js/ui/sessionMode.js 2014-03-17 19:23:36.755386539 +0000
-@@ -60,7 +60,7 @@
- isLocked: true,
- isGreeter: undefined,
- unlockDialog: undefined,
-- components: ['polkitAgent', 'telepathyClient'],
-+ components: ['polkitAgent'],
- panel: {
- left: [],
- center: [],
-@@ -72,7 +72,7 @@
- 'unlock-dialog': {
- isLocked: true,
- unlockDialog: undefined,
-- components: ['polkitAgent', 'telepathyClient'],
-+ components: ['polkitAgent'],
- panel: {
- left: [],
- center: [],
-@@ -97,7 +97,7 @@
- components: Config.HAVE_NETWORKMANAGER ?
- ['networkAgent', 'polkitAgent', 'telepathyClient',
- 'keyring', 'autorunManager', 'automountManager'] :
-- ['polkitAgent', 'telepathyClient',
-+ ['polkitAgent',
- 'keyring', 'autorunManager', 'automountManager'],
-
- panel: {
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
index 406c994aa053..89f729b79fff 100644
--- a/x11/gnome-shell/pkg-plist
+++ b/x11/gnome-shell/pkg-plist
@@ -4,12 +4,12 @@ bin/gnome-shell-extension-tool
bin/gnome-shell-perf-tool
lib/gnome-shell/Gvc-1.0.typelib
lib/gnome-shell/Shell-0.1.typelib
-lib/gnome-shell/ShellJS-0.1.typelib
lib/gnome-shell/ShellMenu-0.1.typelib
lib/gnome-shell/St-1.0.typelib
-lib/gnome-shell/libgnome-shell-js.so
lib/gnome-shell/libgnome-shell-menu.so
lib/gnome-shell/libgnome-shell.so
+lib/gnome-shell/libgvc.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
@@ -18,8 +18,8 @@ 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/gnome-shell-wayland.desktop
-share/applications/gnome-shell.desktop
+share/applications/org.gnome.Shell.desktop
+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
@@ -27,83 +27,13 @@ share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml
share/dbus-1/services/org.gnome.Shell.CalendarServer.service
share/dbus-1/services/org.gnome.Shell.HotplugSniffer.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%%/gnome-shell-osk-layouts.gresource
%%DATADIR%%/gnome-shell-theme.gresource
%%DATADIR%%/perf-background.xml
-share/gtk-doc/html/shell/ShellEmbeddedWindow.html
-share/gtk-doc/html/shell/ShellGtkEmbed.html
-share/gtk-doc/html/shell/ShellTpClient.html
-share/gtk-doc/html/shell/annotation-glossary.html
-share/gtk-doc/html/shell/api-index-full.html
-share/gtk-doc/html/shell/ch01.html
-share/gtk-doc/html/shell/ch02.html
-share/gtk-doc/html/shell/ch03.html
-share/gtk-doc/html/shell/ch04.html
-share/gtk-doc/html/shell/ch05.html
-share/gtk-doc/html/shell/ch06.html
-share/gtk-doc/html/shell/deprecated-api-index.html
-share/gtk-doc/html/shell/gdbus-org.gnome.Shell.SearchProvider.html
-share/gtk-doc/html/shell/gdbus-org.gnome.Shell.SearchProvider2.html
-share/gtk-doc/html/shell/home.png
-share/gtk-doc/html/shell/index.html
-share/gtk-doc/html/shell/left-insensitive.png
-share/gtk-doc/html/shell/left.png
-share/gtk-doc/html/shell/object-tree.html
-share/gtk-doc/html/shell/right-insensitive.png
-share/gtk-doc/html/shell/right.png
-share/gtk-doc/html/shell/shell-shell-action-modes.html
-share/gtk-doc/html/shell/shell-shell-app-system.html
-share/gtk-doc/html/shell/shell-shell-app-usage.html
-share/gtk-doc/html/shell/shell-shell-app.html
-share/gtk-doc/html/shell/shell-shell-generic-container.html
-share/gtk-doc/html/shell/shell-shell-global.html
-share/gtk-doc/html/shell/shell-shell-mount-operation.html
-share/gtk-doc/html/shell/shell-shell-polkit-authentication-agent.html
-share/gtk-doc/html/shell/shell-shell-recorder.html
-share/gtk-doc/html/shell/shell-shell-stack.html
-share/gtk-doc/html/shell/shell-shell-tray-icon.html
-share/gtk-doc/html/shell/shell-shell-tray-manager.html
-share/gtk-doc/html/shell/shell-shell-util.html
-share/gtk-doc/html/shell/shell-shell-window-tracker.html
-share/gtk-doc/html/shell/shell-shell-wm.html
-share/gtk-doc/html/shell/shell.devhelp2
-share/gtk-doc/html/shell/style.css
-share/gtk-doc/html/shell/up-insensitive.png
-share/gtk-doc/html/shell/up.png
-share/gtk-doc/html/st/StBin.html
-share/gtk-doc/html/st/StBoxLayout.html
-share/gtk-doc/html/st/StButton.html
-share/gtk-doc/html/st/StDrawingArea.html
-share/gtk-doc/html/st/StEntry.html
-share/gtk-doc/html/st/StIcon.html
-share/gtk-doc/html/st/StLabel.html
-share/gtk-doc/html/st/StScrollView.html
-share/gtk-doc/html/st/StScrollable.html
-share/gtk-doc/html/st/StTextureCache.html
-share/gtk-doc/html/st/StThemeNodeTransition.html
-share/gtk-doc/html/st/StWidget.html
-share/gtk-doc/html/st/StWidgetAccessible.html
-share/gtk-doc/html/st/annotation-glossary.html
-share/gtk-doc/html/st/api-index-full.html
-share/gtk-doc/html/st/base.html
-share/gtk-doc/html/st/containers.html
-share/gtk-doc/html/st/deprecated-api-index.html
-share/gtk-doc/html/st/home.png
-share/gtk-doc/html/st/index.html
-share/gtk-doc/html/st/left-insensitive.png
-share/gtk-doc/html/st/left.png
-share/gtk-doc/html/st/object-tree.html
-share/gtk-doc/html/st/pt01.html
-share/gtk-doc/html/st/right-insensitive.png
-share/gtk-doc/html/st/right.png
-share/gtk-doc/html/st/st-st-theme-context.html
-share/gtk-doc/html/st/st-st-theme-node.html
-share/gtk-doc/html/st/st-st-theme.html
-share/gtk-doc/html/st/st.devhelp2
-share/gtk-doc/html/st/style.css
-share/gtk-doc/html/st/styling.html
-share/gtk-doc/html/st/up-insensitive.png
-share/gtk-doc/html/st/up.png
-share/gtk-doc/html/st/widgets.html
share/locale/af/LC_MESSAGES/gnome-shell.mo
share/locale/an/LC_MESSAGES/gnome-shell.mo
share/locale/ar/LC_MESSAGES/gnome-shell.mo
@@ -130,10 +60,12 @@ share/locale/fi/LC_MESSAGES/gnome-shell.mo
share/locale/fr/LC_MESSAGES/gnome-shell.mo
share/locale/fur/LC_MESSAGES/gnome-shell.mo
share/locale/ga/LC_MESSAGES/gnome-shell.mo
+share/locale/gd/LC_MESSAGES/gnome-shell.mo
share/locale/gl/LC_MESSAGES/gnome-shell.mo
share/locale/gu/LC_MESSAGES/gnome-shell.mo
share/locale/he/LC_MESSAGES/gnome-shell.mo
share/locale/hi/LC_MESSAGES/gnome-shell.mo
+share/locale/hr/LC_MESSAGES/gnome-shell.mo
share/locale/hu/LC_MESSAGES/gnome-shell.mo
share/locale/ia/LC_MESSAGES/gnome-shell.mo
share/locale/id/LC_MESSAGES/gnome-shell.mo
@@ -182,3 +114,4 @@ 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/xdg-desktop-portal/portals/gnome-shell.portal
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 1a73c5484b38..e1f0dba7cd2b 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome-terminal
-PORTVERSION= 3.24.2
-PORTREVISION= 1
+PORTVERSION= 3.28.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -19,6 +18,7 @@ BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
vala:lang/vala
LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
libgnutls.so:security/gnutls \
+ libfribidi.so:converters/fribidi \
libpcre2-8.so:devel/pcre2
RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
@@ -51,9 +51,4 @@ NAUTILUS_CONFIGURE_WITH= nautilus-extension
NAUTILUS_USE= GNOME=nautilus3
NAUTILUS_DESC= Open in terminal extension for nautilus
-post-install:
-.for i in ca cs de el es fi fr gl hu ko pt_BR ru sv
- @${RMDIR} ${STAGEDIR}${PREFIX}/share/help/${i}/gnome-terminal/figures
-.endfor
-
.include <bsd.port.mk>
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 01c61def86f1..070453bfb8b3 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494857938
-SHA256 (gnome3/gnome-terminal-3.24.2.tar.xz) = 281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f
-SIZE (gnome3/gnome-terminal-3.24.2.tar.xz) = 1960952
+TIMESTAMP = 1527915942
+SHA256 (gnome3/gnome-terminal-3.28.2.tar.xz) = a283dca4980eecf9184a55aac03fef99f85748461ff190423a2253f3b4557279
+SIZE (gnome3/gnome-terminal-3.28.2.tar.xz) = 2094920
diff --git a/x11/gnome-terminal/files/patch-src_Makefile.in b/x11/gnome-terminal/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..e0d7f6d48faa
--- /dev/null
+++ b/x11/gnome-terminal/files/patch-src_Makefile.in
@@ -0,0 +1,14 @@
+https://debarshiray.wordpress.com/2018/05/11/gnome-terminal-separate-menu-items-for-opening-tabs-and-windows/
+
+https://github.com/debarshiray/gnome-terminal/commit/57f235b31cdf0a19c13a6cbb808ad5ef0865f62b
+
+--- src/Makefile.in.orig 2018-06-08 22:58:08.551112000 +0200
++++ src/Makefile.in 2018-06-08 22:59:00.096796000 +0200
+@@ -775,6 +775,7 @@
+ terminal-window.h $(NULL) $(am__append_3)
+ nodist_gnome_terminal_server_SOURCES = $(gnome_terminal_server_built)
+ gnome_terminal_server_CPPFLAGS = \
++ -DDISUNIFY_NEW_TERMINAL_SECTION \
+ -DTERMINAL_COMPILATION \
+ -DTERM_LOCALEDIR="\"$(datadir)/locale\"" \
+ -DTERM_LIBEXECDIR="\"$(libexecdir)\"" \
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 35508e099b16..450f575fd932 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,12 +1,12 @@
bin/gnome-terminal
%%NAUTILUS%%lib/nautilus/extensions-3.0/libterminal-nautilus.a
%%NAUTILUS%%lib/nautilus/extensions-3.0/libterminal-nautilus.so
-lib/systemd/user/gnome-terminal-server.service
+@comment lib/systemd/user/gnome-terminal-server.service
%%MIGRATION%%libexec/gnome-terminal-migration
libexec/gnome-terminal-server
share/applications/org.gnome.Terminal.desktop
share/dbus-1/services/org.gnome.Terminal.service
-%%SEARCHPROVIDER%%share/gnome-shell/search-providers/gnome-terminal-search-provider.ini
+share/gnome-shell/search-providers/gnome-terminal-search-provider.ini
share/help/C/gnome-terminal/adv-keyboard-shortcuts.page
share/help/C/gnome-terminal/app-colors.page
share/help/C/gnome-terminal/app-cursor.page
@@ -27,6 +27,7 @@ share/help/C/gnome-terminal/pref-custom-command.page
share/help/C/gnome-terminal/pref-custom-exit.page
share/help/C/gnome-terminal/pref-encoding.page
share/help/C/gnome-terminal/pref-keyboard-access.page
+share/help/C/gnome-terminal/pref-login-shell.page
share/help/C/gnome-terminal/pref-menubar.page
share/help/C/gnome-terminal/pref-profile-char-width.page
share/help/C/gnome-terminal/pref-profile-encoding.page
@@ -36,9 +37,9 @@ share/help/C/gnome-terminal/pref-tab-window.page
share/help/C/gnome-terminal/pref-user-input.page
share/help/C/gnome-terminal/pref.page
share/help/C/gnome-terminal/prob-reset.page
-share/help/C/gnome-terminal/profile.page
share/help/C/gnome-terminal/txt-copy-paste.page
share/help/C/gnome-terminal/txt-links.page
+share/help/C/gnome-terminal/txt-save-text.page
share/help/C/gnome-terminal/txt-search.page
share/help/C/gnome-terminal/txt-select-text.page
share/help/ca/gnome-terminal/adv-keyboard-shortcuts.page
@@ -59,6 +60,7 @@ share/help/ca/gnome-terminal/pref-custom-command.page
share/help/ca/gnome-terminal/pref-custom-exit.page
share/help/ca/gnome-terminal/pref-encoding.page
share/help/ca/gnome-terminal/pref-keyboard-access.page
+share/help/ca/gnome-terminal/pref-login-shell.page
share/help/ca/gnome-terminal/pref-menubar.page
share/help/ca/gnome-terminal/pref-profile-char-width.page
share/help/ca/gnome-terminal/pref-profile-encoding.page
@@ -68,9 +70,9 @@ share/help/ca/gnome-terminal/pref-tab-window.page
share/help/ca/gnome-terminal/pref-user-input.page
share/help/ca/gnome-terminal/pref.page
share/help/ca/gnome-terminal/prob-reset.page
-share/help/ca/gnome-terminal/profile.page
share/help/ca/gnome-terminal/txt-copy-paste.page
share/help/ca/gnome-terminal/txt-links.page
+share/help/ca/gnome-terminal/txt-save-text.page
share/help/ca/gnome-terminal/txt-search.page
share/help/ca/gnome-terminal/txt-select-text.page
share/help/cs/gnome-terminal/adv-keyboard-shortcuts.page
@@ -91,6 +93,7 @@ share/help/cs/gnome-terminal/pref-custom-command.page
share/help/cs/gnome-terminal/pref-custom-exit.page
share/help/cs/gnome-terminal/pref-encoding.page
share/help/cs/gnome-terminal/pref-keyboard-access.page
+share/help/cs/gnome-terminal/pref-login-shell.page
share/help/cs/gnome-terminal/pref-menubar.page
share/help/cs/gnome-terminal/pref-profile-char-width.page
share/help/cs/gnome-terminal/pref-profile-encoding.page
@@ -100,9 +103,9 @@ share/help/cs/gnome-terminal/pref-tab-window.page
share/help/cs/gnome-terminal/pref-user-input.page
share/help/cs/gnome-terminal/pref.page
share/help/cs/gnome-terminal/prob-reset.page
-share/help/cs/gnome-terminal/profile.page
share/help/cs/gnome-terminal/txt-copy-paste.page
share/help/cs/gnome-terminal/txt-links.page
+share/help/cs/gnome-terminal/txt-save-text.page
share/help/cs/gnome-terminal/txt-search.page
share/help/cs/gnome-terminal/txt-select-text.page
share/help/de/gnome-terminal/adv-keyboard-shortcuts.page
@@ -112,6 +115,7 @@ share/help/de/gnome-terminal/app-fonts.page
share/help/de/gnome-terminal/app-fullscreen.page
share/help/de/gnome-terminal/app-terminal-sizes.page
share/help/de/gnome-terminal/app-zoom.page
+share/help/de/gnome-terminal/figures/gnome-terminal.png
share/help/de/gnome-terminal/gs-execute-commands.page
share/help/de/gnome-terminal/gs-tabs.page
share/help/de/gnome-terminal/index.page
@@ -123,6 +127,7 @@ share/help/de/gnome-terminal/pref-custom-command.page
share/help/de/gnome-terminal/pref-custom-exit.page
share/help/de/gnome-terminal/pref-encoding.page
share/help/de/gnome-terminal/pref-keyboard-access.page
+share/help/de/gnome-terminal/pref-login-shell.page
share/help/de/gnome-terminal/pref-menubar.page
share/help/de/gnome-terminal/pref-profile-char-width.page
share/help/de/gnome-terminal/pref-profile-encoding.page
@@ -132,9 +137,9 @@ share/help/de/gnome-terminal/pref-tab-window.page
share/help/de/gnome-terminal/pref-user-input.page
share/help/de/gnome-terminal/pref.page
share/help/de/gnome-terminal/prob-reset.page
-share/help/de/gnome-terminal/profile.page
share/help/de/gnome-terminal/txt-copy-paste.page
share/help/de/gnome-terminal/txt-links.page
+share/help/de/gnome-terminal/txt-save-text.page
share/help/de/gnome-terminal/txt-search.page
share/help/de/gnome-terminal/txt-select-text.page
share/help/el/gnome-terminal/adv-keyboard-shortcuts.page
@@ -144,6 +149,7 @@ share/help/el/gnome-terminal/app-fonts.page
share/help/el/gnome-terminal/app-fullscreen.page
share/help/el/gnome-terminal/app-terminal-sizes.page
share/help/el/gnome-terminal/app-zoom.page
+share/help/el/gnome-terminal/figures/gnome-terminal.png
share/help/el/gnome-terminal/gs-execute-commands.page
share/help/el/gnome-terminal/gs-tabs.page
share/help/el/gnome-terminal/index.page
@@ -155,6 +161,7 @@ share/help/el/gnome-terminal/pref-custom-command.page
share/help/el/gnome-terminal/pref-custom-exit.page
share/help/el/gnome-terminal/pref-encoding.page
share/help/el/gnome-terminal/pref-keyboard-access.page
+share/help/el/gnome-terminal/pref-login-shell.page
share/help/el/gnome-terminal/pref-menubar.page
share/help/el/gnome-terminal/pref-profile-char-width.page
share/help/el/gnome-terminal/pref-profile-encoding.page
@@ -164,9 +171,9 @@ share/help/el/gnome-terminal/pref-tab-window.page
share/help/el/gnome-terminal/pref-user-input.page
share/help/el/gnome-terminal/pref.page
share/help/el/gnome-terminal/prob-reset.page
-share/help/el/gnome-terminal/profile.page
share/help/el/gnome-terminal/txt-copy-paste.page
share/help/el/gnome-terminal/txt-links.page
+share/help/el/gnome-terminal/txt-save-text.page
share/help/el/gnome-terminal/txt-search.page
share/help/el/gnome-terminal/txt-select-text.page
share/help/es/gnome-terminal/adv-keyboard-shortcuts.page
@@ -187,6 +194,7 @@ share/help/es/gnome-terminal/pref-custom-command.page
share/help/es/gnome-terminal/pref-custom-exit.page
share/help/es/gnome-terminal/pref-encoding.page
share/help/es/gnome-terminal/pref-keyboard-access.page
+share/help/es/gnome-terminal/pref-login-shell.page
share/help/es/gnome-terminal/pref-menubar.page
share/help/es/gnome-terminal/pref-profile-char-width.page
share/help/es/gnome-terminal/pref-profile-encoding.page
@@ -196,9 +204,9 @@ share/help/es/gnome-terminal/pref-tab-window.page
share/help/es/gnome-terminal/pref-user-input.page
share/help/es/gnome-terminal/pref.page
share/help/es/gnome-terminal/prob-reset.page
-share/help/es/gnome-terminal/profile.page
share/help/es/gnome-terminal/txt-copy-paste.page
share/help/es/gnome-terminal/txt-links.page
+share/help/es/gnome-terminal/txt-save-text.page
share/help/es/gnome-terminal/txt-search.page
share/help/es/gnome-terminal/txt-select-text.page
share/help/fi/gnome-terminal/adv-keyboard-shortcuts.page
@@ -219,6 +227,7 @@ share/help/fi/gnome-terminal/pref-custom-command.page
share/help/fi/gnome-terminal/pref-custom-exit.page
share/help/fi/gnome-terminal/pref-encoding.page
share/help/fi/gnome-terminal/pref-keyboard-access.page
+share/help/fi/gnome-terminal/pref-login-shell.page
share/help/fi/gnome-terminal/pref-menubar.page
share/help/fi/gnome-terminal/pref-profile-char-width.page
share/help/fi/gnome-terminal/pref-profile-encoding.page
@@ -228,9 +237,9 @@ share/help/fi/gnome-terminal/pref-tab-window.page
share/help/fi/gnome-terminal/pref-user-input.page
share/help/fi/gnome-terminal/pref.page
share/help/fi/gnome-terminal/prob-reset.page
-share/help/fi/gnome-terminal/profile.page
share/help/fi/gnome-terminal/txt-copy-paste.page
share/help/fi/gnome-terminal/txt-links.page
+share/help/fi/gnome-terminal/txt-save-text.page
share/help/fi/gnome-terminal/txt-search.page
share/help/fi/gnome-terminal/txt-select-text.page
share/help/fr/gnome-terminal/adv-keyboard-shortcuts.page
@@ -251,6 +260,7 @@ share/help/fr/gnome-terminal/pref-custom-command.page
share/help/fr/gnome-terminal/pref-custom-exit.page
share/help/fr/gnome-terminal/pref-encoding.page
share/help/fr/gnome-terminal/pref-keyboard-access.page
+share/help/fr/gnome-terminal/pref-login-shell.page
share/help/fr/gnome-terminal/pref-menubar.page
share/help/fr/gnome-terminal/pref-profile-char-width.page
share/help/fr/gnome-terminal/pref-profile-encoding.page
@@ -260,9 +270,9 @@ share/help/fr/gnome-terminal/pref-tab-window.page
share/help/fr/gnome-terminal/pref-user-input.page
share/help/fr/gnome-terminal/pref.page
share/help/fr/gnome-terminal/prob-reset.page
-share/help/fr/gnome-terminal/profile.page
share/help/fr/gnome-terminal/txt-copy-paste.page
share/help/fr/gnome-terminal/txt-links.page
+share/help/fr/gnome-terminal/txt-save-text.page
share/help/fr/gnome-terminal/txt-search.page
share/help/fr/gnome-terminal/txt-select-text.page
share/help/gl/gnome-terminal/adv-keyboard-shortcuts.page
@@ -283,6 +293,7 @@ share/help/gl/gnome-terminal/pref-custom-command.page
share/help/gl/gnome-terminal/pref-custom-exit.page
share/help/gl/gnome-terminal/pref-encoding.page
share/help/gl/gnome-terminal/pref-keyboard-access.page
+share/help/gl/gnome-terminal/pref-login-shell.page
share/help/gl/gnome-terminal/pref-menubar.page
share/help/gl/gnome-terminal/pref-profile-char-width.page
share/help/gl/gnome-terminal/pref-profile-encoding.page
@@ -292,9 +303,9 @@ share/help/gl/gnome-terminal/pref-tab-window.page
share/help/gl/gnome-terminal/pref-user-input.page
share/help/gl/gnome-terminal/pref.page
share/help/gl/gnome-terminal/prob-reset.page
-share/help/gl/gnome-terminal/profile.page
share/help/gl/gnome-terminal/txt-copy-paste.page
share/help/gl/gnome-terminal/txt-links.page
+share/help/gl/gnome-terminal/txt-save-text.page
share/help/gl/gnome-terminal/txt-search.page
share/help/gl/gnome-terminal/txt-select-text.page
share/help/hu/gnome-terminal/adv-keyboard-shortcuts.page
@@ -304,6 +315,7 @@ share/help/hu/gnome-terminal/app-fonts.page
share/help/hu/gnome-terminal/app-fullscreen.page
share/help/hu/gnome-terminal/app-terminal-sizes.page
share/help/hu/gnome-terminal/app-zoom.page
+share/help/hu/gnome-terminal/figures/gnome-terminal.png
share/help/hu/gnome-terminal/gs-execute-commands.page
share/help/hu/gnome-terminal/gs-tabs.page
share/help/hu/gnome-terminal/index.page
@@ -315,6 +327,7 @@ share/help/hu/gnome-terminal/pref-custom-command.page
share/help/hu/gnome-terminal/pref-custom-exit.page
share/help/hu/gnome-terminal/pref-encoding.page
share/help/hu/gnome-terminal/pref-keyboard-access.page
+share/help/hu/gnome-terminal/pref-login-shell.page
share/help/hu/gnome-terminal/pref-menubar.page
share/help/hu/gnome-terminal/pref-profile-char-width.page
share/help/hu/gnome-terminal/pref-profile-encoding.page
@@ -324,9 +337,9 @@ share/help/hu/gnome-terminal/pref-tab-window.page
share/help/hu/gnome-terminal/pref-user-input.page
share/help/hu/gnome-terminal/pref.page
share/help/hu/gnome-terminal/prob-reset.page
-share/help/hu/gnome-terminal/profile.page
share/help/hu/gnome-terminal/txt-copy-paste.page
share/help/hu/gnome-terminal/txt-links.page
+share/help/hu/gnome-terminal/txt-save-text.page
share/help/hu/gnome-terminal/txt-search.page
share/help/hu/gnome-terminal/txt-select-text.page
share/help/ko/gnome-terminal/adv-keyboard-shortcuts.page
@@ -336,6 +349,7 @@ share/help/ko/gnome-terminal/app-fonts.page
share/help/ko/gnome-terminal/app-fullscreen.page
share/help/ko/gnome-terminal/app-terminal-sizes.page
share/help/ko/gnome-terminal/app-zoom.page
+share/help/ko/gnome-terminal/figures/gnome-terminal.png
share/help/ko/gnome-terminal/gs-execute-commands.page
share/help/ko/gnome-terminal/gs-tabs.page
share/help/ko/gnome-terminal/index.page
@@ -347,6 +361,7 @@ share/help/ko/gnome-terminal/pref-custom-command.page
share/help/ko/gnome-terminal/pref-custom-exit.page
share/help/ko/gnome-terminal/pref-encoding.page
share/help/ko/gnome-terminal/pref-keyboard-access.page
+share/help/ko/gnome-terminal/pref-login-shell.page
share/help/ko/gnome-terminal/pref-menubar.page
share/help/ko/gnome-terminal/pref-profile-char-width.page
share/help/ko/gnome-terminal/pref-profile-encoding.page
@@ -356,11 +371,45 @@ share/help/ko/gnome-terminal/pref-tab-window.page
share/help/ko/gnome-terminal/pref-user-input.page
share/help/ko/gnome-terminal/pref.page
share/help/ko/gnome-terminal/prob-reset.page
-share/help/ko/gnome-terminal/profile.page
share/help/ko/gnome-terminal/txt-copy-paste.page
share/help/ko/gnome-terminal/txt-links.page
+share/help/ko/gnome-terminal/txt-save-text.page
share/help/ko/gnome-terminal/txt-search.page
share/help/ko/gnome-terminal/txt-select-text.page
+share/help/pl/gnome-terminal/adv-keyboard-shortcuts.page
+share/help/pl/gnome-terminal/app-colors.page
+share/help/pl/gnome-terminal/app-cursor.page
+share/help/pl/gnome-terminal/app-fonts.page
+share/help/pl/gnome-terminal/app-fullscreen.page
+share/help/pl/gnome-terminal/app-terminal-sizes.page
+share/help/pl/gnome-terminal/app-zoom.page
+share/help/pl/gnome-terminal/figures/gnome-terminal.png
+share/help/pl/gnome-terminal/gs-execute-commands.page
+share/help/pl/gnome-terminal/gs-tabs.page
+share/help/pl/gnome-terminal/index.page
+share/help/pl/gnome-terminal/introduction.page
+share/help/pl/gnome-terminal/legal.xml
+share/help/pl/gnome-terminal/overview.page
+share/help/pl/gnome-terminal/pref-bell.page
+share/help/pl/gnome-terminal/pref-custom-command.page
+share/help/pl/gnome-terminal/pref-custom-exit.page
+share/help/pl/gnome-terminal/pref-encoding.page
+share/help/pl/gnome-terminal/pref-keyboard-access.page
+share/help/pl/gnome-terminal/pref-login-shell.page
+share/help/pl/gnome-terminal/pref-menubar.page
+share/help/pl/gnome-terminal/pref-profile-char-width.page
+share/help/pl/gnome-terminal/pref-profile-encoding.page
+share/help/pl/gnome-terminal/pref-profiles.page
+share/help/pl/gnome-terminal/pref-scrolling.page
+share/help/pl/gnome-terminal/pref-tab-window.page
+share/help/pl/gnome-terminal/pref-user-input.page
+share/help/pl/gnome-terminal/pref.page
+share/help/pl/gnome-terminal/prob-reset.page
+share/help/pl/gnome-terminal/txt-copy-paste.page
+share/help/pl/gnome-terminal/txt-links.page
+share/help/pl/gnome-terminal/txt-save-text.page
+share/help/pl/gnome-terminal/txt-search.page
+share/help/pl/gnome-terminal/txt-select-text.page
share/help/pt_BR/gnome-terminal/adv-keyboard-shortcuts.page
share/help/pt_BR/gnome-terminal/app-colors.page
share/help/pt_BR/gnome-terminal/app-cursor.page
@@ -368,6 +417,7 @@ share/help/pt_BR/gnome-terminal/app-fonts.page
share/help/pt_BR/gnome-terminal/app-fullscreen.page
share/help/pt_BR/gnome-terminal/app-terminal-sizes.page
share/help/pt_BR/gnome-terminal/app-zoom.page
+share/help/pt_BR/gnome-terminal/figures/gnome-terminal.png
share/help/pt_BR/gnome-terminal/gs-execute-commands.page
share/help/pt_BR/gnome-terminal/gs-tabs.page
share/help/pt_BR/gnome-terminal/index.page
@@ -379,6 +429,7 @@ share/help/pt_BR/gnome-terminal/pref-custom-command.page
share/help/pt_BR/gnome-terminal/pref-custom-exit.page
share/help/pt_BR/gnome-terminal/pref-encoding.page
share/help/pt_BR/gnome-terminal/pref-keyboard-access.page
+share/help/pt_BR/gnome-terminal/pref-login-shell.page
share/help/pt_BR/gnome-terminal/pref-menubar.page
share/help/pt_BR/gnome-terminal/pref-profile-char-width.page
share/help/pt_BR/gnome-terminal/pref-profile-encoding.page
@@ -388,11 +439,44 @@ share/help/pt_BR/gnome-terminal/pref-tab-window.page
share/help/pt_BR/gnome-terminal/pref-user-input.page
share/help/pt_BR/gnome-terminal/pref.page
share/help/pt_BR/gnome-terminal/prob-reset.page
-share/help/pt_BR/gnome-terminal/profile.page
share/help/pt_BR/gnome-terminal/txt-copy-paste.page
share/help/pt_BR/gnome-terminal/txt-links.page
+share/help/pt_BR/gnome-terminal/txt-save-text.page
share/help/pt_BR/gnome-terminal/txt-search.page
share/help/pt_BR/gnome-terminal/txt-select-text.page
+share/help/ro/gnome-terminal/adv-keyboard-shortcuts.page
+share/help/ro/gnome-terminal/app-colors.page
+share/help/ro/gnome-terminal/app-cursor.page
+share/help/ro/gnome-terminal/app-fonts.page
+share/help/ro/gnome-terminal/app-fullscreen.page
+share/help/ro/gnome-terminal/app-terminal-sizes.page
+share/help/ro/gnome-terminal/app-zoom.page
+share/help/ro/gnome-terminal/gs-execute-commands.page
+share/help/ro/gnome-terminal/gs-tabs.page
+share/help/ro/gnome-terminal/index.page
+share/help/ro/gnome-terminal/introduction.page
+share/help/ro/gnome-terminal/legal.xml
+share/help/ro/gnome-terminal/overview.page
+share/help/ro/gnome-terminal/pref-bell.page
+share/help/ro/gnome-terminal/pref-custom-command.page
+share/help/ro/gnome-terminal/pref-custom-exit.page
+share/help/ro/gnome-terminal/pref-encoding.page
+share/help/ro/gnome-terminal/pref-keyboard-access.page
+share/help/ro/gnome-terminal/pref-login-shell.page
+share/help/ro/gnome-terminal/pref-menubar.page
+share/help/ro/gnome-terminal/pref-profile-char-width.page
+share/help/ro/gnome-terminal/pref-profile-encoding.page
+share/help/ro/gnome-terminal/pref-profiles.page
+share/help/ro/gnome-terminal/pref-scrolling.page
+share/help/ro/gnome-terminal/pref-tab-window.page
+share/help/ro/gnome-terminal/pref-user-input.page
+share/help/ro/gnome-terminal/pref.page
+share/help/ro/gnome-terminal/prob-reset.page
+share/help/ro/gnome-terminal/txt-copy-paste.page
+share/help/ro/gnome-terminal/txt-links.page
+share/help/ro/gnome-terminal/txt-save-text.page
+share/help/ro/gnome-terminal/txt-search.page
+share/help/ro/gnome-terminal/txt-select-text.page
share/help/ru/gnome-terminal/adv-keyboard-shortcuts.page
share/help/ru/gnome-terminal/app-colors.page
share/help/ru/gnome-terminal/app-cursor.page
@@ -400,6 +484,7 @@ share/help/ru/gnome-terminal/app-fonts.page
share/help/ru/gnome-terminal/app-fullscreen.page
share/help/ru/gnome-terminal/app-terminal-sizes.page
share/help/ru/gnome-terminal/app-zoom.page
+share/help/ru/gnome-terminal/figures/gnome-terminal.png
share/help/ru/gnome-terminal/gs-execute-commands.page
share/help/ru/gnome-terminal/gs-tabs.page
share/help/ru/gnome-terminal/index.page
@@ -411,6 +496,7 @@ share/help/ru/gnome-terminal/pref-custom-command.page
share/help/ru/gnome-terminal/pref-custom-exit.page
share/help/ru/gnome-terminal/pref-encoding.page
share/help/ru/gnome-terminal/pref-keyboard-access.page
+share/help/ru/gnome-terminal/pref-login-shell.page
share/help/ru/gnome-terminal/pref-menubar.page
share/help/ru/gnome-terminal/pref-profile-char-width.page
share/help/ru/gnome-terminal/pref-profile-encoding.page
@@ -420,9 +506,9 @@ share/help/ru/gnome-terminal/pref-tab-window.page
share/help/ru/gnome-terminal/pref-user-input.page
share/help/ru/gnome-terminal/pref.page
share/help/ru/gnome-terminal/prob-reset.page
-share/help/ru/gnome-terminal/profile.page
share/help/ru/gnome-terminal/txt-copy-paste.page
share/help/ru/gnome-terminal/txt-links.page
+share/help/ru/gnome-terminal/txt-save-text.page
share/help/ru/gnome-terminal/txt-search.page
share/help/ru/gnome-terminal/txt-select-text.page
share/help/sv/gnome-terminal/adv-keyboard-shortcuts.page
@@ -443,6 +529,7 @@ share/help/sv/gnome-terminal/pref-custom-command.page
share/help/sv/gnome-terminal/pref-custom-exit.page
share/help/sv/gnome-terminal/pref-encoding.page
share/help/sv/gnome-terminal/pref-keyboard-access.page
+share/help/sv/gnome-terminal/pref-login-shell.page
share/help/sv/gnome-terminal/pref-menubar.page
share/help/sv/gnome-terminal/pref-profile-char-width.page
share/help/sv/gnome-terminal/pref-profile-encoding.page
@@ -452,9 +539,9 @@ share/help/sv/gnome-terminal/pref-tab-window.page
share/help/sv/gnome-terminal/pref-user-input.page
share/help/sv/gnome-terminal/pref.page
share/help/sv/gnome-terminal/prob-reset.page
-share/help/sv/gnome-terminal/profile.page
share/help/sv/gnome-terminal/txt-copy-paste.page
share/help/sv/gnome-terminal/txt-links.page
+share/help/sv/gnome-terminal/txt-save-text.page
share/help/sv/gnome-terminal/txt-search.page
share/help/sv/gnome-terminal/txt-select-text.page
share/locale/am/LC_MESSAGES/gnome-terminal.mo
@@ -554,3 +641,11 @@ share/locale/zh_HK/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
%%NAUTILUS%%share/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
share/metainfo/org.gnome.Terminal.appdata.xml
+@dir share/help/ca/gnome-terminal/figures
+@dir share/help/cs/gnome-terminal/figures
+@dir share/help/es/gnome-terminal/figures
+@dir share/help/fi/gnome-terminal/figures
+@dir share/help/fr/gnome-terminal/figures
+@dir share/help/gl/gnome-terminal/figures
+@dir share/help/ro/gnome-terminal/figures
+@dir share/help/sv/gnome-terminal/figures
diff --git a/x11/gnome3-lite/Makefile b/x11/gnome3-lite/Makefile
index 04b010e9a837..d4bedc9ab9fc 100644
--- a/x11/gnome3-lite/Makefile
+++ b/x11/gnome3-lite/Makefile
@@ -1,15 +1,13 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11/gnome3-lite/Makefile 18610 2013-06-30 16:33:05Z marcus $
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= x11 gnome
PKGNAMESUFFIX= -lite
COMMENT= The "meta-port" of the GNOME desktop slimmed down for only the basics
MASTERDIR= ${.CURDIR}/../gnome3
-CONFLICTS= gnome2-[0-9]* gnome2-lite-[0-9]* gnome3-[0-9]*
DESCR= ${.CURDIR}/pkg-descr
PKGMESSAGE= ${.CURDIR}/pkg-message
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 4e2602e46c3c..2728888bb9d4 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnome3
-PORTVERSION= 3.18.0
-PORTREVISION= 1
+PORTVERSION= 3.28
CATEGORIES?= x11 gnome
MAINTAINER= gnome@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT?= "meta-port" for the GNOME 3 integrated X11 desktop
RUN_DEPENDS?= dconf-editor:devel/dconf-editor \
gnome-session>=3.0.0:x11/gnome-session \
- gnome-themes-standard>=3.0.0:x11-themes/gnome-themes-standard \
+ gnome-themes-extra>=3.28:x11-themes/gnome-themes-extra \
gnome-icon-theme-extras>=3.0.0:misc/gnome-icon-theme-extras \
gnome-icon-theme-symbolic>=3.0.0:x11-themes/gnome-icon-theme-symbolic \
gnome-keyring>=3.0.0:security/gnome-keyring \
@@ -20,7 +19,7 @@ RUN_DEPENDS?= dconf-editor:devel/dconf-editor \
gnome-mount:sysutils/gnome-mount \
gnome-shell>=3.0.0:x11/gnome-shell \
gnome-shell-extensions>=3.0.0:x11/gnome-shell-extensions \
- gnome-tweak-tool:deskutils/gnome-tweak-tool \
+ gnome-tweaks:deskutils/gnome-tweaks \
sushi>=0:x11-fm/sushi \
nautilus>=3.0.0:x11-fm/nautilus \
${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf:x11-fonts/bitstream-vera \
@@ -41,14 +40,14 @@ USES= metaport
.if ${.CURDIR:T}!="gnome3-lite"
OPTIONS_DEFINE+=DOCS
-DOCS_RUN_DEPENDS= gnome-user-docs>=0:misc/gnome-user-docs
+DOCS_RUN_DEPENDS= gnome-user-docs>=0:misc/gnome-user-docs \
+ gnome-getting-started-docs>=0:misc/gnome-getting-started-docs
.endif
.include <bsd.port.options.mk>
.if ${.CURDIR:T}!="gnome3-lite"
-RUN_DEPENDS+= empathy>=3.0.0:net-im/empathy \
- epiphany>=3.0.0:www/epiphany \
+RUN_DEPENDS+= epiphany>=3.0.0:www/epiphany \
gucharmap>=3.0.0:deskutils/gucharmap \
gnome-characters>=3.0.0:deskutils/gnome-characters \
gnome-calendar>=3.0:deskutils/gnome-calendar \
@@ -57,7 +56,6 @@ RUN_DEPENDS+= empathy>=3.0.0:net-im/empathy \
gedit>=3.0.0:editors/gedit \
gedit-plugins>=3.0.0:editors/gedit-plugins \
gnome-terminal>=3.0.0:x11/gnome-terminal \
- mousetweaks>=3.0.0:accessibility/mousetweaks \
brasero>=3.0.0:sysutils/brasero \
accerciser>=3.0.0:accessibility/accerciser \
gnome-calculator>=3.0.0:math/gnome-calculator \
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index b86a008339cf..3331ae06e558 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -16,7 +16,8 @@ USES= tar:bzip2
.if !defined(REFERENCE_PORT)
BUILD_DEPENDS= rarian-sk-config:textproc/rarian
-LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra
+LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \
+ libpopt.so:devel/popt
RUN_DEPENDS= rarian-sk-config:textproc/rarian
INSTALL_TARGET= install-strip
diff --git a/x11/libgnome/files/patch-libgnome_gnome-config.h b/x11/libgnome/files/patch-libgnome_gnome-config.h
new file mode 100644
index 000000000000..14b56620abdf
--- /dev/null
+++ b/x11/libgnome/files/patch-libgnome_gnome-config.h
@@ -0,0 +1,11 @@
+--- libgnome/gnome-config.h.orig 2009-04-23 09:29:13 UTC
++++ libgnome/gnome-config.h
+@@ -270,7 +270,7 @@ void gnome_config_clean_key_ (const char *path, gboole
+ #define gnome_config_private_clean_key(path) \
+ (gnome_config_clean_key_((path),TRUE))
+
+-/* returns the true filename of the config file */
++/* returns the true filename of the config file */
+ #define gnome_config_get_real_path(path) \
+ (g_build_filename (gnome_user_dir_get(),(path),NULL))
+ #define gnome_config_private_get_real_path(path) \
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 4a5c26b7dd6f..b6c40211668f 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,10 +1,8 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/x11/libgnomekbd/Makefile 19813 2014-08-15 19:44:33Z gusi $
PORTNAME= libgnomekbd
-PORTVERSION= 3.6.0
-PORTREVISION= 2
+PORTVERSION= 3.26.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -12,18 +10,17 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME keyboard shared library
-BUILD_DEPENDS= libxklavier>=5.2:x11/libxklavier
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING.LIB
+
LIB_DEPENDS= libxklavier.so:x11/libxklavier
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= gnomeprefix gtk30 intltool introspection:build \
- libxml2
+USES= gettext gmake libtool localbase pathfix pkgconfig tar:xz
+USE_GNOME= cairo gtk30 introspection:build
GNU_CONFIGURE= yes
-USE_XORG= ice
+USE_XORG= x11
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.libgnomekbd.desktop.gschema.xml \
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 7e6f98afc98e..d72733140047 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/libgnomekbd-3.6.0.tar.xz) = c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09
-SIZE (gnome3/libgnomekbd-3.6.0.tar.xz) = 373588
+TIMESTAMP = 1507325653
+SHA256 (gnome3/libgnomekbd-3.26.0.tar.xz) = ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875
+SIZE (gnome3/libgnomekbd-3.26.0.tar.xz) = 449204
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index 4c83d83b9ae7..4b728c094d20 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -33,6 +33,7 @@ share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo
share/locale/bg/LC_MESSAGES/libgnomekbd.mo
share/locale/bn/LC_MESSAGES/libgnomekbd.mo
share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo
+share/locale/bs/LC_MESSAGES/libgnomekbd.mo
share/locale/ca/LC_MESSAGES/libgnomekbd.mo
share/locale/ca@valencia/LC_MESSAGES/libgnomekbd.mo
share/locale/cs/LC_MESSAGES/libgnomekbd.mo
@@ -49,6 +50,7 @@ share/locale/eu/LC_MESSAGES/libgnomekbd.mo
share/locale/fa/LC_MESSAGES/libgnomekbd.mo
share/locale/fi/LC_MESSAGES/libgnomekbd.mo
share/locale/fr/LC_MESSAGES/libgnomekbd.mo
+share/locale/fur/LC_MESSAGES/libgnomekbd.mo
share/locale/ga/LC_MESSAGES/libgnomekbd.mo
share/locale/gl/LC_MESSAGES/libgnomekbd.mo
share/locale/gu/LC_MESSAGES/libgnomekbd.mo
@@ -59,6 +61,8 @@ share/locale/id/LC_MESSAGES/libgnomekbd.mo
share/locale/it/LC_MESSAGES/libgnomekbd.mo
share/locale/ja/LC_MESSAGES/libgnomekbd.mo
share/locale/ka/LC_MESSAGES/libgnomekbd.mo
+share/locale/kk/LC_MESSAGES/libgnomekbd.mo
+share/locale/km/LC_MESSAGES/libgnomekbd.mo
share/locale/kn/LC_MESSAGES/libgnomekbd.mo
share/locale/ko/LC_MESSAGES/libgnomekbd.mo
share/locale/lt/LC_MESSAGES/libgnomekbd.mo
@@ -88,6 +92,7 @@ share/locale/sr@latin/LC_MESSAGES/libgnomekbd.mo
share/locale/sv/LC_MESSAGES/libgnomekbd.mo
share/locale/ta/LC_MESSAGES/libgnomekbd.mo
share/locale/te/LC_MESSAGES/libgnomekbd.mo
+share/locale/tg/LC_MESSAGES/libgnomekbd.mo
share/locale/th/LC_MESSAGES/libgnomekbd.mo
share/locale/tr/LC_MESSAGES/libgnomekbd.mo
share/locale/ug/LC_MESSAGES/libgnomekbd.mo
diff --git a/x11/pantheon-terminal/Makefile b/x11/pantheon-terminal/Makefile
index 4356821b6252..fb6fc94bcb54 100644
--- a/x11/pantheon-terminal/Makefile
+++ b/x11/pantheon-terminal/Makefile
@@ -12,6 +12,8 @@ COMMENT= Lightweight, beautiful, and simple terminal from Elementary OS
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
+BROKEN= Doesn't build with vala 0.40+
+
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgnutls.so:security/gnutls \
libgranite.so:x11-toolkits/granite \
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 6c0510646408..56737d0f2124 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmdrawer
PORTVERSION= 0.10.5
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11 windowmaker
MASTER_SITES= http://people.easter-eggs.org/~valos/wmdrawer/ \
http://www.sourcefiles.org/Utilities/Desktops/
@@ -15,6 +15,7 @@ LICENSE= GPLv2+
USES= gmake pkgconfig
USE_GNOME= gdkpixbuf2
+USE_XORG= x11 xext xi
MAKE_ENV= USE_GDKPIXBUF2=1
SUB_FILES= pkg-message
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 8040830ca94d..ddcc96e09bf3 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= yelp
-PORTVERSION= 3.22.0
-PORTREVISION= 2
+PORTVERSION= 3.28.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index aceb45721869..160c54796ccd 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479730974
-SHA256 (gnome3/yelp-3.22.0.tar.xz) = 8616b77c239aaa731312609f192c9b2c71d54b2cae42ff23efa23b5b3188778e
-SIZE (gnome3/yelp-3.22.0.tar.xz) = 1383500
+TIMESTAMP = 1525379562
+SHA256 (gnome3/yelp-3.28.1.tar.xz) = e88a5d05af20e497c50430b36fb523f8fda79a986359a6b7bd25910a2d2e7c0c
+SIZE (gnome3/yelp-3.28.1.tar.xz) = 1381180
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 102e56e6449e..b8a0aa443ef4 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -148,6 +148,7 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo
share/locale/zh_HK/LC_MESSAGES/yelp.mo
share/locale/zh_TW/LC_MESSAGES/yelp.mo
share/locale/zu/LC_MESSAGES/yelp.mo
+share/metainfo/yelp.appdata.xml
%%DATADIR%%-xsl/xslt/common/domains/yelp.xml
%%DATADIR%%/dtd/catalog
%%DATADIR%%/dtd/docbookx.dtd
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 080e7ebe5de3..1e81d845aa54 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= zenity
-PORTVERSION= 3.18.0
+PORTVERSION= 3.28.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Display GNOME dialogs from the command line
@@ -16,12 +16,12 @@ BUILD_DEPENDS= itstool:textproc/itstool
CONFLICTS= gtkada-1.2.* zenity-2.*
-USES= gettext gmake gnome pathfix pkgconfig perl5 tar:xz
-USE_GNOME= gnomeprefix gtk30 intlhack
+USES= gettext gmake gnome localbase pathfix pkgconfig \
+ perl5 tar:xz
+USE_GNOME= cairo gdkpixbuf2 gnomeprefix gtk30 intlhack
USE_XORG= x11
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ARGS= --disable-webkitgtk
OPTIONS_DEFINE= NOTIFY
OPTIONS_DEFAULT=NOTIFY
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index c11941ac22b2..d5a0601488ef 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/zenity-3.18.0.tar.xz) = 0efafea95a830f3bf6eca805ff4a8008df760a6ad3e81181b9473dcf721c3a69
-SIZE (gnome3/zenity-3.18.0.tar.xz) = 3876564
+TIMESTAMP = 1525379738
+SHA256 (gnome/zenity-3.28.1.tar.xz) = db179354721fb4e2d5c418e0dc41f09c831a6b2dd440e33f7743dfc266de8a6b
+SIZE (gnome/zenity-3.28.1.tar.xz) = 4458404
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index ebd99514e5cb..31a8dfa42002 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -13,6 +13,7 @@ share/help/C/zenity/figures/zenity-fileselection-screenshot.png
share/help/C/zenity/figures/zenity-forms-screenshot.png
share/help/C/zenity/figures/zenity-information-screenshot.png
share/help/C/zenity/figures/zenity-list-screenshot.png
+share/help/C/zenity/figures/zenity-notification-listen-screenshot.png
share/help/C/zenity/figures/zenity-notification-screenshot.png
share/help/C/zenity/figures/zenity-password-screenshot.png
share/help/C/zenity/figures/zenity-progress-screenshot.png
@@ -48,6 +49,7 @@ share/help/bg/zenity/figures/zenity-fileselection-screenshot.png
share/help/bg/zenity/figures/zenity-forms-screenshot.png
share/help/bg/zenity/figures/zenity-information-screenshot.png
share/help/bg/zenity/figures/zenity-list-screenshot.png
+share/help/bg/zenity/figures/zenity-notification-listen-screenshot.png
share/help/bg/zenity/figures/zenity-notification-screenshot.png
share/help/bg/zenity/figures/zenity-password-screenshot.png
share/help/bg/zenity/figures/zenity-progress-screenshot.png
@@ -83,6 +85,7 @@ share/help/ca/zenity/figures/zenity-fileselection-screenshot.png
share/help/ca/zenity/figures/zenity-forms-screenshot.png
share/help/ca/zenity/figures/zenity-information-screenshot.png
share/help/ca/zenity/figures/zenity-list-screenshot.png
+share/help/ca/zenity/figures/zenity-notification-listen-screenshot.png
share/help/ca/zenity/figures/zenity-notification-screenshot.png
share/help/ca/zenity/figures/zenity-password-screenshot.png
share/help/ca/zenity/figures/zenity-progress-screenshot.png
@@ -118,6 +121,7 @@ share/help/cs/zenity/figures/zenity-fileselection-screenshot.png
share/help/cs/zenity/figures/zenity-forms-screenshot.png
share/help/cs/zenity/figures/zenity-information-screenshot.png
share/help/cs/zenity/figures/zenity-list-screenshot.png
+share/help/cs/zenity/figures/zenity-notification-listen-screenshot.png
share/help/cs/zenity/figures/zenity-notification-screenshot.png
share/help/cs/zenity/figures/zenity-password-screenshot.png
share/help/cs/zenity/figures/zenity-progress-screenshot.png
@@ -153,6 +157,7 @@ share/help/da/zenity/figures/zenity-fileselection-screenshot.png
share/help/da/zenity/figures/zenity-forms-screenshot.png
share/help/da/zenity/figures/zenity-information-screenshot.png
share/help/da/zenity/figures/zenity-list-screenshot.png
+share/help/da/zenity/figures/zenity-notification-listen-screenshot.png
share/help/da/zenity/figures/zenity-notification-screenshot.png
share/help/da/zenity/figures/zenity-password-screenshot.png
share/help/da/zenity/figures/zenity-progress-screenshot.png
@@ -188,6 +193,7 @@ share/help/de/zenity/figures/zenity-fileselection-screenshot.png
share/help/de/zenity/figures/zenity-forms-screenshot.png
share/help/de/zenity/figures/zenity-information-screenshot.png
share/help/de/zenity/figures/zenity-list-screenshot.png
+share/help/de/zenity/figures/zenity-notification-listen-screenshot.png
share/help/de/zenity/figures/zenity-notification-screenshot.png
share/help/de/zenity/figures/zenity-password-screenshot.png
share/help/de/zenity/figures/zenity-progress-screenshot.png
@@ -223,6 +229,7 @@ share/help/el/zenity/figures/zenity-fileselection-screenshot.png
share/help/el/zenity/figures/zenity-forms-screenshot.png
share/help/el/zenity/figures/zenity-information-screenshot.png
share/help/el/zenity/figures/zenity-list-screenshot.png
+share/help/el/zenity/figures/zenity-notification-listen-screenshot.png
share/help/el/zenity/figures/zenity-notification-screenshot.png
share/help/el/zenity/figures/zenity-password-screenshot.png
share/help/el/zenity/figures/zenity-progress-screenshot.png
@@ -258,6 +265,7 @@ share/help/en_GB/zenity/figures/zenity-fileselection-screenshot.png
share/help/en_GB/zenity/figures/zenity-forms-screenshot.png
share/help/en_GB/zenity/figures/zenity-information-screenshot.png
share/help/en_GB/zenity/figures/zenity-list-screenshot.png
+share/help/en_GB/zenity/figures/zenity-notification-listen-screenshot.png
share/help/en_GB/zenity/figures/zenity-notification-screenshot.png
share/help/en_GB/zenity/figures/zenity-password-screenshot.png
share/help/en_GB/zenity/figures/zenity-progress-screenshot.png
@@ -293,6 +301,7 @@ share/help/es/zenity/figures/zenity-fileselection-screenshot.png
share/help/es/zenity/figures/zenity-forms-screenshot.png
share/help/es/zenity/figures/zenity-information-screenshot.png
share/help/es/zenity/figures/zenity-list-screenshot.png
+share/help/es/zenity/figures/zenity-notification-listen-screenshot.png
share/help/es/zenity/figures/zenity-notification-screenshot.png
share/help/es/zenity/figures/zenity-password-screenshot.png
share/help/es/zenity/figures/zenity-progress-screenshot.png
@@ -328,6 +337,7 @@ share/help/eu/zenity/figures/zenity-fileselection-screenshot.png
share/help/eu/zenity/figures/zenity-forms-screenshot.png
share/help/eu/zenity/figures/zenity-information-screenshot.png
share/help/eu/zenity/figures/zenity-list-screenshot.png
+share/help/eu/zenity/figures/zenity-notification-listen-screenshot.png
share/help/eu/zenity/figures/zenity-notification-screenshot.png
share/help/eu/zenity/figures/zenity-password-screenshot.png
share/help/eu/zenity/figures/zenity-progress-screenshot.png
@@ -363,6 +373,7 @@ share/help/fi/zenity/figures/zenity-fileselection-screenshot.png
share/help/fi/zenity/figures/zenity-forms-screenshot.png
share/help/fi/zenity/figures/zenity-information-screenshot.png
share/help/fi/zenity/figures/zenity-list-screenshot.png
+share/help/fi/zenity/figures/zenity-notification-listen-screenshot.png
share/help/fi/zenity/figures/zenity-notification-screenshot.png
share/help/fi/zenity/figures/zenity-password-screenshot.png
share/help/fi/zenity/figures/zenity-progress-screenshot.png
@@ -398,6 +409,7 @@ share/help/fr/zenity/figures/zenity-fileselection-screenshot.png
share/help/fr/zenity/figures/zenity-forms-screenshot.png
share/help/fr/zenity/figures/zenity-information-screenshot.png
share/help/fr/zenity/figures/zenity-list-screenshot.png
+share/help/fr/zenity/figures/zenity-notification-listen-screenshot.png
share/help/fr/zenity/figures/zenity-notification-screenshot.png
share/help/fr/zenity/figures/zenity-password-screenshot.png
share/help/fr/zenity/figures/zenity-progress-screenshot.png
@@ -433,6 +445,7 @@ share/help/gl/zenity/figures/zenity-fileselection-screenshot.png
share/help/gl/zenity/figures/zenity-forms-screenshot.png
share/help/gl/zenity/figures/zenity-information-screenshot.png
share/help/gl/zenity/figures/zenity-list-screenshot.png
+share/help/gl/zenity/figures/zenity-notification-listen-screenshot.png
share/help/gl/zenity/figures/zenity-notification-screenshot.png
share/help/gl/zenity/figures/zenity-password-screenshot.png
share/help/gl/zenity/figures/zenity-progress-screenshot.png
@@ -468,6 +481,7 @@ share/help/hu/zenity/figures/zenity-fileselection-screenshot.png
share/help/hu/zenity/figures/zenity-forms-screenshot.png
share/help/hu/zenity/figures/zenity-information-screenshot.png
share/help/hu/zenity/figures/zenity-list-screenshot.png
+share/help/hu/zenity/figures/zenity-notification-listen-screenshot.png
share/help/hu/zenity/figures/zenity-notification-screenshot.png
share/help/hu/zenity/figures/zenity-password-screenshot.png
share/help/hu/zenity/figures/zenity-progress-screenshot.png
@@ -503,6 +517,7 @@ share/help/ja/zenity/figures/zenity-fileselection-screenshot.png
share/help/ja/zenity/figures/zenity-forms-screenshot.png
share/help/ja/zenity/figures/zenity-information-screenshot.png
share/help/ja/zenity/figures/zenity-list-screenshot.png
+share/help/ja/zenity/figures/zenity-notification-listen-screenshot.png
share/help/ja/zenity/figures/zenity-notification-screenshot.png
share/help/ja/zenity/figures/zenity-password-screenshot.png
share/help/ja/zenity/figures/zenity-progress-screenshot.png
@@ -538,6 +553,7 @@ share/help/oc/zenity/figures/zenity-fileselection-screenshot.png
share/help/oc/zenity/figures/zenity-forms-screenshot.png
share/help/oc/zenity/figures/zenity-information-screenshot.png
share/help/oc/zenity/figures/zenity-list-screenshot.png
+share/help/oc/zenity/figures/zenity-notification-listen-screenshot.png
share/help/oc/zenity/figures/zenity-notification-screenshot.png
share/help/oc/zenity/figures/zenity-password-screenshot.png
share/help/oc/zenity/figures/zenity-progress-screenshot.png
@@ -561,6 +577,42 @@ share/help/oc/zenity/scale.page
share/help/oc/zenity/text.page
share/help/oc/zenity/usage.page
share/help/oc/zenity/warning.page
+share/help/pl/zenity/calendar.page
+share/help/pl/zenity/color-selection.page
+share/help/pl/zenity/entry.page
+share/help/pl/zenity/error.page
+share/help/pl/zenity/figures/zenity-calendar-screenshot.png
+share/help/pl/zenity/figures/zenity-colorselection-screenshot.png
+share/help/pl/zenity/figures/zenity-entry-screenshot.png
+share/help/pl/zenity/figures/zenity-error-screenshot.png
+share/help/pl/zenity/figures/zenity-fileselection-screenshot.png
+share/help/pl/zenity/figures/zenity-forms-screenshot.png
+share/help/pl/zenity/figures/zenity-information-screenshot.png
+share/help/pl/zenity/figures/zenity-list-screenshot.png
+share/help/pl/zenity/figures/zenity-notification-listen-screenshot.png
+share/help/pl/zenity/figures/zenity-notification-screenshot.png
+share/help/pl/zenity/figures/zenity-password-screenshot.png
+share/help/pl/zenity/figures/zenity-progress-screenshot.png
+share/help/pl/zenity/figures/zenity-question-screenshot.png
+share/help/pl/zenity/figures/zenity-scale-screenshot.png
+share/help/pl/zenity/figures/zenity-text-screenshot.png
+share/help/pl/zenity/figures/zenity-warning-screenshot.png
+share/help/pl/zenity/file-selection.page
+share/help/pl/zenity/forms.page
+share/help/pl/zenity/index.page
+share/help/pl/zenity/info.page
+share/help/pl/zenity/intro.page
+share/help/pl/zenity/legal.xml
+share/help/pl/zenity/list.page
+share/help/pl/zenity/message.page
+share/help/pl/zenity/notification.page
+share/help/pl/zenity/password.page
+share/help/pl/zenity/progress.page
+share/help/pl/zenity/question.page
+share/help/pl/zenity/scale.page
+share/help/pl/zenity/text.page
+share/help/pl/zenity/usage.page
+share/help/pl/zenity/warning.page
share/help/pt_BR/zenity/calendar.page
share/help/pt_BR/zenity/color-selection.page
share/help/pt_BR/zenity/entry.page
@@ -573,6 +625,7 @@ share/help/pt_BR/zenity/figures/zenity-fileselection-screenshot.png
share/help/pt_BR/zenity/figures/zenity-forms-screenshot.png
share/help/pt_BR/zenity/figures/zenity-information-screenshot.png
share/help/pt_BR/zenity/figures/zenity-list-screenshot.png
+share/help/pt_BR/zenity/figures/zenity-notification-listen-screenshot.png
share/help/pt_BR/zenity/figures/zenity-notification-screenshot.png
share/help/pt_BR/zenity/figures/zenity-password-screenshot.png
share/help/pt_BR/zenity/figures/zenity-progress-screenshot.png
@@ -608,6 +661,7 @@ share/help/ru/zenity/figures/zenity-fileselection-screenshot.png
share/help/ru/zenity/figures/zenity-forms-screenshot.png
share/help/ru/zenity/figures/zenity-information-screenshot.png
share/help/ru/zenity/figures/zenity-list-screenshot.png
+share/help/ru/zenity/figures/zenity-notification-listen-screenshot.png
share/help/ru/zenity/figures/zenity-notification-screenshot.png
share/help/ru/zenity/figures/zenity-password-screenshot.png
share/help/ru/zenity/figures/zenity-progress-screenshot.png
@@ -643,6 +697,7 @@ share/help/sl/zenity/figures/zenity-fileselection-screenshot.png
share/help/sl/zenity/figures/zenity-forms-screenshot.png
share/help/sl/zenity/figures/zenity-information-screenshot.png
share/help/sl/zenity/figures/zenity-list-screenshot.png
+share/help/sl/zenity/figures/zenity-notification-listen-screenshot.png
share/help/sl/zenity/figures/zenity-notification-screenshot.png
share/help/sl/zenity/figures/zenity-password-screenshot.png
share/help/sl/zenity/figures/zenity-progress-screenshot.png
@@ -678,6 +733,7 @@ share/help/sv/zenity/figures/zenity-fileselection-screenshot.png
share/help/sv/zenity/figures/zenity-forms-screenshot.png
share/help/sv/zenity/figures/zenity-information-screenshot.png
share/help/sv/zenity/figures/zenity-list-screenshot.png
+share/help/sv/zenity/figures/zenity-notification-listen-screenshot.png
share/help/sv/zenity/figures/zenity-notification-screenshot.png
share/help/sv/zenity/figures/zenity-password-screenshot.png
share/help/sv/zenity/figures/zenity-progress-screenshot.png
@@ -713,6 +769,7 @@ share/help/uk/zenity/figures/zenity-fileselection-screenshot.png
share/help/uk/zenity/figures/zenity-forms-screenshot.png
share/help/uk/zenity/figures/zenity-information-screenshot.png
share/help/uk/zenity/figures/zenity-list-screenshot.png
+share/help/uk/zenity/figures/zenity-notification-listen-screenshot.png
share/help/uk/zenity/figures/zenity-notification-screenshot.png
share/help/uk/zenity/figures/zenity-password-screenshot.png
share/help/uk/zenity/figures/zenity-progress-screenshot.png
@@ -748,6 +805,7 @@ share/help/zh_CN/zenity/figures/zenity-fileselection-screenshot.png
share/help/zh_CN/zenity/figures/zenity-forms-screenshot.png
share/help/zh_CN/zenity/figures/zenity-information-screenshot.png
share/help/zh_CN/zenity/figures/zenity-list-screenshot.png
+share/help/zh_CN/zenity/figures/zenity-notification-listen-screenshot.png
share/help/zh_CN/zenity/figures/zenity-notification-screenshot.png
share/help/zh_CN/zenity/figures/zenity-password-screenshot.png
share/help/zh_CN/zenity/figures/zenity-progress-screenshot.png
@@ -801,6 +859,7 @@ share/locale/eu/LC_MESSAGES/zenity.mo
share/locale/fa/LC_MESSAGES/zenity.mo
share/locale/fi/LC_MESSAGES/zenity.mo
share/locale/fr/LC_MESSAGES/zenity.mo
+share/locale/fur/LC_MESSAGES/zenity.mo
share/locale/ga/LC_MESSAGES/zenity.mo
share/locale/gl/LC_MESSAGES/zenity.mo
share/locale/gu/LC_MESSAGES/zenity.mo