Date: Wed, 23 Mar 2022 18:01:47 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 54fd0fc758f3 - main - sysutils/gnome-settings-daemon: Update to 42.1 Message-ID: <202203231801.22NI1lkm069195@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=54fd0fc758f3c41b47067b0d6ce9c44fd2c91433 commit 54fd0fc758f3c41b47067b0d6ce9c44fd2c91433 Author: Neel Chauhan <nc@FreeBSD.org> AuthorDate: 2022-03-23 03:59:32 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-03-23 18:01:11 +0000 sysutils/gnome-settings-daemon: Update to 42.1 --- .../patch-panels_user-accounts_cc-realm-manager.c | 24 ----------- sysutils/gnome-settings-daemon/Makefile | 49 +++++++++++----------- sysutils/gnome-settings-daemon/distinfo | 8 ++-- .../gnome-settings-daemon/files/patch-meson.build | 32 +++++--------- ...tch-plugins_media-keys_gsd-media-keys-manager.c | 4 +- .../files/patch-plugins_power_gsd-backlight.c | 15 ------- .../files/patch-plugins_power_gsd-power-manager.c | 7 +++- sysutils/gnome-settings-daemon/pkg-plist | 5 +-- 8 files changed, 45 insertions(+), 99 deletions(-) diff --git a/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c b/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c deleted file mode 100644 index 4f258c021e91..000000000000 --- a/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c +++ /dev/null @@ -1,24 +0,0 @@ -http://git.pld-linux.org/gitweb.cgi?p=packages/gnome-control-center.git;a=blob;f=krb5.patch;h=260e9aac087453b798dc58b23bbc79705e6172d9;hb=49c1b881b47743e0c76eaf9158a37fd6532c111f - ---- panels/user-accounts/cc-realm-manager.c.orig 2021-09-17 20:48:56 UTC -+++ panels/user-accounts/cc-realm-manager.c -@@ -22,7 +22,7 @@ - - #include "cc-realm-manager.h" - --#include <krb5/krb5.h> -+#include <krb5.h> - - #include <glib.h> - #include <glib/gi18n.h> -@@ -637,8 +637,10 @@ login_perform_kinit (krb5_context k5, - code = krb5_get_init_creds_opt_alloc (k5, &opts); - g_return_val_if_fail (code == 0, code); - -+#ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_OUT_CCACHE - code = krb5_get_init_creds_opt_set_out_ccache (k5, opts, ccache); - g_return_val_if_fail (code == 0, code); -+#endif - - code = krb5_get_init_creds_password (k5, &creds, principal, - (char *)password, diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index b1b5f7c425f6..0b7879902fc5 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -1,56 +1,55 @@ # Created by: Koop Mast <kwm@FreeBSD.org> PORTNAME= gnome-settings-daemon -PORTVERSION= 3.38.2 +PORTVERSION= 42.1 CATEGORIES= sysutils gnome -MASTER_SITES= GNOME +MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome -PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/ -PATCHFILES+= 28e28e9e5983.patch:-p1 # meson >= 0.60 - MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 3 settings daemon LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libcanberra.so:audio/libcanberra \ - libcanberra-gtk3.so:audio/libcanberra-gtk3 \ - libpolkit-gobject-1.so:sysutils/polkit \ - libfontconfig.so:x11-fonts/fontconfig \ +LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \ + libcanberra.so:audio/libcanberra \ libcolord.so:graphics/colord \ - liblcms2.so:graphics/lcms2 \ - libpulse.so:audio/pulseaudio \ - libnotify.so:devel/libnotify \ + libcups.so:print/cups \ + libfontconfig.so:x11-fonts/fontconfig \ libgeoclue-2.so:net/geoclue \ - libupower-glib.so:sysutils/upower \ libgeocode-glib.so:net/geocode-glib \ - libgweather-3.so:net/libgweather \ - libcups.so:print/cups \ + libgweather-4.so:net/libgweather4 \ + liblcms2.so:graphics/lcms2 \ + libnotify.so:devel/libnotify \ + libnspr4.so:devel/nspr \ libnss3.so:security/nss \ - libnspr4.so:devel/nspr + libpolkit-gobject-1.so:sysutils/polkit \ + libpulse.so:audio/pulseaudio \ + libupower-glib.so:sysutils/upower PORTSCOUT= limitw:1,even USE_XORG= x11 xext xi xtst USE_GNOME= cairo gnomedesktop3 gtk30 -USES= gettext gnome localbase:ldflags meson perl5 \ - pkgconfig python:3.6+,build tar:xz xorg +USES= gettext gnome localbase:ldflags meson perl5 pkgconfig \ + python:3.6+,build tar:xz xorg USE_PERL5= build # -Dnssdb_dir=${LOCALBASE}/share/certs/ca-root-nss.crt -MESON_ARGS= -Dnssdb_dir=${LOCALBASE}/share/certs/ \ - -Dalsa=false \ - -Drfkill=false \ +MESON_ARGS= -Dalsa=false \ + -Dcolord=false \ + -Dcups=true \ -Dnetwork_manager=false \ + -Dnssdb_dir=${LOCALBASE}/share/certs/ \ + -Drfkill=false \ + -Dsmartcard=true \ -Dsystemd=false \ - -Dwwan=false \ - -Dcups=true \ - -Dsmartcard=true + -Dwwan=false BINARY_ALIAS= python3=${PYTHON_VERSION} # wayland doesn't build yet, undefined symbol -MESON_ARGS+= -Dwayland=false -Dgudev=false +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 diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo index e010b89864ed..2c5248a0b2a8 100644 --- a/sysutils/gnome-settings-daemon/distinfo +++ b/sysutils/gnome-settings-daemon/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1620259243 -SHA256 (gnome/gnome-settings-daemon-3.38.2.tar.xz) = 32c3d516cce1115ef08ef25f3a718d163b7b333b9068ccf2a6806ddcf21dd78c -SIZE (gnome/gnome-settings-daemon-3.38.2.tar.xz) = 1439328 -SHA256 (gnome/28e28e9e5983.patch) = e12a423f16d68e6fd7fe9c2953b77c25aef85ca39d757f5e6debd53f266e0292 -SIZE (gnome/28e28e9e5983.patch) = 909 +TIMESTAMP = 1648008111 +SHA256 (gnome/gnome-settings-daemon-42.1.tar.xz) = ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb +SIZE (gnome/gnome-settings-daemon-42.1.tar.xz) = 1481432 diff --git a/sysutils/gnome-settings-daemon/files/patch-meson.build b/sysutils/gnome-settings-daemon/files/patch-meson.build index ee32689ddd99..118acd8027ef 100644 --- a/sysutils/gnome-settings-daemon/files/patch-meson.build +++ b/sysutils/gnome-settings-daemon/files/patch-meson.build @@ -1,25 +1,13 @@ -$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... +XXX push upstream Index: meson.build ---- meson.build.orig +--- meson.build.orig 2022-03-19 23:08:57 UTC +++ 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') +@@ -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_media-keys_gsd-media-keys-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c index 45356a95485a..622b22e15b09 100644 --- a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c +++ b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c @@ -1,9 +1,7 @@ -$OpenBSD: patch-plugins_media-keys_gsd-media-keys-manager_c,v 1.17 2020/05/14 15:04:21 ajacoutot Exp $ - Inhibit support (login1 -> ConsoleKit). Index: plugins/media-keys/gsd-media-keys-manager.c ---- plugins/media-keys/gsd-media-keys-manager.c.orig 2020-09-13 22:34:14 UTC +--- plugins/media-keys/gsd-media-keys-manager.c.orig +++ plugins/media-keys/gsd-media-keys-manager.c @@ -123,9 +123,9 @@ static const gchar introspection_xml[] = #define VOLUME_STEP_PRECISE 2 diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c b/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c deleted file mode 100644 index 648b0769f04d..000000000000 --- a/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/power/gsd-backlight.c.orig 2020-09-13 22:34:14 UTC -+++ plugins/power/gsd-backlight.c -@@ -61,9 +61,9 @@ enum { - PROP_LAST, - }; - --#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" --#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1/session/auto" --#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Session" -+#define SYSTEMD_DBUS_NAME "org.freedesktop.ConsoleKit" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager" - - static GParamSpec *props[PROP_LAST]; - diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c index ab7154d1d795..9ff66efa7d0d 100644 --- a/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c +++ b/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c @@ -1,6 +1,9 @@ ---- plugins/power/gsd-power-manager.c.orig 2020-09-13 22:34:14 UTC +Inhibit support (login1 -> ConsoleKit). + +Index: plugins/power/gsd-power-manager.c +--- plugins/power/gsd-power-manager.c.orig +++ plugins/power/gsd-power-manager.c -@@ -70,9 +70,9 @@ +@@ -74,9 +74,9 @@ #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_SHORT 10 * 1000 /* ms */ #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */ diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist index b6498d295789..0785c66eaa87 100644 --- a/sysutils/gnome-settings-daemon/pkg-plist +++ b/sysutils/gnome-settings-daemon/pkg-plist @@ -16,11 +16,10 @@ etc/xdg/autostart/org.gnome.SettingsDaemon.UsbProtection.desktop etc/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop etc/xdg/autostart/org.gnome.SettingsDaemon.Wwan.desktop etc/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop -include/gnome-settings-daemon-3.0/gnome-settings-daemon/gsd-enums.h -lib/gnome-settings-daemon-3.0/libgsd.so +include/gnome-settings-daemon-42/gnome-settings-daemon/gsd-enums.h +lib/gnome-settings-daemon-42/libgsd.so libdata/pkgconfig/gnome-settings-daemon.pc libexec/gsd-a11y-settings -libexec/gsd-color libexec/gsd-datetime libexec/gsd-housekeeping libexec/gsd-keyboard
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203231801.22NI1lkm069195>