diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile index 839a763292a0..7b45a0f70a5d 100644 --- a/x11/cinnamon-desktop/Makefile +++ b/x11/cinnamon-desktop/Makefile @@ -1,61 +1,65 @@ PORTNAME= cinnamon-desktop -PORTVERSION= 5.4.2 -PORTREVISION= 5 +DISTVERSION= 6.4.1 CATEGORIES= x11 gnome DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Additional UI API for cinnamon WWW= https://github.com/linuxmint/cinnamon-desktop LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB BUILD_DEPENDS= xkeyboard-config>=0:x11/xkeyboard-config \ - libxkbfile>=0:x11/libxkbfile -LIB_DEPENDS= libpulse.so:audio/pulseaudio + libxkbfile>=0:x11/libxkbfile \ + iso-codes>=0:misc/iso-codes +LIB_DEPENDS= libpulse.so:audio/pulseaudio \ + libudev.so:devel/libudev-devd RUN_DEPENDS= xkeyboard-config>=0:x11/xkeyboard-config \ - libxkbfile>=0:x11/libxkbfile + libxkbfile>=0:x11/libxkbfile \ + iso-codes>=0:misc/iso-codes USES= gettext gnome localbase meson pkgconfig python:build shebangfix xorg -USE_GNOME= cairo gdkpixbuf gtk30 intltool introspection +USE_GNOME= cairo gdkpixbuf glib20 gtk30 introspection USE_XORG= x11 xext xrandr USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= linuxmint SHEBANG_FILES= install-scripts/meson_install_schemas.py installer-test GLIB_SCHEMAS= org.cinnamon.desktop.a11y.applications.gschema.xml \ org.cinnamon.desktop.a11y.keyboard.gschema.xml \ org.cinnamon.desktop.a11y.magnifier.gschema.xml \ org.cinnamon.desktop.a11y.mouse.gschema.xml \ org.cinnamon.desktop.background.gschema.xml \ org.cinnamon.desktop.default-applications.gschema.xml \ org.cinnamon.desktop.enums.xml \ org.cinnamon.desktop.input-sources.gschema.xml \ org.cinnamon.desktop.interface.gschema.xml \ org.cinnamon.desktop.keybindings.gschema.xml \ org.cinnamon.desktop.keybindings.media-keys.gschema.xml \ org.cinnamon.desktop.keybindings.wm.gschema.xml \ org.cinnamon.desktop.lockdown.gschema.xml \ org.cinnamon.desktop.media-handling.gschema.xml \ org.cinnamon.desktop.notifications.gschema.xml \ org.cinnamon.desktop.peripherals.gschema.xml \ org.cinnamon.desktop.privacy.gschema.xml \ org.cinnamon.desktop.screensaver.gschema.xml \ org.cinnamon.desktop.session.gschema.xml \ org.cinnamon.desktop.sound.gschema.xml \ org.cinnamon.desktop.thumbnail-cache.gschema.xml \ org.cinnamon.desktop.thumbnailers.gschema.xml \ org.cinnamon.desktop.wm.preferences.gschema.xml +MESON_ARGS= -Dsystemd=disabled + OPTIONS_DEFINE= ALSA ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_MESON_TRUE= alsa .include diff --git a/x11/cinnamon-desktop/distinfo b/x11/cinnamon-desktop/distinfo index 607d949b3e3b..e83fe84552c6 100644 --- a/x11/cinnamon-desktop/distinfo +++ b/x11/cinnamon-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660019817 -SHA256 (gnome/linuxmint-cinnamon-desktop-5.4.2_GH0.tar.gz) = 862828d97518becf9dd085d76cae9d65090811c82f1dab41392fe89a6b927371 -SIZE (gnome/linuxmint-cinnamon-desktop-5.4.2_GH0.tar.gz) = 502072 +TIMESTAMP = 1735677829 +SHA256 (gnome/linuxmint-cinnamon-desktop-6.4.1_GH0.tar.gz) = 0e9af48b97910302a1130424a05c63b2e7aacb4ce6ae7a1d53c71bcd157a3a8f +SIZE (gnome/linuxmint-cinnamon-desktop-6.4.1_GH0.tar.gz) = 509746 diff --git a/x11/cinnamon-desktop/files/patch-libcvc_gvc-channel-map.c b/x11/cinnamon-desktop/files/patch-libcvc_gvc-channel-map.c deleted file mode 100644 index 4bdf7e1ea04f..000000000000 --- a/x11/cinnamon-desktop/files/patch-libcvc_gvc-channel-map.c +++ /dev/null @@ -1,31 +0,0 @@ -diff --git libcvc/gvc-channel-map.c libcvc/gvc-channel-map.c -index 7f14c8b..69682ac 100644 ---- libcvc/gvc-channel-map.c -+++ libcvc/gvc-channel-map.c -@@ -109,7 +109,7 @@ gvc_channel_map_set_balance (GvcChannelMap *map, - { - pa_cvolume cv; - -- g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL); -+ g_return_if_fail (GVC_IS_CHANNEL_MAP (map)); - - if (!gvc_channel_map_can_balance (map)) - return; -@@ -149,7 +149,7 @@ gvc_channel_map_set_fade (GvcChannelMap *map, - { - pa_cvolume cv; - -- g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL); -+ g_return_if_fail (GVC_IS_CHANNEL_MAP (map)); - - if (!gvc_channel_map_can_fade (map)) - return; -@@ -191,7 +191,7 @@ gvc_channel_map_set_lfe (GvcChannelMap *map, - { - pa_cvolume cv; - -- g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL); -+ g_return_if_fail (GVC_IS_CHANNEL_MAP (map)); - - if (!gvc_channel_map_has_lfe (map)) - return; diff --git a/x11/cinnamon-desktop/pkg-plist b/x11/cinnamon-desktop/pkg-plist index 0dee9904a389..90b7bfcd1604 100644 --- a/x11/cinnamon-desktop/pkg-plist +++ b/x11/cinnamon-desktop/pkg-plist @@ -1,149 +1,150 @@ include/cinnamon-desktop/libcinnamon-desktop/cdesktop-enums.h include/cinnamon-desktop/libcinnamon-desktop/gnome-bg-crossfade.h include/cinnamon-desktop/libcinnamon-desktop/gnome-bg.h include/cinnamon-desktop/libcinnamon-desktop/gnome-desktop-thumbnail.h include/cinnamon-desktop/libcinnamon-desktop/gnome-desktop-utils.h -include/cinnamon-desktop/libcinnamon-desktop/gnome-installer.h +include/cinnamon-desktop/libcinnamon-desktop/gnome-idle-monitor.h include/cinnamon-desktop/libcinnamon-desktop/gnome-pnp-ids.h include/cinnamon-desktop/libcinnamon-desktop/gnome-rr-config.h include/cinnamon-desktop/libcinnamon-desktop/gnome-rr-labeler.h include/cinnamon-desktop/libcinnamon-desktop/gnome-rr.h +include/cinnamon-desktop/libcinnamon-desktop/gnome-systemd.h include/cinnamon-desktop/libcinnamon-desktop/gnome-wall-clock.h include/cinnamon-desktop/libcinnamon-desktop/gnome-xkb-info.h include/cinnamon-desktop/libcvc/gvc-channel-map.h include/cinnamon-desktop/libcvc/gvc-mixer-card.h include/cinnamon-desktop/libcvc/gvc-mixer-control.h include/cinnamon-desktop/libcvc/gvc-mixer-event-role.h include/cinnamon-desktop/libcvc/gvc-mixer-sink-input.h include/cinnamon-desktop/libcvc/gvc-mixer-sink.h include/cinnamon-desktop/libcvc/gvc-mixer-source-output.h include/cinnamon-desktop/libcvc/gvc-mixer-source.h include/cinnamon-desktop/libcvc/gvc-mixer-stream.h include/cinnamon-desktop/libcvc/gvc-mixer-ui-device.h lib/girepository-1.0/CDesktopEnums-3.0.typelib lib/girepository-1.0/CinnamonDesktop-3.0.typelib lib/girepository-1.0/Cvc-1.0.typelib lib/libcinnamon-desktop.so lib/libcinnamon-desktop.so.4 lib/libcinnamon-desktop.so.4.0.0 lib/libcvc.so lib/libcvc.so.0 lib/libcvc.so.0.0.0 libdata/pkgconfig/cinnamon-desktop.pc libdata/pkgconfig/cvc.pc share/gir-1.0/CDesktopEnums-3.0.gir share/gir-1.0/CinnamonDesktop-3.0.gir share/gir-1.0/Cvc-1.0.gir share/libcinnamon-desktop/pnp.ids share/locale/af/LC_MESSAGES/cinnamon-desktop.mo share/locale/am/LC_MESSAGES/cinnamon-desktop.mo share/locale/an/LC_MESSAGES/cinnamon-desktop.mo share/locale/ar/LC_MESSAGES/cinnamon-desktop.mo share/locale/as/LC_MESSAGES/cinnamon-desktop.mo share/locale/ast/LC_MESSAGES/cinnamon-desktop.mo share/locale/az/LC_MESSAGES/cinnamon-desktop.mo share/locale/be/LC_MESSAGES/cinnamon-desktop.mo share/locale/be@latin/LC_MESSAGES/cinnamon-desktop.mo share/locale/bg/LC_MESSAGES/cinnamon-desktop.mo share/locale/bn/LC_MESSAGES/cinnamon-desktop.mo share/locale/bn_IN/LC_MESSAGES/cinnamon-desktop.mo share/locale/br/LC_MESSAGES/cinnamon-desktop.mo share/locale/bs/LC_MESSAGES/cinnamon-desktop.mo share/locale/ca/LC_MESSAGES/cinnamon-desktop.mo share/locale/ca@valencia/LC_MESSAGES/cinnamon-desktop.mo share/locale/crh/LC_MESSAGES/cinnamon-desktop.mo share/locale/cs/LC_MESSAGES/cinnamon-desktop.mo share/locale/csb/LC_MESSAGES/cinnamon-desktop.mo share/locale/cy/LC_MESSAGES/cinnamon-desktop.mo share/locale/da/LC_MESSAGES/cinnamon-desktop.mo share/locale/de/LC_MESSAGES/cinnamon-desktop.mo share/locale/dz/LC_MESSAGES/cinnamon-desktop.mo share/locale/el/LC_MESSAGES/cinnamon-desktop.mo share/locale/en@shaw/LC_MESSAGES/cinnamon-desktop.mo share/locale/en_CA/LC_MESSAGES/cinnamon-desktop.mo share/locale/en_GB/LC_MESSAGES/cinnamon-desktop.mo share/locale/eo/LC_MESSAGES/cinnamon-desktop.mo share/locale/es/LC_MESSAGES/cinnamon-desktop.mo share/locale/et/LC_MESSAGES/cinnamon-desktop.mo share/locale/eu/LC_MESSAGES/cinnamon-desktop.mo share/locale/fa/LC_MESSAGES/cinnamon-desktop.mo share/locale/fi/LC_MESSAGES/cinnamon-desktop.mo share/locale/fr/LC_MESSAGES/cinnamon-desktop.mo share/locale/fur/LC_MESSAGES/cinnamon-desktop.mo share/locale/fy/LC_MESSAGES/cinnamon-desktop.mo share/locale/ga/LC_MESSAGES/cinnamon-desktop.mo share/locale/gl/LC_MESSAGES/cinnamon-desktop.mo share/locale/gu/LC_MESSAGES/cinnamon-desktop.mo share/locale/ha/LC_MESSAGES/cinnamon-desktop.mo share/locale/he/LC_MESSAGES/cinnamon-desktop.mo share/locale/hi/LC_MESSAGES/cinnamon-desktop.mo share/locale/hr/LC_MESSAGES/cinnamon-desktop.mo share/locale/hu/LC_MESSAGES/cinnamon-desktop.mo share/locale/hy/LC_MESSAGES/cinnamon-desktop.mo share/locale/id/LC_MESSAGES/cinnamon-desktop.mo share/locale/ig/LC_MESSAGES/cinnamon-desktop.mo share/locale/is/LC_MESSAGES/cinnamon-desktop.mo share/locale/it/LC_MESSAGES/cinnamon-desktop.mo share/locale/ja/LC_MESSAGES/cinnamon-desktop.mo share/locale/ka/LC_MESSAGES/cinnamon-desktop.mo share/locale/kg/LC_MESSAGES/cinnamon-desktop.mo share/locale/kk/LC_MESSAGES/cinnamon-desktop.mo share/locale/km/LC_MESSAGES/cinnamon-desktop.mo share/locale/kn/LC_MESSAGES/cinnamon-desktop.mo share/locale/ko/LC_MESSAGES/cinnamon-desktop.mo share/locale/ku/LC_MESSAGES/cinnamon-desktop.mo share/locale/ky/LC_MESSAGES/cinnamon-desktop.mo share/locale/li/LC_MESSAGES/cinnamon-desktop.mo share/locale/lo/LC_MESSAGES/cinnamon-desktop.mo share/locale/lt/LC_MESSAGES/cinnamon-desktop.mo share/locale/lv/LC_MESSAGES/cinnamon-desktop.mo share/locale/mai/LC_MESSAGES/cinnamon-desktop.mo share/locale/mg/LC_MESSAGES/cinnamon-desktop.mo share/locale/mi/LC_MESSAGES/cinnamon-desktop.mo share/locale/mk/LC_MESSAGES/cinnamon-desktop.mo share/locale/ml/LC_MESSAGES/cinnamon-desktop.mo share/locale/mn/LC_MESSAGES/cinnamon-desktop.mo share/locale/mr/LC_MESSAGES/cinnamon-desktop.mo share/locale/ms/LC_MESSAGES/cinnamon-desktop.mo share/locale/nb/LC_MESSAGES/cinnamon-desktop.mo share/locale/nds/LC_MESSAGES/cinnamon-desktop.mo share/locale/ne/LC_MESSAGES/cinnamon-desktop.mo share/locale/nl/LC_MESSAGES/cinnamon-desktop.mo share/locale/nn/LC_MESSAGES/cinnamon-desktop.mo share/locale/nso/LC_MESSAGES/cinnamon-desktop.mo share/locale/oc/LC_MESSAGES/cinnamon-desktop.mo share/locale/or/LC_MESSAGES/cinnamon-desktop.mo share/locale/pa/LC_MESSAGES/cinnamon-desktop.mo share/locale/pl/LC_MESSAGES/cinnamon-desktop.mo share/locale/ps/LC_MESSAGES/cinnamon-desktop.mo share/locale/pt/LC_MESSAGES/cinnamon-desktop.mo share/locale/pt_BR/LC_MESSAGES/cinnamon-desktop.mo share/locale/ro/LC_MESSAGES/cinnamon-desktop.mo share/locale/ru/LC_MESSAGES/cinnamon-desktop.mo share/locale/rw/LC_MESSAGES/cinnamon-desktop.mo share/locale/si/LC_MESSAGES/cinnamon-desktop.mo share/locale/sk/LC_MESSAGES/cinnamon-desktop.mo share/locale/sl/LC_MESSAGES/cinnamon-desktop.mo share/locale/sq/LC_MESSAGES/cinnamon-desktop.mo share/locale/sr/LC_MESSAGES/cinnamon-desktop.mo share/locale/sr@latin/LC_MESSAGES/cinnamon-desktop.mo share/locale/sv/LC_MESSAGES/cinnamon-desktop.mo share/locale/ta/LC_MESSAGES/cinnamon-desktop.mo share/locale/te/LC_MESSAGES/cinnamon-desktop.mo share/locale/th/LC_MESSAGES/cinnamon-desktop.mo share/locale/tk/LC_MESSAGES/cinnamon-desktop.mo share/locale/tr/LC_MESSAGES/cinnamon-desktop.mo share/locale/ug/LC_MESSAGES/cinnamon-desktop.mo share/locale/uk/LC_MESSAGES/cinnamon-desktop.mo share/locale/ur/LC_MESSAGES/cinnamon-desktop.mo share/locale/uz/LC_MESSAGES/cinnamon-desktop.mo share/locale/uz@cyrillic/LC_MESSAGES/cinnamon-desktop.mo share/locale/vi/LC_MESSAGES/cinnamon-desktop.mo share/locale/wa/LC_MESSAGES/cinnamon-desktop.mo share/locale/xh/LC_MESSAGES/cinnamon-desktop.mo share/locale/yi/LC_MESSAGES/cinnamon-desktop.mo share/locale/yo/LC_MESSAGES/cinnamon-desktop.mo share/locale/zh_CN/LC_MESSAGES/cinnamon-desktop.mo share/locale/zh_HK/LC_MESSAGES/cinnamon-desktop.mo share/locale/zh_TW/LC_MESSAGES/cinnamon-desktop.mo share/locale/zu/LC_MESSAGES/cinnamon-desktop.mo