diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index c1b705cab9cc..0c1e1b2a6cb4 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -1,76 +1,77 @@ PORTNAME= gnome-settings-daemon -PORTVERSION= 42.2 -PORTREVISION= 9 +PORTVERSION= 47.2 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome -PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/ -PATCHFILES+= 03739474621e.patch:-p1 # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300 - MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME settings daemon -WWW= https://www.gnome.org/ +WWW= https://gitlab.gnome.org/GNOME/gnome-settings-daemon + +LICENSE= GPLv2+ LGPL21+ +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+= ${WRKSRC}/COPYING +LICENSE_FILE_LGPL21+= ${WRKSRC}/COPYING.LIB -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING +PORTSCOUT= limit:^47\. +BUILD_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libcanberra.so:audio/libcanberra \ libcolord.so:graphics/colord \ libcups.so:print/cups \ libfontconfig.so:x11-fonts/fontconfig \ libgeoclue-2.so:net/geoclue \ libgeocode-glib-2.so:net/geocode-glib2 \ libgweather-4.so:net/libgweather4 \ liblcms2.so:graphics/lcms2 \ libnotify.so:devel/libnotify \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libpolkit-gobject-1.so:sysutils/polkit \ libpulse.so:audio/pulseaudio \ - libupower-glib.so:sysutils/upower - -PORTSCOUT= limitw:1,even + libupower-glib.so:sysutils/upower \ + libp11-kit.so:security/p11-kit \ + libgcr-4.so:security/gcr -USE_XORG= x11 xext xi xtst -USE_GNOME= cairo gnomedesktop3 gtk30 +USE_XORG= x11 xext xfixes xi xtst +USE_GNOME= cairo glib20 gnomedesktop3 gtk30 USES= gettext gnome localbase:ldflags meson perl5 pkgconfig \ python:build tar:xz xorg USE_PERL5= build -# -Dnssdb_dir=${LOCALBASE}/share/certs/ca-root-nss.crt MESON_ARGS= -Dalsa=false \ - -Dcolord=false \ -Dcups=true \ -Dnetwork_manager=false \ - -Dnssdb_dir=${LOCALBASE}/share/certs/ \ -Drfkill=false \ -Dsmartcard=true \ + -Dusb-protection=false \ -Dsystemd=false \ -Dwwan=false BINARY_ALIAS= python3=${PYTHON_VERSION} -# wayland doesn't build yet, undefined symbol -MESON_ARGS+= -Dgudev=false \ - -Dwayland=false -#WAYLAND_MESON_TRUE= wayland gudev -#WAYLAND_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev \ -# libwayland-client.so:graphics/wayland +OPTIONS_DEFINE= WAYLAND +OPTIONS_DEFAULT= WAYLAND +OPTIONS_SUB= yes + +WAYLAND_MESON_TRUE= wayland gudev +WAYLAND_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev \ + libwayland-client.so:graphics/wayland + +PLIST_SUB= VERSION=${PORTVERSION:C/^([0-9]+)\..*/\1/} 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.gschema.xml \ - org.gnome.settings-daemon.plugins.housekeeping.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.sharing.gschema.xml \ org.gnome.settings-daemon.plugins.xsettings.gschema.xml post-install: ${INSTALL_DATA} ${FILESDIR}/org.gnome.settings-daemon.plugins.power.gschema.xml.override \ ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/ .include diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo index 8c2646f03d89..267361e50dd1 100644 --- a/sysutils/gnome-settings-daemon/distinfo +++ b/sysutils/gnome-settings-daemon/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1654141293 -SHA256 (gnome/gnome-settings-daemon-42.2.tar.xz) = 9c449714aa8ec1271c0db5137df3458195943f05ccd0ac8935d93397770bab00 -SIZE (gnome/gnome-settings-daemon-42.2.tar.xz) = 1483864 -SHA256 (gnome/03739474621e.patch) = 885f142e092363362b5716eb6f3d9690db938a31f95ff38f17828649c4271280 -SIZE (gnome/03739474621e.patch) = 1270 +TIMESTAMP = 1743436584 +SHA256 (gnome/gnome-settings-daemon-47.2.tar.xz) = 1eb758862e888f55a0869193087f1cfbcc7a1163654e630099ff4342dd3f6a5a +SIZE (gnome/gnome-settings-daemon-47.2.tar.xz) = 1480428 diff --git a/sysutils/gnome-settings-daemon/files/patch-data_meson.build b/sysutils/gnome-settings-daemon/files/patch-data_meson.build new file mode 100644 index 000000000000..dcf1f5a8d559 --- /dev/null +++ b/sysutils/gnome-settings-daemon/files/patch-data_meson.build @@ -0,0 +1,10 @@ +--- data/meson.build.orig 2022-09-17 21:37:19 UTC ++++ data/meson.build +@@ -5,7 +5,6 @@ schemas = [ + 'org.gnome.settings-daemon.peripherals.wacom.gschema.xml', + 'org.gnome.settings-daemon.plugins.gschema.xml', + 'org.gnome.settings-daemon.plugins.color.gschema.xml', +- 'org.gnome.settings-daemon.plugins.housekeeping.gschema.xml', + 'org.gnome.settings-daemon.plugins.media-keys.gschema.xml', + 'org.gnome.settings-daemon.plugins.power.gschema.xml', + 'org.gnome.settings-daemon.plugins.sharing.gschema.xml', diff --git a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in new file mode 100644 index 000000000000..9cad1cc9fe2b --- /dev/null +++ b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.gschema.xml.in @@ -0,0 +1,10 @@ +--- data/org.gnome.settings-daemon.plugins.gschema.xml.in.orig 2022-09-17 21:37:19 UTC ++++ data/org.gnome.settings-daemon.plugins.gschema.xml.in +@@ -10,7 +10,6 @@ + + + +- + + + diff --git a/sysutils/gnome-settings-daemon/files/patch-meson.build b/sysutils/gnome-settings-daemon/files/patch-meson.build deleted file mode 100644 index 118acd8027ef..000000000000 --- a/sysutils/gnome-settings-daemon/files/patch-meson.build +++ /dev/null @@ -1,13 +0,0 @@ -XXX push upstream - -Index: meson.build ---- meson.build.orig 2022-03-19 23:08:57 UTC -+++ meson.build -@@ -97,7 +97,6 @@ gweather_dep = dependency('gweather4') - gtk_dep = dependency('gtk+-3.0', version: '>= 3.15.3') - gtk_x11_dep = dependency('gtk+-x11-3.0') - gweather_dep = dependency('gweather4') --lcms_dep = dependency('lcms2', version: '>= 2.2') - libcanberra_gtk_dep = dependency('libcanberra-gtk3') - libgeoclue_dep = dependency('libgeoclue-2.0', version: '>= 2.3.1') - libnotify_dep = dependency('libnotify', version: '>= 0.7.3') diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_meson.build b/sysutils/gnome-settings-daemon/files/patch-plugins_meson.build new file mode 100644 index 000000000000..1c55859dd23a --- /dev/null +++ b/sysutils/gnome-settings-daemon/files/patch-plugins_meson.build @@ -0,0 +1,15 @@ +--- plugins/meson.build.orig 2024-03-16 22:14:58 UTC ++++ plugins/meson.build +@@ -52,6 +52,12 @@ endif + disabled_plugins += ['print-notifications'] + endif + ++# It requires org.freedesktop.timedate1 service (systemd/elogind stuff) ++disabled_plugins += ['datetime', 'sharing'] ++ ++# It requires org.freedesktop.systemd1 service ++disabled_plugins += ['housekeeping'] ++ + # Specify futher required units, 'before' or 'after' may be specified if ordering is needed + plugin_gate_units = { + 'xsettings': [ diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist index 0785c66eaa87..45c5b0794bc0 100644 --- a/sysutils/gnome-settings-daemon/pkg-plist +++ b/sysutils/gnome-settings-daemon/pkg-plist @@ -1,134 +1,132 @@ etc/xdg/Xwayland-session.d/00-xrdb etc/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.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.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.UsbProtection.desktop etc/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop etc/xdg/autostart/org.gnome.SettingsDaemon.Wwan.desktop etc/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop -include/gnome-settings-daemon-42/gnome-settings-daemon/gsd-enums.h -lib/gnome-settings-daemon-42/libgsd.so +include/gnome-settings-daemon-%%VERSION%%/gnome-settings-daemon/gsd-enums.h +lib/gnome-settings-daemon-%%VERSION%%/libgsd.so libdata/pkgconfig/gnome-settings-daemon.pc libexec/gsd-a11y-settings -libexec/gsd-datetime -libexec/gsd-housekeeping +libexec/gsd-color libexec/gsd-keyboard libexec/gsd-media-keys libexec/gsd-power libexec/gsd-print-notifications libexec/gsd-printer libexec/gsd-screensaver-proxy -libexec/gsd-sharing libexec/gsd-smartcard libexec/gsd-sound -libexec/gsd-usb-protection libexec/gsd-xsettings share/GConf/gsettings/gnome-settings-daemon.convert -%%DATADIR%%/datetime/backward +share/locale/ab/LC_MESSAGES/gnome-settings-daemon.mo 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 share/locale/as/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ast/LC_MESSAGES/gnome-settings-daemon.mo share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo share/locale/bg/LC_MESSAGES/gnome-settings-daemon.mo share/locale/bn/LC_MESSAGES/gnome-settings-daemon.mo share/locale/bn_IN/LC_MESSAGES/gnome-settings-daemon.mo share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ckb/LC_MESSAGES/gnome-settings-daemon.mo share/locale/crh/LC_MESSAGES/gnome-settings-daemon.mo share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo share/locale/de/LC_MESSAGES/gnome-settings-daemon.mo share/locale/dz/LC_MESSAGES/gnome-settings-daemon.mo share/locale/el/LC_MESSAGES/gnome-settings-daemon.mo share/locale/en@shaw/LC_MESSAGES/gnome-settings-daemon.mo share/locale/en_CA/LC_MESSAGES/gnome-settings-daemon.mo share/locale/en_GB/LC_MESSAGES/gnome-settings-daemon.mo share/locale/eo/LC_MESSAGES/gnome-settings-daemon.mo share/locale/es/LC_MESSAGES/gnome-settings-daemon.mo share/locale/et/LC_MESSAGES/gnome-settings-daemon.mo 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/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 share/locale/hr/LC_MESSAGES/gnome-settings-daemon.mo share/locale/hu/LC_MESSAGES/gnome-settings-daemon.mo share/locale/id/LC_MESSAGES/gnome-settings-daemon.mo share/locale/is/LC_MESSAGES/gnome-settings-daemon.mo share/locale/it/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ja/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ka/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/kab/LC_MESSAGES/gnome-settings-daemon.mo share/locale/kk/LC_MESSAGES/gnome-settings-daemon.mo share/locale/km/LC_MESSAGES/gnome-settings-daemon.mo share/locale/kn/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ko/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo share/locale/lt/LC_MESSAGES/gnome-settings-daemon.mo share/locale/lv/LC_MESSAGES/gnome-settings-daemon.mo share/locale/mai/LC_MESSAGES/gnome-settings-daemon.mo share/locale/mg/LC_MESSAGES/gnome-settings-daemon.mo share/locale/mk/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ml/LC_MESSAGES/gnome-settings-daemon.mo share/locale/mn/LC_MESSAGES/gnome-settings-daemon.mo share/locale/mr/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ms/LC_MESSAGES/gnome-settings-daemon.mo share/locale/nb/LC_MESSAGES/gnome-settings-daemon.mo share/locale/nds/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ne/LC_MESSAGES/gnome-settings-daemon.mo share/locale/nl/LC_MESSAGES/gnome-settings-daemon.mo share/locale/nn/LC_MESSAGES/gnome-settings-daemon.mo share/locale/nso/LC_MESSAGES/gnome-settings-daemon.mo share/locale/oc/LC_MESSAGES/gnome-settings-daemon.mo share/locale/or/LC_MESSAGES/gnome-settings-daemon.mo share/locale/pa/LC_MESSAGES/gnome-settings-daemon.mo share/locale/pl/LC_MESSAGES/gnome-settings-daemon.mo share/locale/pt/LC_MESSAGES/gnome-settings-daemon.mo share/locale/pt_BR/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ro/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ru/LC_MESSAGES/gnome-settings-daemon.mo share/locale/rw/LC_MESSAGES/gnome-settings-daemon.mo share/locale/si/LC_MESSAGES/gnome-settings-daemon.mo share/locale/sk/LC_MESSAGES/gnome-settings-daemon.mo share/locale/sl/LC_MESSAGES/gnome-settings-daemon.mo share/locale/sq/LC_MESSAGES/gnome-settings-daemon.mo share/locale/sr/LC_MESSAGES/gnome-settings-daemon.mo share/locale/sr@latin/LC_MESSAGES/gnome-settings-daemon.mo share/locale/sv/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ta/LC_MESSAGES/gnome-settings-daemon.mo share/locale/te/LC_MESSAGES/gnome-settings-daemon.mo share/locale/tg/LC_MESSAGES/gnome-settings-daemon.mo share/locale/th/LC_MESSAGES/gnome-settings-daemon.mo share/locale/tr/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ug/LC_MESSAGES/gnome-settings-daemon.mo share/locale/uk/LC_MESSAGES/gnome-settings-daemon.mo share/locale/vi/LC_MESSAGES/gnome-settings-daemon.mo share/locale/wa/LC_MESSAGES/gnome-settings-daemon.mo share/locale/xh/LC_MESSAGES/gnome-settings-daemon.mo 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