diff options
Diffstat (limited to 'sysutils/cinnamon-settings-daemon')
5 files changed, 68 insertions, 40 deletions
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile index 7583f7ab729a..8708ffb712a7 100644 --- a/sysutils/cinnamon-settings-daemon/Makefile +++ b/sysutils/cinnamon-settings-daemon/Makefile @@ -1,6 +1,5 @@ PORTNAME= cinnamon-settings-daemon -PORTVERSION= 5.4.4 -PORTREVISION= 6 +DISTVERSION= 6.4.3 CATEGORIES= sysutils gnome DIST_SUBDIR= gnome @@ -13,29 +12,22 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB -BUILD_DEPENDS= cinnamon-session:x11/cinnamon-session \ - gln:sysutils/coreutils +BUILD_DEPENDS= gln:sysutils/coreutils LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ - libpolkit-gobject-1.so:sysutils/polkit \ - libgudev-1.0.so:devel/libgudev \ - libcolord.so:graphics/colord \ - liblcms2.so:graphics/lcms2 \ libcinnamon-desktop.so:x11/cinnamon-desktop \ libxklavier.so:x11/libxklavier \ libnspr4.so:devel/nspr \ - libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libupower-glib.so:sysutils/upower \ libpulse.so:audio/pulseaudio \ - libnotify.so:devel/libnotify \ - libharfbuzz.so:print/harfbuzz + libnotify.so:devel/libnotify RUN_DEPENDS= cinnamon-session:x11/cinnamon-session -USES= compiler:c11 gettext-tools gnome localbase meson pkgconfig \ +USES= compiler:c11 gettext-runtime gnome meson pkgconfig \ python:build shebangfix xorg -USE_GNOME= cairo dconf gdkpixbuf gtk30 intltool libgnomekbd pango -USE_XORG= x11 xext xfixes xi +USE_GNOME= cairo dconf gdkpixbuf glib20 gtk30 libgnomekbd pango +USE_XORG= x11 xext xfixes xi xorgproto USE_GITHUB= yes GH_ACCOUNT= linuxmint @@ -58,25 +50,33 @@ GLIB_SCHEMAS= org.cinnamon.settings-daemon.enums.xml \ org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml \ org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml -OPTIONS_DEFINE= CUPS SMARTCARD WACOM -OPTIONS_DEFAULT=CUPS SMARTCARD WACOM -OPTIONS_SUB= yes +OPTIONS_DEFINE= COLORD CUPS GUDEV POLKIT SMARTCARD WACOM +OPTIONS_DEFAULT= COLORD CUPS GUDEV POLKIT SMARTCARD WACOM +OPTIONS_SUB= yes + +COLORD_MESON_ENABLED= use_color +COLORD_LIB_DEPENDS= libcolord.so:graphics/colord \ + liblcms2.so:graphics/lcms2 CUPS_MESON_ENABLED= use_cups CUPS_LIB_DEPENDS= libcups.so:print/cups -SMARTCARD_DESC= Smartcard support -SMARTCARD_MESON_ENABLED= use_smartcard +GUDEV_DESC= GUdev support +GUDEV_MESON_ENABLED= use_gudev +GUDEV_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev + +POLKIT_DESC= Polkit support +POLKIT_MESON_ENABLED= use_polkit +POLKIT_LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit + +SMARTCARD_DESC= Smartcard support +SMARTCARD_MESON_ENABLED=use_smartcard SMARTCARD_LIB_DEPENDS= libnss3.so:security/nss -WACOM_DESC= Tablet support with libwacom +WACOM_DESC= Tablet support with libwacom WACOM_MESON_ENABLED= use_wacom WACOM_LIB_DEPENDS= libwacom.so:x11/libwacom -WACOM_USE= gnome=librsvg2 - -post-patch: - # Adhere to our hier(7). - @${MKDIR} ${WRKSRC}/files${PREFIX} - @${MV} ${WRKSRC}/files/usr/share ${WRKSRC}/files${PREFIX} +WACOM_USE= GNOME=librsvg2 +WACOM_IMPLIES= GUDEV .include <bsd.port.mk> diff --git a/sysutils/cinnamon-settings-daemon/distinfo b/sysutils/cinnamon-settings-daemon/distinfo index 4ba7e767eb4d..fcac620fdb32 100644 --- a/sysutils/cinnamon-settings-daemon/distinfo +++ b/sysutils/cinnamon-settings-daemon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660020382 -SHA256 (gnome/linuxmint-cinnamon-settings-daemon-5.4.4_GH0.tar.gz) = 65397117ad19419a6bdff38b10231148aca59d57284c6a79f517332eb70debc5 -SIZE (gnome/linuxmint-cinnamon-settings-daemon-5.4.4_GH0.tar.gz) = 573207 +TIMESTAMP = 1736224680 +SHA256 (gnome/linuxmint-cinnamon-settings-daemon-6.4.3_GH0.tar.gz) = e7acab8453d084dbc97347145be287a65fc513b1a5629d16587be60367a97fdd +SIZE (gnome/linuxmint-cinnamon-settings-daemon-6.4.3_GH0.tar.gz) = 601452 diff --git a/sysutils/cinnamon-settings-daemon/files/patch-plugins_datetime_system-timezone.c b/sysutils/cinnamon-settings-daemon/files/patch-plugins_datetime_system-timezone.c new file mode 100644 index 000000000000..161a92d10327 --- /dev/null +++ b/sysutils/cinnamon-settings-daemon/files/patch-plugins_datetime_system-timezone.c @@ -0,0 +1,22 @@ +--- plugins/datetime/system-timezone.c.orig 2025-07-10 21:28:09 UTC ++++ plugins/datetime/system-timezone.c +@@ -547,11 +547,19 @@ recursive_compare (struct stat *localtime_stat, + CompareFiles compare_func) + { + struct stat file_stat; ++ char *relpath = NULL; + + if (g_stat (file, &file_stat) != 0) + return NULL; + + if (S_ISREG (file_stat.st_mode)) { ++ relpath = system_timezone_strip_path_if_valid (file); ++ if (g_strstr_len (relpath, -1, "/") == NULL) { ++ g_free (relpath); ++ return NULL; ++ } ++ g_free (relpath); ++ + if (compare_func (localtime_stat, + &file_stat, + localtime_content, diff --git a/sysutils/cinnamon-settings-daemon/pkg-descr b/sysutils/cinnamon-settings-daemon/pkg-descr index f39386636c3a..b787adf31fa4 100644 --- a/sysutils/cinnamon-settings-daemon/pkg-descr +++ b/sysutils/cinnamon-settings-daemon/pkg-descr @@ -1 +1,3 @@ -cinnamon settings daemon. +Cinnamon-settings-daemon is a collection of plugins. +These plugins are started by cinnamon-session when you log in. +The plugins run in the background, each with its own process. diff --git a/sysutils/cinnamon-settings-daemon/pkg-plist b/sysutils/cinnamon-settings-daemon/pkg-plist index 07ea20b74caf..637401c59d14 100644 --- a/sysutils/cinnamon-settings-daemon/pkg-plist +++ b/sysutils/cinnamon-settings-daemon/pkg-plist @@ -1,15 +1,16 @@ bin/csd-a11y-settings bin/csd-automount bin/csd-background -bin/csd-backlight-helper +%%GUDEV%%bin/csd-backlight-helper bin/csd-clipboard -bin/csd-color -bin/csd-datetime-mechanism +%%COLORD%%bin/csd-color +%%POLKIT%%bin/csd-datetime-mechanism bin/csd-housekeeping bin/csd-input-helper bin/csd-keyboard bin/csd-media-keys bin/csd-power +bin/csd-settings-remap %%CUPS%%bin/csd-print-notifications %%CUPS%%bin/csd-printer bin/csd-screensaver-proxy @@ -20,11 +21,12 @@ etc/xdg/autostart/cinnamon-settings-daemon-a11y-settings.desktop etc/xdg/autostart/cinnamon-settings-daemon-automount.desktop etc/xdg/autostart/cinnamon-settings-daemon-background.desktop etc/xdg/autostart/cinnamon-settings-daemon-clipboard.desktop -etc/xdg/autostart/cinnamon-settings-daemon-color.desktop +%%COLORD%%etc/xdg/autostart/cinnamon-settings-daemon-color.desktop etc/xdg/autostart/cinnamon-settings-daemon-housekeeping.desktop etc/xdg/autostart/cinnamon-settings-daemon-keyboard.desktop etc/xdg/autostart/cinnamon-settings-daemon-media-keys.desktop etc/xdg/autostart/cinnamon-settings-daemon-power.desktop +etc/xdg/autostart/cinnamon-settings-daemon-settings-remap.desktop %%CUPS%%etc/xdg/autostart/cinnamon-settings-daemon-print-notifications.desktop etc/xdg/autostart/cinnamon-settings-daemon-screensaver-proxy.desktop %%SMARTCARD%%etc/xdg/autostart/cinnamon-settings-daemon-smartcard.desktop @@ -35,15 +37,16 @@ lib/cinnamon-settings-daemon-3.0/libcsd.so lib/cinnamon-settings-daemon/csd-a11y-settings lib/cinnamon-settings-daemon/csd-automount lib/cinnamon-settings-daemon/csd-background -lib/cinnamon-settings-daemon/csd-backlight-helper +%%GUDEV%%lib/cinnamon-settings-daemon/csd-backlight-helper lib/cinnamon-settings-daemon/csd-clipboard -lib/cinnamon-settings-daemon/csd-color -lib/cinnamon-settings-daemon/csd-datetime-mechanism +%%COLORD%%lib/cinnamon-settings-daemon/csd-color +%%POLKIT%%lib/cinnamon-settings-daemon/csd-datetime-mechanism lib/cinnamon-settings-daemon/csd-housekeeping lib/cinnamon-settings-daemon/csd-input-helper lib/cinnamon-settings-daemon/csd-keyboard lib/cinnamon-settings-daemon/csd-media-keys lib/cinnamon-settings-daemon/csd-power +lib/cinnamon-settings-daemon/csd-settings-remap %%CUPS%%lib/cinnamon-settings-daemon/csd-print-notifications %%CUPS%%lib/cinnamon-settings-daemon/csd-printer lib/cinnamon-settings-daemon/csd-screensaver-proxy @@ -54,15 +57,16 @@ libdata/pkgconfig/cinnamon-settings-daemon.pc libexec/csd-a11y-settings libexec/csd-automount libexec/csd-background -libexec/csd-backlight-helper +%%GUDEV%%libexec/csd-backlight-helper libexec/csd-clipboard -libexec/csd-color -libexec/csd-datetime-mechanism +%%COLORD%%libexec/csd-color +%%POLKIT%%libexec/csd-datetime-mechanism libexec/csd-housekeeping libexec/csd-input-helper libexec/csd-keyboard libexec/csd-media-keys libexec/csd-power +libexec/csd-settings-remap %%CUPS%%libexec/csd-print-notifications %%CUPS%%libexec/csd-printer libexec/csd-screensaver-proxy |