diff options
Diffstat (limited to 'x11')
84 files changed, 898 insertions, 407 deletions
diff --git a/x11/Makefile b/x11/Makefile index 909e86fe9fbd..e790d8bdf0ed 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -462,6 +462,7 @@ SUBDIR += wayland-logout SUBDIR += waylock SUBDIR += wayout + SUBDIR += wayst SUBDIR += wbar SUBDIR += wcm SUBDIR += wdisplays diff --git a/x11/aminal/Makefile b/x11/aminal/Makefile index 8fa8a424e07e..088e3e5762a3 100644 --- a/x11/aminal/Makefile +++ b/x11/aminal/Makefile @@ -1,7 +1,7 @@ PORTNAME= aminal DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= x11 MAINTAINER= yuri@FreeBSD.org diff --git a/x11/babl/Makefile b/x11/babl/Makefile index bdf8f79b2f1b..528193b38e92 100644 --- a/x11/babl/Makefile +++ b/x11/babl/Makefile @@ -1,5 +1,5 @@ PORTNAME= babl -PORTVERSION= 0.1.112 +PORTVERSION= 0.1.114 CATEGORIES= x11 MASTER_SITES= GIMP @@ -19,7 +19,7 @@ USE_LDCONFIG= yes MESON_ARGS= -Dgi-docgen=disabled -Dwith-docs=false -BABL_SHLIB= 0.211.1 +BABL_SHLIB= 0.213.1 BABL_VER= 0.1 PLIST_SUB+= BABL_SHLIB=${BABL_SHLIB} BABL_VER=${BABL_VER} diff --git a/x11/babl/distinfo b/x11/babl/distinfo index 0d59dba79498..8471588c7a25 100644 --- a/x11/babl/distinfo +++ b/x11/babl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742342647 -SHA256 (babl-0.1.112.tar.xz) = fb696682421787c8fecc83e8aab48121dec8ee38d119b65291cfcbe315028a79 -SIZE (babl-0.1.112.tar.xz) = 318924 +TIMESTAMP = 1752051552 +SHA256 (babl-0.1.114.tar.xz) = bcbb7786c1e447703db3bc7fa34d62d0d2d117b22f04d8834c7b2d5ded456487 +SIZE (babl-0.1.114.tar.xz) = 321456 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,6 +1,5 @@ PORTNAME= cinnamon-desktop -PORTVERSION= 5.4.2 -PORTREVISION= 5 +DISTVERSION= 6.4.1 CATEGORIES= x11 gnome DIST_SUBDIR= gnome @@ -14,13 +13,16 @@ 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 @@ -53,6 +55,8 @@ GLIB_SCHEMAS= org.cinnamon.desktop.a11y.applications.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 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 @@ -3,11 +3,12 @@ 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 diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile index a492ef449fdd..73b521ba2479 100644 --- a/x11/cinnamon-menus/Makefile +++ b/x11/cinnamon-menus/Makefile @@ -1,5 +1,5 @@ PORTNAME= cinnamon-menus -PORTVERSION= 5.4.0 +DISTVERSION= 6.4.0 CATEGORIES= x11 gnome DIST_SUBDIR= gnome @@ -18,7 +18,11 @@ USE_GNOME= glib20 introspection:build USE_GITHUB= yes GH_ACCOUNT= linuxmint - USE_LDCONFIG= yes +OPTIONS_DEFINE= DOCS + +DOCS_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc +DOCS_MESON_TRUE= enable_docs + .include <bsd.port.mk> diff --git a/x11/cinnamon-menus/distinfo b/x11/cinnamon-menus/distinfo index 542c41805ba7..b203e2b6e9a3 100644 --- a/x11/cinnamon-menus/distinfo +++ b/x11/cinnamon-menus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656716842 -SHA256 (gnome/linuxmint-cinnamon-menus-5.4.0_GH0.tar.gz) = 47eb864105711c28c4851b64bcc82aa5701095996698db170b86be9ebd914e07 -SIZE (gnome/linuxmint-cinnamon-menus-5.4.0_GH0.tar.gz) = 96312 +TIMESTAMP = 1735837360 +SHA256 (gnome/linuxmint-cinnamon-menus-6.4.0_GH0.tar.gz) = 9cad5ac61900492f66c91810fd13bed9dc37b49ec0b9bbc0bbe9ebf48ee45452 +SIZE (gnome/linuxmint-cinnamon-menus-6.4.0_GH0.tar.gz) = 96524 diff --git a/x11/cinnamon-menus/pkg-plist b/x11/cinnamon-menus/pkg-plist index 40191c9931a3..64f102fd6a87 100644 --- a/x11/cinnamon-menus/pkg-plist +++ b/x11/cinnamon-menus/pkg-plist @@ -6,3 +6,19 @@ lib/libcinnamon-menu-3.so.0.0.1 lib/girepository-1.0/CMenu-3.0.typelib libdata/pkgconfig/libcinnamon-menu-3.0.pc share/gir-1.0/CMenu-3.0.gir +%%PORTDOCS%%share/gtk-doc/html/cmenu/GMenuTree.html +%%PORTDOCS%%share/gtk-doc/html/cmenu/annotation-glossary.html +%%PORTDOCS%%share/gtk-doc/html/cmenu/api-index-full.html +%%PORTDOCS%%share/gtk-doc/html/cmenu/ch01.html +%%PORTDOCS%%share/gtk-doc/html/cmenu/cmenu.devhelp2 +%%PORTDOCS%%share/gtk-doc/html/cmenu/home.png +%%PORTDOCS%%share/gtk-doc/html/cmenu/index.html +%%PORTDOCS%%share/gtk-doc/html/cmenu/ix02.html +%%PORTDOCS%%share/gtk-doc/html/cmenu/left-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/cmenu/left.png +%%PORTDOCS%%share/gtk-doc/html/cmenu/pt01.html +%%PORTDOCS%%share/gtk-doc/html/cmenu/right-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/cmenu/right.png +%%PORTDOCS%%share/gtk-doc/html/cmenu/style.css +%%PORTDOCS%%share/gtk-doc/html/cmenu/up-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/cmenu/up.png diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile index 6b4de701e272..906339abc9d2 100644 --- a/x11/cinnamon-screensaver/Makefile +++ b/x11/cinnamon-screensaver/Makefile @@ -1,6 +1,5 @@ PORTNAME= cinnamon-screensaver -PORTVERSION= 5.4.2 -PORTREVISION= 3 +DISTVERSION= 6.4.0 CATEGORIES= x11 gnome DIST_SUBDIR= gnome @@ -13,7 +12,6 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB -BUILD_DEPENDS= gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas LIB_DEPENDS= libaccountsservice.so:sysutils/accountsservice \ libcinnamon-desktop.so:x11/cinnamon-desktop \ libdbus-glib-1.so:devel/dbus-glib \ @@ -24,14 +22,14 @@ RUN_DEPENDS= ${LOCALBASE}/lib/pam_gnome_keyring.so:security/gnome-keyring \ ${PYTHON_PKGNAMEPREFIX}python-xapp>0:x11/py-python-xapp@${PY_FLAVOR} \ ${LOCALBASE}/libexec/unix-selfauth-helper:security/unix-selfauth-helper -USES= gettext-tools gnome meson pkgconfig python shebangfix xorg +USES= gnome meson pkgconfig python shebangfix xorg localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= linuxmint -USE_XORG= x11 xext xinerama xrandr xscrnsaver +USE_XORG= x11 xext xrandr -USE_GNOME= cairo gdkpixbuf glib20 intltool introspection:build libgnomekbd pygobject3 +USE_GNOME= cairo gdkpixbuf glib20 gtk30 introspection:build pygobject3 SHEBANG_GLOB= *.py BINARY_ALIAS= python3=${PYTHON_CMD} @@ -40,9 +38,18 @@ USE_LDCONFIG= yes SUB_FILES+= cinnamon-screensaver.pam +OPTIONS_DEFINE= LOCKING SETRES XINERAMA +OPTIONS_DEFAULT= LOCKING XINERAMA + +LOCKING_DESC= Compile in support for locking the display +SETRES_DESC= Use setresuid/setresgid in the setuid.c helper + +LOCKING_MESON_TRUE= locking +SETRES_MESON_TRUE= setres +XINERAMA_USE= XORG=xinerama +XINERAMA_MESON_TRUE= xinerama + post-patch: - @${REINPLACE_CMD} -e 's|/usr/lib|${PREFIX}/lib|g' \ - ${WRKSRC}/src/pamhelper/authClient.py @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ ${WRKSRC}/src/pamhelper/cinnamon-screensaver-pam-helper.c \ ${WRKSRC}/libcscreensaver/test-passwd.c \ diff --git a/x11/cinnamon-screensaver/distinfo b/x11/cinnamon-screensaver/distinfo index fa7052a69e99..3cc55efde9a6 100644 --- a/x11/cinnamon-screensaver/distinfo +++ b/x11/cinnamon-screensaver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660022189 -SHA256 (gnome/linuxmint-cinnamon-screensaver-5.4.2_GH0.tar.gz) = 7ae54b1fc83fff3082b3b43bf5bf01f7cf49eb35cd6b5b42c0e454e2fd619748 -SIZE (gnome/linuxmint-cinnamon-screensaver-5.4.2_GH0.tar.gz) = 154799 +TIMESTAMP = 1735838597 +SHA256 (gnome/linuxmint-cinnamon-screensaver-6.4.0_GH0.tar.gz) = e985b68981482b7ead6aef55988937958539221d752f9a4feb7ced9ac32fe422 +SIZE (gnome/linuxmint-cinnamon-screensaver-6.4.0_GH0.tar.gz) = 160693 diff --git a/x11/cinnamon-screensaver/pkg-plist b/x11/cinnamon-screensaver/pkg-plist index 7b8e7c7faa89..1afd45d1deac 100644 --- a/x11/cinnamon-screensaver/pkg-plist +++ b/x11/cinnamon-screensaver/pkg-plist @@ -2,13 +2,10 @@ bin/cinnamon-screensaver bin/cinnamon-screensaver-command bin/cinnamon-unlock-desktop etc/pam.d/cinnamon-screensaver -lib/girepository-1.0/CScreensaver-1.0.typelib -lib/libcscreensaver.so -lib/libcscreensaver.so.0 -lib/libcscreensaver.so.0.0.0 -libdata/pkgconfig/cscreensaver.pc -@(,,4555) libexec/cinnamon-screensaver-pam-helper -libexec/cs-backup-locker +libexec/cinnamon-screensaver/girepository-1.0/CScreensaver-1.0.typelib +libexec/cinnamon-screensaver/libcscreensaver.so +@(,,4555) libexec/cinnamon-screensaver/cinnamon-screensaver-pam-helper +libexec/cinnamon-screensaver/cs-backup-locker %%DATADIR%%/__init__.py %%DATADIR%%/albumArt.py %%DATADIR%%/audioPanel.py @@ -28,6 +25,7 @@ libexec/cs-backup-locker %%DATADIR%%/dbusdepot/loginInterface.py %%DATADIR%%/dbusdepot/logindClient.py %%DATADIR%%/dbusdepot/mediaPlayerWatcher.py +%%DATADIR%%/dbusdepot/muffinClient.py %%DATADIR%%/dbusdepot/nameBlocker.py %%DATADIR%%/dbusdepot/sessionClient.py %%DATADIR%%/dbusdepot/uPowerClient.py @@ -66,5 +64,7 @@ share/gir-1.0/CScreensaver-1.0.gir share/icons/hicolor/scalable/actions/screensaver-switch-users-symbolic.svg share/icons/hicolor/scalable/actions/screensaver-unlock-symbolic.svg share/icons/hicolor/scalable/apps/csr-backup-locker-icon.svg +share/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg +share/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg share/icons/hicolor/scalable/status/screensaver-blank.svg share/icons/hicolor/scalable/status/screensaver-notification-symbolic.svg diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile index b7883cac3edf..126615f142b8 100644 --- a/x11/cinnamon-session/Makefile +++ b/x11/cinnamon-session/Makefile @@ -1,6 +1,5 @@ PORTNAME= cinnamon-session -PORTVERSION= 5.4.0 -PORTREVISION= 5 +DISTVERSION= 6.4.0 CATEGORIES= x11 gnome DIST_SUBDIR= gnome @@ -10,26 +9,28 @@ WWW= https://github.com/linuxmint/cinnamon-session LICENSE= GPLv2 -LIB_DEPENDS= libdbus-1.so:devel/dbus \ - libdbus-glib-1.so:devel/dbus-glib \ +LIB_DEPENDS= libcinnamon-desktop.so:x11/cinnamon-desktop \ libxapp.so:x11/xapp \ libcanberra.so:audio/libcanberra -RUN_DEPENDS= console-kit-daemon:sysutils/consolekit2 +RUN_DEPENDS= console-kit-daemon:sysutils/consolekit2 \ + ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} -USES= gl gnome meson pkgconfig python:build shebangfix xorg +USES= gl gnome meson pkgconfig shebangfix xorg python:build USE_GITHUB= yes GH_ACCOUNT= linuxmint -SHEBANG_FILES= data/meson_install_schemas.py +SHEBANG_FILES= data/meson_install_schemas.py \ + cinnamon-session-quit/cinnamon-session-quit.py -USE_GNOME= cairo gdkpixbuf gtk30 +USE_GNOME= cairo gdkpixbuf glib20 gtk30 pango USE_XORG= ice sm x11 xau xcomposite xext xrender xtrans xtst USE_GL= gl - GLIB_SCHEMAS= org.cinnamon.SessionManager.gschema.xml -OPTIONS_DEFINE= IPV6 +MESON_ARGS= -Dxtrans=true + +OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 IPV6_MESON_TRUE= ipv6 diff --git a/x11/cinnamon-session/distinfo b/x11/cinnamon-session/distinfo index 61afde6aceaf..b48aea7b28e7 100644 --- a/x11/cinnamon-session/distinfo +++ b/x11/cinnamon-session/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656715196 -SHA256 (gnome/linuxmint-cinnamon-session-5.4.0_GH0.tar.gz) = c3c9351aecebe2abbb5d61663ad19af56fc6413ad6cddb5d753a614b23ec547d -SIZE (gnome/linuxmint-cinnamon-session-5.4.0_GH0.tar.gz) = 199698 +TIMESTAMP = 1736186381 +SHA256 (gnome/linuxmint-cinnamon-session-6.4.0_GH0.tar.gz) = 464075d920df360b5ad94f72395a09b5fbf8b14f0190406ec76055a17659e243 +SIZE (gnome/linuxmint-cinnamon-session-6.4.0_GH0.tar.gz) = 165993 diff --git a/x11/cinnamon-session/pkg-plist b/x11/cinnamon-session/pkg-plist index 3911dab65623..3c0eef38d496 100644 --- a/x11/cinnamon-session/pkg-plist +++ b/x11/cinnamon-session/pkg-plist @@ -1,10 +1,13 @@ bin/cinnamon-session bin/cinnamon-session-quit +libexec/cinnamon-session-binary libexec/cinnamon-session-check-accelerated libexec/cinnamon-session-check-accelerated-helper share/man/man1/cinnamon-session-quit.1.gz share/man/man1/cinnamon-session.1.gz -%%DATADIR%%/csm-inhibit-dialog.glade +%%DATADIR%%/cinnamon-session-quit.glade +%%DATADIR%%/cinnamon-session-quit.py +%%DATADIR%%/config.py %%DATADIR%%/hardware-compatibility share/icons/hicolor/16x16/apps/cinnamon-session-properties.png share/icons/hicolor/22x22/apps/cinnamon-session-properties.png diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile index 6261c84f1904..b97ed97c9826 100644 --- a/x11/cinnamon/Makefile +++ b/x11/cinnamon/Makefile @@ -1,6 +1,5 @@ PORTNAME= cinnamon -PORTVERSION= 5.4.9 -PORTREVISION= 8 +DISTVERSION= 6.4.10 CATEGORIES= x11 gnome DIST_SUBDIR= gnome @@ -13,15 +12,17 @@ WWW= https://github.com/linuxmint/cinnamon LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/include/EGL/eglmesaext.h:graphics/mesa-dri +BUILD_DEPENDS= ${LOCALBASE}/include/EGL/eglmesaext.h:graphics/mesa-dri \ + ${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR} LIB_DEPENDS= libcjs.so:lang/cjs \ libmuffin.so:x11-wm/muffin \ libcinnamon-menu-3.so:x11/cinnamon-menus \ libdbus-1.so:devel/dbus \ libpolkit-agent-1.so:sysutils/polkit \ libatk-bridge-2.0.so:accessibility/at-spi2-core \ - libsoup-2.4.so:devel/libsoup \ - libxapp.so:x11/xapp + libxapp.so:x11/xapp \ + libgcr-base-3.so:security/gcr3 \ + libcinnamon-desktop.so:x11/cinnamon-desktop RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ gnome-themes-extra>3.0.0:x11-themes/gnome-themes-extra \ caribou>0:accessibility/caribou \ @@ -45,9 +46,18 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ ${LOCALBASE}/lib/girepository-1.0/GSound-1.0.typelib:audio/gsound \ gnome-backgrounds>0:x11-themes/gnome-backgrounds \ metacity:x11-wm/metacity \ - tint2:x11/tint - -USES= compiler:c11 cpe gettext-runtime gettext-tools:run gl gnome gstreamer \ + tint2:x11/tint \ + lspci:sysutils/pciutils \ + ${LOCALBASE}/libexec/polkit-gnome-authentication-agent-1:sysutils/polkit-gnome \ + ${LOCALBASE}/libexec/cups-pk-helper-mechanism:print/cups-pk-helper \ + ${PYTHON_PKGNAMEPREFIX}tinycss2>0:textproc/py-tinycss2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \ + xdg-open:devel/xdg-utils \ + xdg-user-dirs-gtk>0:x11/xdg-user-dirs-gtk \ + inxi:sysutils/inxi \ + wget:ftp/wget + +USES= compiler:c11 cpe gettext-runtime gettext-tools:run gl gnome \ meson perl5 pkgconfig python shebangfix xorg CPE_VENDOR= linuxmint USE_GNOME= cairo gdkpixbuf glib20 gtk30 intltool introspection libxml2 pygobject3 @@ -59,21 +69,28 @@ USE_GITHUB= yes GH_ACCOUNT= linuxmint SHEBANG_GLOB= *.py -SHEBANG_FILES= files/* src/data-to-c.pl +SHEBANG_FILES= files/* src/data-to-c.pl data/theme/parse-sass.sh USE_LDCONFIG= yes +# These libs are found via rpath mechanism +NO_SHLIB_REQUIRES_GLOB= libmuffin-clutter-* libmuffin-cogl-* BINARY_ALIAS= python3=${PYTHON_CMD} MESON_ARGS= -Ddisable_networkmanager=true GLIB_SCHEMAS= org.cinnamon.gschema.xml -OPTIONS_DEFINE= DOCS NLS -OPTIONS_EXCLUDE= DOCS +OPTIONS_DEFINE= DOCS NLS WAYLAND RECORDER +OPTIONS_DEFAULT= RECORDER OPTIONS_SUB= yes +RECORDER_DESC= Build the cinnamon recorder into source + DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc DOCS_MESON_TRUE= docs +WAYLAND_MESON_TRUE= wayland +RECORDER_MESON_TRUE= build_recorder +RECORDER_USES= gstreamer NLS_RUN_DEPENDS= cinnamon-translations>0:misc/cinnamon-translations @@ -94,15 +111,43 @@ post-patch: ${XARGS} ${REINPLACE_CMD} -e "s|/usr/lib|${PREFIX}/lib|g" @${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/bin" | \ - ${XARGS} ${REINPLACE_CMD} -e "s|/usr/bin|${PREFIX}/bin|g" + ${XARGS} ${REINPLACE_CMD} -e '\x/usr/bin/passwdx!s|/usr/bin|${PREFIX}/bin|g' + + @${REINPLACE_CMD} -e "/prefixes = /s|'/usr'|'${PREFIX}'|" \ + ${WRKSRC}/files/usr/bin/xlet-about-dialog + # Stop loading network-manager applet by default + @${REINPLACE_CMD} -e "s|, 'panel1:right:7:network@cinnamon.org'||" \ + ${WRKSRC}/data/org.cinnamon.gschema.xml + + # Fix build with no network-manager @${REINPLACE_CMD} -e '/cs-bluetooth/d; /cs-network/d' \ ${WRKSRC}/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py + @${REINPLACE_CMD} -e 's/nm-applet;//' \ + ${WRKSRC}/meson.build + + @${REINPLACE_CMD} -e '/imports.ui.networkAgent/d' \ + ${WRKSRC}/js/ui/main.js + # End of Fix build with no network-manager + + # Fix symlink installation + @${REINPLACE_CMD} -e "s|DESTDIR|MESON_INSTALL_DESTDIR_PREFIX|" \ + ${WRKSRC}/install-scripts/add_symlink.py + # Some python files use #! /usr/bin/python (note the space between the bang and the python interpreter @${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" | \ ${XARGS} ${REINPLACE_CMD} -e "s|#!.*python.*|#!/usr/bin/env python|g" + # Fix applets that try to exec just python3 + @${REINPLACE_CMD} -e "/'python3[' ]/s|python3|${PYTHON_CMD}|" \ + ${WRKSRC}/files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js \ + ${WRKSRC}/files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/menus.js + + # Fix system lp(1) overlapping with cups' lp(1) + @${REINPLACE_CMD} -e "/'lp'/s|lp|${PREFIX}/bin/lp|" \ + ${WRKSRC}/files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js + # gtk-doc builds erroneous documentation files otherwise @${FIND} ${WRKSRC} -name '*.orig' -type f -delete @${FIND} ${WRKSRC} -name '*.bak' -type f -delete diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo index 88eb442ad3e0..267ad77e131a 100644 --- a/x11/cinnamon/distinfo +++ b/x11/cinnamon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660060329 -SHA256 (gnome/linuxmint-cinnamon-5.4.9_GH0.tar.gz) = 19c5e85f65baacc79f961cbcebb20fb0050ad6f21678638a9dd1868d197b4727 -SIZE (gnome/linuxmint-cinnamon-5.4.9_GH0.tar.gz) = 2468335 +TIMESTAMP = 1752081962 +SHA256 (gnome/linuxmint-cinnamon-6.4.10_GH0.tar.gz) = eff6d55ec2b6443cec5b829df6240b329fbfa77aafd2064a60fdde2fc5b59f34 +SIZE (gnome/linuxmint-cinnamon-6.4.10_GH0.tar.gz) = 2592994 diff --git a/x11/cinnamon/files/patch-docs_reference_cinnamon_meson.build b/x11/cinnamon/files/patch-docs_reference_cinnamon_meson.build new file mode 100644 index 000000000000..10cdab7f29d7 --- /dev/null +++ b/x11/cinnamon/files/patch-docs_reference_cinnamon_meson.build @@ -0,0 +1,13 @@ +--- docs/reference/cinnamon/meson.build.orig 2025-02-09 15:54:24 UTC ++++ docs/reference/cinnamon/meson.build +@@ -11,6 +11,10 @@ endif + ignore += 'cinnamon-recorder.h' + endif + ++if not have_networkmanager ++ ignore += 'cinnamon-network-agent.h' ++endif ++ + gnome.gtkdoc( + 'cinnamon', + mode: 'xml', diff --git a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py new file mode 100644 index 000000000000..0ee26614724f --- /dev/null +++ b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py @@ -0,0 +1,59 @@ +--- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2025-07-10 21:12:25 UTC ++++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +@@ -255,7 +255,7 @@ class PasswordDialog(Gtk.Dialog): + self.user.set_password(newpass, "") + mask = self.group_mask.get_text() + if "nopasswdlogin" in mask: +- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"]) ++ subprocess.call(["pw", "groupmod", "nopasswdlogin", "-d", self.user.get_user_name()]) + mask = mask.split(", ") + mask.remove("nopasswdlogin") + mask = ", ".join(mask) +@@ -620,7 +620,7 @@ class Module: + response = dialog.run() + if response == Gtk.ResponseType.OK: + groups = dialog.get_selected_groups() +- subprocess.call(["usermod", user.get_user_name(), "-G", ",".join(groups)]) ++ subprocess.call(["pw", "usermod", user.get_user_name(), "-G", ",".join(groups)]) + groups.sort() + self.groups_label.set_text(", ".join(groups)) + dialog.destroy() +@@ -900,9 +900,9 @@ class Module: + piter = self.users.append(None, [new_user, pixbuf, description]) + # Add the user to his/her own group and sudo if Administrator was selected + if dialog.account_type_combo.get_active() == 1: +- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) ++ subprocess.call(["pw", "usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) + else: +- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) ++ subprocess.call(["pw", "usermod", username, "-G", "%s,nopasswdlogin" % username]) + self.load_groups() + dialog.destroy() + +@@ -947,7 +947,7 @@ class Module: + d.set_default_response(Gtk.ResponseType.NO) + r = d.run() + if r == Gtk.ResponseType.YES: +- subprocess.call(["groupdel", group]) ++ subprocess.call(["pw", "groupdel", group]) + self.load_groups() + d.destroy() + +@@ -955,7 +955,7 @@ class Module: + dialog = GroupDialog(_("Group Name"), "", self.window) + response = dialog.run() + if response == Gtk.ResponseType.OK: +- subprocess.call(["groupadd", dialog.entry.get_text().lower()]) ++ subprocess.call(["pw", "groupadd", dialog.entry.get_text().lower()]) + self.load_groups() + dialog.destroy() + +@@ -966,7 +966,7 @@ class Module: + dialog = GroupDialog(_("Group Name"), group, self.window) + response = dialog.run() + if response == Gtk.ResponseType.OK: +- subprocess.call(["groupmod", group, "-n", dialog.entry.get_text().lower()]) ++ subprocess.call(["pw", "groupmod", group, "-l", dialog.entry.get_text().lower()]) + self.load_groups() + dialog.destroy() + diff --git a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py index 8ea487050de1..92fb927f975a 100644 --- a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py +++ b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py @@ -1,39 +1,13 @@ ---- files/usr/share/cinnamon/cinnamon-settings/bin/capi.py.orig 2022-06-21 15:01:39 UTC +--- files/usr/share/cinnamon/cinnamon-settings/bin/capi.py.orig 2025-07-10 16:06:25 UTC +++ files/usr/share/cinnamon/cinnamon-settings/bin/capi.py -@@ -27,31 +27,11 @@ class CManager(): - self.extension_point = Gio.io_extension_point_register ("cinnamon-control-center-1") - self.modules = [] +@@ -30,7 +30,9 @@ class CManager: + # get the arch-specific triplet, e.g. 'x86_64-linux-gnu' or 'arm-linux-gnueabihf' + # see also: https://wiki.debian.org/Python/MultiArch + triplet = sysconfig.get_config_var('MULTIARCH') +- paths = ["/usr/lib", "/usr/lib64", f"/usr/lib/{triplet}"] ++ paths = ["/usr/lib", "/usr/lib64"] ++ if triplet: ++ paths.append(f"/usr/lib/{triplet}") -- architecture = platform.machine() -- # get the arch-specific triplet, e.g. 'x86_64-linux-gnu' or 'arm-linux-gnueabihf' -- # see also: https://wiki.debian.org/Python/MultiArch -- triplet = sysconfig.get_config_var('MULTIARCH') -- paths = ["/usr/lib", f"/usr/lib/{triplet}"] -- -- # On x86 archs, iterate through multiple paths -- # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu -- x86archs = ["i386", "i486", "i586", "i686"] -- if architecture in x86archs: -- for arch in x86archs: -- paths += ["/usr/lib/%s" % arch] -- elif architecture == "x86_64": -- paths += ["/usr/lib/x86_64", "/usr/lib64"] -- else: -- paths += ["/usr/lib/%s" % architecture] -- -- for path in paths: -- if not os.path.islink(path): -- path = os.path.join(path, "cinnamon-control-center-1/panels") -- if os.path.exists(path): -- try: -- self.modules = self.modules + Gio.io_modules_load_all_in_directory(path) -- except Exception as e: -- print("capi failed to load multiarch modules from %s: " % path, e) -+ path = os.path.join("/usr/lib", "cinnamon-control-center-1/panels") -+ try: -+ self.modules = self.modules + Gio.io_modules_load_all_in_directory(path) -+ except Exception as e: -+ print("capi failed to load multiarch modules from %s: " % path, e) - - def get_c_widget(self, mod_id): - extension = self.extension_point.get_extension_by_name(mod_id) + # On x86 archs, iterate through multiple paths + # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu diff --git a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py new file mode 100644 index 000000000000..3cc8afe08f48 --- /dev/null +++ b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py @@ -0,0 +1,41 @@ +--- files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py.orig 2025-07-10 21:17:21 UTC ++++ files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py +@@ -54,8 +54,11 @@ def getDiskSize(): + def getDiskSize(): + disksize = 0 + try: +- out = getProcessOut(("lsblk", "--json", "--output", "size", "--bytes", "--nodeps")) +- jsonobj = loads(''.join(out)) ++ out = getProcessOut(("geom", "disk", "list")) ++ jsonobj = {'blockdevices': []} ++ for disk in out: ++ if "Mediasize:" in disk: ++ jsonobj['blockdevices'].append({'size': disk.split()[1]}) + except Exception: + return _("Unknown size"), False + +@@ -71,13 +74,12 @@ def getProcInfos(): + # Source: https://github.com/dylanaraps/neofetch/blob/6dd85d67fc0d4ede9248f2df31b2cd554cca6c2f/neofetch#L2163 + cpudetect = ("model name", "Hardware", "Processor", "cpu model", "chip type", "cpu type") + infos = [ +- ("/proc/cpuinfo", [("cpu_name", cpudetect), ("cpu_siblings", ("siblings",)), ("cpu_cores", ("cpu cores",))]), +- ("/proc/meminfo", [("mem_total", ("MemTotal",))]) ++ ("hw", [("cpu_name", ("hw.model",)), ("cpu_cores", ("hw.ncpu",)), ("mem_total", ("hw.physmem",))]), + ] + + result = {} + for (proc, pairs) in infos: +- for line in getProcessOut(("cat", proc)): ++ for line in getProcessOut(("sysctl", proc)): + for (key, start) in pairs: + for item in start: + if line.startswith(item): +@@ -122,7 +124,7 @@ def createSystemInfos(): + if memunit == "kB": + infos.append((_("Memory"), '%.1f %s' % ((float(memsize)/(1024*1024)), _("GiB")))) + else: +- infos.append((_("Memory"), procInfos['mem_total'])) ++ infos.append((_("Memory"), '%.1f %s' % ((float(memsize)/(1024*1024*1024)), _("GiB")))) + + diskSize, multipleDisks = getDiskSize() + if multipleDisks: diff --git a/x11/cinnamon/pkg-plist b/x11/cinnamon/pkg-plist index 877786656bc5..f27549e838d2 100644 --- a/x11/cinnamon/pkg-plist +++ b/x11/cinnamon/pkg-plist @@ -1,9 +1,7 @@ bin/cinnamon bin/cinnamon-calendar-server -bin/cinnamon-close-dialog bin/cinnamon-dbus-command bin/cinnamon-desktop-editor -bin/cinnamon-display-changes-dialog bin/cinnamon-file-dialog bin/cinnamon-hover-click bin/cinnamon-install-spice @@ -26,6 +24,7 @@ bin/cinnamon2d bin/xlet-about-dialog bin/xlet-settings etc/xdg/menus/cinnamon-applications.menu +etc/xdg/menus/cinnamon-applications-merged lib/cinnamon/Cinnamon-0.1.typelib lib/cinnamon/St-1.0.typelib lib/cinnamon/libcinnamon.so @@ -45,8 +44,6 @@ share/man/man1/cinnamon-screensaver-lock-dialog.1.gz share/man/man1/cinnamon-settings.1.gz share/man/man1/cinnamon.1.gz share/man/man1/cinnamon2d.1.gz -share/man/man1/gnome-session-cinnamon.1.gz -share/man/man1/gnome-session-cinnamon2d.1.gz share/applications/cinnamon-killer-daemon.desktop share/applications/cinnamon-menu-editor.desktop share/applications/cinnamon-onscreen-keyboard.desktop @@ -65,7 +62,6 @@ share/applications/cinnamon-settings-info.desktop share/applications/cinnamon-settings-keyboard.desktop share/applications/cinnamon-settings-mouse.desktop share/applications/cinnamon-settings-notifications.desktop -share/applications/cinnamon-settings-online-accounts.desktop share/applications/cinnamon-settings-panel.desktop share/applications/cinnamon-settings-power.desktop share/applications/cinnamon-settings-privacy.desktop @@ -82,6 +78,87 @@ share/applications/cinnamon-settings-workspaces.desktop share/applications/cinnamon-settings.desktop share/applications/cinnamon.desktop share/applications/cinnamon2d.desktop +share/applications/cinnamon-settings-actions.desktop +share/applications/cinnamon-settings-gestures.desktop +share/applications/cinnamon-settings-nightlight.desktop +%%WAYLAND%%share/applications/cinnamon-wayland.desktop +%%WAYLAND%%%%DATADIR%%-session/sessions/cinnamon-wayland.session +%%DATADIR%%/Cinnamon-0.1.gir +%%DATADIR%%/St-1.0.gir +%%DATADIR%%/applets/cornerbar@cinnamon.org/applet.js +%%DATADIR%%/applets/cornerbar@cinnamon.org/metadata.json +%%DATADIR%%/applets/cornerbar@cinnamon.org/settings-schema.json +%%DATADIR%%/applets/grouped-window-list@cinnamon.org/state.js +%%DATADIR%%/applets/grouped-window-list@cinnamon.org/workspace.js +%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-active-notifications-disabled-symbolic.svg +%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-notification-active-symbolic.svg +%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-notification-symbolic.svg +%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-notifications-disabled-symbolic.svg +%%DATADIR%%/applets/inhibit@cinnamon.org/settings-schema.json +%%DATADIR%%/cinnamon-settings/appearance-dark.svg +%%DATADIR%%/cinnamon-settings/appearance-light.svg +%%DATADIR%%/cinnamon-settings/appearance-mixed.svg +%%DATADIR%%/cinnamon-settings/color_dot.svg +%%DATADIR%%/cinnamon-settings/modules/cs_actions.py +%%DATADIR%%/cinnamon-settings/modules/cs_gestures.py +%%DATADIR%%/cinnamon-settings/modules/cs_nightlight.py +%%DATADIR%%/cinnamon-settings/themes.ui +%%DATADIR%%/js/misc/portalHandlers.js +%%DATADIR%%/js/ui/audioDeviceSelection.js +%%DATADIR%%/js/ui/barLevel.js +%%DATADIR%%/js/ui/closeDialog.js +%%DATADIR%%/js/ui/dialog.js +%%DATADIR%%/js/ui/endSessionDialog.js +%%DATADIR%%/js/ui/gestures/ToucheggTypes.js +%%DATADIR%%/js/ui/gestures/actions.js +%%DATADIR%%/js/ui/gestures/gesturesManager.js +%%DATADIR%%/js/ui/gestures/mprisController.js +%%DATADIR%%/js/ui/keyringPrompt.js +%%DATADIR%%/js/ui/locatePointer.js +%%DATADIR%%/js/ui/monitorLabeler.js +%%DATADIR%%/js/ui/networkAgent.js +%%DATADIR%%/js/ui/polkitAuthenticationAgent.js +%%DATADIR%%/js/ui/ripples.js +%%DATADIR%%/js/ui/userWidget.js +%%DATADIR%%/js/ui/workspaceOsd.js +%%DATADIR%%/theme/add-workspace-hover.svg +%%DATADIR%%/theme/add-workspace.svg +%%DATADIR%%/theme/calendar-arrow-left-hover.svg +%%DATADIR%%/theme/calendar-arrow-right-hover.svg +%%DATADIR%%/theme/radio-off.svg +%%DATADIR%%/theme/radio.svg +%%DATADIR%%/theme/toggle-off.svg +%%DATADIR%%/theme/toggle-on.svg +%%DATADIR%%/theme/trash-icon.svg +%%DATADIR%%/thumbnails/cursors/Bibata-Modern-Amber.png +%%DATADIR%%/thumbnails/cursors/Bibata-Modern-Classic.png +%%DATADIR%%/thumbnails/cursors/Bibata-Modern-Ice.png +%%DATADIR%%/thumbnails/cursors/Bibata-Original-Classic.png +%%DATADIR%%/thumbnails/cursors/Bibata-Original-Ice.png +%%DATADIR%%/thumbnails/cursors/Breeze_Snow.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Black.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Blue.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Green.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Orange.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Red.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Black.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Blue.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Green.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Orange.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Red.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-White.png +%%DATADIR%%/thumbnails/cursors/ComixCursors-White.png +%%DATADIR%%/thumbnails/cursors/Paper.png +%%DATADIR%%/thumbnails/cursors/Yaru.png +%%DATADIR%%/thumbnails/cursors/breeze_cursors.png +%%DATADIR%%/thumbnails/cursors/handhelds.png +%%DATADIR%%/thumbnails/cursors/oxy-black.png +%%DATADIR%%/thumbnails/cursors/oxy-blue.png +%%DATADIR%%/thumbnails/cursors/oxy-white.png +%%DATADIR%%/thumbnails/cursors/oxy-yellow.png +%%DATADIR%%/thumbnails/cursors/oxy-zion.png +%%DATADIR%%/thumbnails/cursors/redglass.png +%%DATADIR%%/thumbnails/cursors/whiteglass.png %%DATADIR%%-session/sessions/cinnamon.session %%DATADIR%%-session/sessions/cinnamon2d.session %%DATADIR%%/applets/a11y@cinnamon.org/applet.js @@ -99,7 +176,6 @@ share/applications/cinnamon2d.desktop %%DATADIR%%/applets/favorites@cinnamon.org/metadata.json %%DATADIR%%/applets/favorites@cinnamon.org/settings-schema.json %%DATADIR%%/applets/grouped-window-list@cinnamon.org/appGroup.js -%%DATADIR%%/applets/grouped-window-list@cinnamon.org/appList.js %%DATADIR%%/applets/grouped-window-list@cinnamon.org/applet.js %%DATADIR%%/applets/grouped-window-list@cinnamon.org/constants.js %%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/news-symbolic.svg @@ -254,10 +330,8 @@ share/applications/cinnamon2d.desktop %%DATADIR%%/cinnamon-settings/bin/imtools.py %%DATADIR%%/cinnamon-settings/bin/proxygsettings.py %%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.glade -%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.py %%DATADIR%%/cinnamon-settings/bin/tweenEquations.py %%DATADIR%%/cinnamon-settings/bin/util.py -%%DATADIR%%/cinnamon-settings/cinnamon-online-accounts-info.ui %%DATADIR%%/cinnamon-settings/cinnamon-settings.py %%DATADIR%%/cinnamon-settings/cinnamon-settings.ui %%DATADIR%%/cinnamon-settings/config.py @@ -279,7 +353,6 @@ share/applications/cinnamon2d.desktop %%DATADIR%%/cinnamon-settings/modules/cs_keyboard.py %%DATADIR%%/cinnamon-settings/modules/cs_mouse.py %%DATADIR%%/cinnamon-settings/modules/cs_notifications.py -%%DATADIR%%/cinnamon-settings/modules/cs_online_accounts.py %%DATADIR%%/cinnamon-settings/modules/cs_panel.py %%DATADIR%%/cinnamon-settings/modules/cs_power.py %%DATADIR%%/cinnamon-settings/modules/cs_privacy.py @@ -352,7 +425,6 @@ share/applications/cinnamon2d.desktop %%DATADIR%%/js/misc/pointerTracker.js %%DATADIR%%/js/misc/screenSaver.js %%DATADIR%%/js/misc/signalManager.js -%%DATADIR%%/js/misc/state.js %%DATADIR%%/js/misc/timers.js %%DATADIR%%/js/misc/util.js %%DATADIR%%/js/misc/windowUtils.js @@ -429,35 +501,16 @@ share/applications/cinnamon2d.desktop %%DATADIR%%/sounds/bell.ogg %%DATADIR%%/sounds/togglekeys-sound-off.ogg %%DATADIR%%/sounds/togglekeys-sound-on.ogg -%%DATADIR%%/theme/add-workspace-hover.png -%%DATADIR%%/theme/add-workspace.png %%DATADIR%%/theme/calendar-arrow-left.svg %%DATADIR%%/theme/calendar-arrow-right.svg -%%DATADIR%%/theme/calendar-selected.svg -%%DATADIR%%/theme/calendar-today-selected.svg -%%DATADIR%%/theme/calendar-today.svg %%DATADIR%%/theme/checkbox-off.svg %%DATADIR%%/theme/checkbox.svg %%DATADIR%%/theme/cinnamon.css -%%DATADIR%%/theme/close-window-hover.svg -%%DATADIR%%/theme/close-window.svg %%DATADIR%%/theme/close.svg %%DATADIR%%/theme/corner-ripple.png %%DATADIR%%/theme/menu-symbolic.svg -%%DATADIR%%/theme/overview-hover.png -%%DATADIR%%/theme/overview.png -%%DATADIR%%/theme/process-working.svg -%%DATADIR%%/theme/radiobutton-off.svg -%%DATADIR%%/theme/radiobutton.svg -%%DATADIR%%/theme/scroll-hhandle.svg -%%DATADIR%%/theme/scroll-vhandle.svg %%DATADIR%%/theme/thumbnail-generic.png %%DATADIR%%/theme/thumbnail.png -%%DATADIR%%/theme/toggle-off-intl.svg -%%DATADIR%%/theme/toggle-off-us.svg -%%DATADIR%%/theme/toggle-on-intl.svg -%%DATADIR%%/theme/toggle-on-us.svg -%%DATADIR%%/theme/trash-icon.png %%DATADIR%%/thumbnails/cinnamon/unknown.png %%DATADIR%%/thumbnails/cursors/Adwaita.png %%DATADIR%%/thumbnails/cursors/DMZ-Black.png @@ -512,8 +565,6 @@ share/desktop-directories/cinnamon-utility.directory %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-docInfo.html %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-SignalManager.html %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-section.html -%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-state-section.html -%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-state.html %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-util-section.html %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-util.html %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-Applet.html @@ -523,6 +574,7 @@ share/desktop-directories/cinnamon-utility.directory %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-MenuItem.html %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-TextApplet.html %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-TextIconApplet.html +%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-PopupResizeHandler.html %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-section.html %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-appletManager-section.html %%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-appletManager.html @@ -677,7 +729,6 @@ share/desktop-directories/cinnamon-utility.directory %%PORTDOCS%%share/gtk-doc/html/cinnamon/ch03.html %%PORTDOCS%%share/gtk-doc/html/cinnamon/ch04.html %%PORTDOCS%%share/gtk-doc/html/cinnamon/ch05.html -%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch06.html %%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-tray-manager.html %%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-util.html %%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-wm.html @@ -779,6 +830,21 @@ share/icons/hicolor/scalable/emblems/cs-xlet-installed.svg share/icons/hicolor/scalable/emblems/cs-xlet-running.svg share/icons/hicolor/scalable/emblems/cs-xlet-system.svg share/icons/hicolor/scalable/emblems/cs-xlet-update.svg +share/desktop-directories/cinnamon-science.directory +share/glib-2.0/schemas/org.cinnamon.gestures.gschema.xml +share/icons/hicolor/scalable/actions/view-conceal-symbolic.svg +share/icons/hicolor/scalable/actions/view-reveal-symbolic.svg +%%WAYLAND%%share/icons/hicolor/scalable/apps/cinnamon-wayland_badge-symbolic.svg +share/icons/hicolor/scalable/apps/cinnamon2d_badge-symbolic.svg +share/icons/hicolor/scalable/apps/cinnamon_badge-symbolic.svg +share/icons/hicolor/scalable/categories/cinnamon-all-applications-symbolic.svg +share/icons/hicolor/scalable/categories/cs-actions.svg +share/icons/hicolor/scalable/categories/cs-gestures.svg +share/icons/hicolor/scalable/categories/cs-nightlight.svg +share/man/man1/cinnamon-session-cinnamon.1.gz +share/man/man1/cinnamon-session-cinnamon2d.1.gz +%%WAYLAND%%share/wayland-sessions/cinnamon-wayland.desktop +share/xdg-desktop-portal/x-cinnamon-portals.conf share/polkit-1/actions/org.cinnamon.settings-users.policy share/xsessions/cinnamon.desktop share/xsessions/cinnamon2d.desktop diff --git a/x11/cliphist/Makefile b/x11/cliphist/Makefile index 3a3b37433940..612028de81d9 100644 --- a/x11/cliphist/Makefile +++ b/x11/cliphist/Makefile @@ -1,7 +1,7 @@ PORTNAME= cliphist DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 wayland MAINTAINER= ports@FreeBSD.org diff --git a/x11/clipman/Makefile b/x11/clipman/Makefile index b9821bd2e7a4..662ddd5fcef6 100644 --- a/x11/clipman/Makefile +++ b/x11/clipman/Makefile @@ -1,7 +1,7 @@ PORTNAME= clipman DISTVERSIONPREFIX= v DISTVERSION= 1.6.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 wayland MAINTAINER= ports@FreeBSD.org diff --git a/x11/darktile/Makefile b/x11/darktile/Makefile index a50888a13933..dd59d1760e6e 100644 --- a/x11/darktile/Makefile +++ b/x11/darktile/Makefile @@ -1,7 +1,7 @@ PORTNAME= darktile DISTVERSIONPREFIX= v DISTVERSION= 0.0.11 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= x11 MAINTAINER= yuri@FreeBSD.org diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile index e8cc08e9fa41..478879d7a41f 100644 --- a/x11/gnome-shell-extensions/Makefile +++ b/x11/gnome-shell-extensions/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnome-shell-extensions -PORTVERSION= 47.5 +PORTVERSION= 47.6 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -11,17 +11,17 @@ WWW= https://apps.gnome.org/Extensions/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -PORTSCOUT= limit:^47\. - LIB_DEPENDS= libgjs.so:lang/gjs RUN_DEPENDS= gnome-shell>=47.0:x11/gnome-shell \ libgtop>0:devel/libgtop \ gnome-menus>0:x11/gnome-menus NO_ARCH= yes -USES= gettext gnome meson pkgconfig python tar:xz +USES= gettext-tools gnome meson pkgconfig python tar:xz USE_GNOME= glib20 -USE_LDCONFIG= yes + +PORTSCOUT= limit:^47\. + MESON_ARGS= -Dclassic_mode=true BINARY_ALIAS= python3=${PYTHON_CMD} diff --git a/x11/gnome-shell-extensions/distinfo b/x11/gnome-shell-extensions/distinfo index 200627acc554..938599ce62f1 100644 --- a/x11/gnome-shell-extensions/distinfo +++ b/x11/gnome-shell-extensions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1748505107 -SHA256 (gnome/gnome-shell-extensions-47.5.tar.xz) = 3a1122d151672ce2dee874fa88e27114c2bdbf210eb32ba07e842eb32754a4ca -SIZE (gnome/gnome-shell-extensions-47.5.tar.xz) = 221612 +TIMESTAMP = 1751207733 +SHA256 (gnome/gnome-shell-extensions-47.6.tar.xz) = 44f6af6e11f17324c25ec290c4727517f2331c335c6e5de5859178911b7cfd33 +SIZE (gnome/gnome-shell-extensions-47.6.tar.xz) = 221684 diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index 56424ccc24ff..3bce8c6a07b9 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -1,6 +1,5 @@ PORTNAME= gnome-shell -PORTVERSION= 47.7 -PORTREVISION= 1 +PORTVERSION= 47.8 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -12,19 +11,14 @@ WWW= https://gitlab.gnome.org/GNOME/gnome-shell LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi -PORTSCOUT= limit:^47\. - BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \ gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ sassc:textproc/sassc -LIB_DEPENDS= libdrm.so:graphics/libdrm \ - libgcr-4.so:security/gcr \ +LIB_DEPENDS= libgcr-4.so:security/gcr \ libgjs.so:lang/gjs \ - libgnome-autoar-0.so:archivers/gnome-autoar \ libgraphene-1.0.so:graphics/graphene \ libical.so:devel/libical \ - libicuuc.so:devel/icu \ libjson-glib-1.0.so:devel/json-glib \ libmutter-15.so:x11-wm/mutter \ libp11-kit.so:security/p11-kit \ @@ -36,14 +30,16 @@ LIB_DEPENDS= libdrm.so:graphics/libdrm \ RUN_DEPENDS= gdm:x11/gdm \ tecla:x11/tecla -USES= compiler:c11 cpe gettext gnome gstreamer localbase \ +USES= compiler:c11 cpe gettext-tools gnome gstreamer localbase \ meson pathfix pkgconfig python:build shebangfix tar:xz xorg CPE_VENDOR= gnome USE_GNOME= atk evolutiondataserver3 gdkpixbuf glib20 \ gnomedesktop4 gnomecontrolcenter3 gtk40 introspection \ libxml2 libxslt:build USE_XORG= x11 xfixes -USE_LDCONFIG= yes + +PORTSCOUT= limit:^47\. + SHEBANG_FILES= src/gnome-shell-test-tool.in \ src/data-to-c.py # These libs are found via rpath mechanism diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo index 5905bfdddc94..0dedebf54cb1 100644 --- a/x11/gnome-shell/distinfo +++ b/x11/gnome-shell/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1748504335 -SHA256 (gnome/gnome-shell-47.7.tar.xz) = 7afb263e95327e3c05775553a409b26fc224004784224e5927bc28aa6550e3ab -SIZE (gnome/gnome-shell-47.7.tar.xz) = 2142328 +TIMESTAMP = 1751312448 +SHA256 (gnome/gnome-shell-47.8.tar.xz) = 42d19a2ff449ce0cb139ec240b4a969d8df9ad7c9b938364461a0360f1c3a028 +SIZE (gnome/gnome-shell-47.8.tar.xz) = 2142660 diff --git a/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml b/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml index aff663e3f53b..56ce41638f6d 100644 --- a/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml +++ b/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml @@ -13,8 +13,7 @@ <arg type="s" direction="in"/> <arg type="h" direction="out"/> </method> - <method name="GetSessionForCookie"> - <arg type="s" direction="in"/> + <method name="GetCurrentSession"> <arg type="o" direction="out"/> </method> <method name="ListSessions"> diff --git a/x11/gnome-shell/files/patch-meson.build b/x11/gnome-shell/files/patch-meson.build index 80da036290d5..3b08518ebe6e 100644 --- a/x11/gnome-shell/files/patch-meson.build +++ b/x11/gnome-shell/files/patch-meson.build @@ -1,12 +1,20 @@ ---- meson.build.orig 2023-04-24 08:26:56 UTC +--- meson.build.orig 2025-06-29 10:48:12 UTC +++ meson.build -@@ -148,8 +148,10 @@ cdata.set('HAVE_FDWALK', cc.has_function('fdwalk')) +@@ -157,11 +157,13 @@ cdata.set('HAVE_SYS_RESOURCE_H', cc.has_header('sys/re cdata.set('HAVE_MALLINFO', cc.has_function('mallinfo')) cdata.set('HAVE_MALLINFO2', cc.has_function('mallinfo2')) cdata.set('HAVE_SYS_RESOURCE_H', cc.has_header('sys/resource.h')) +-cdata.set('HAVE_EXE_INTROSPECTION', +- cc.has_header('elf.h') and +- cc.has_header('link.h') and +- cc.has_define('__GLIBC__', prefix: '#include <link.h>') +-) +if host_machine.system() == 'linux' - cdata.set('HAVE_EXE_INTROSPECTION', - cc.has_header('elf.h') and cc.has_header('link.h')) ++ cdata.set('HAVE_EXE_INTROSPECTION', ++ cc.has_header('elf.h') and ++ cc.has_header('link.h') and ++ cc.has_define('__GLIBC__', prefix: '#include <link.h>') ++ ) +endif cdata.set('HAVE__NL_TIME_FIRST_WEEKDAY', cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY') diff --git a/x11/gnome-shell/pkg-message b/x11/gnome-shell/pkg-message deleted file mode 100644 index 47d33bee49d9..000000000000 --- a/x11/gnome-shell/pkg-message +++ /dev/null @@ -1,17 +0,0 @@ -[ -{ type: install - message: <<EOM -Gnome-shell requires acceleration of to work. For this a nvidia card -with the nvidia-driver, or a Intel/ATI KMS enabled card is needed. - -For the nvidia users no other changes are needed. For Intel/ATI KMS -driver the user needs to have read/write permissions on -/dev/dri/cardN (usually N=0). If gnome-shell is launched from gdm, the -gdm user also needs this access. - -Access can be granted by adding the user(s) to the video group. - -% pw groupmod video -m jerry -EOM -} -] diff --git a/x11/grim/Makefile b/x11/grim/Makefile index 51536628b632..f6475d2804ea 100644 --- a/x11/grim/Makefile +++ b/x11/grim/Makefile @@ -1,24 +1,25 @@ PORTNAME= grim DISTVERSIONPREFIX= v -DISTVERSION= 1.4.1 -PORTREVISION= 2 +DISTVERSION= 1.5.0 CATEGORIES= x11 wayland -MASTER_SITES= https://git.sr.ht/~emersion/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ MAINTAINER= jbeich@FreeBSD.org COMMENT= Grab images from a Wayland compositor -WWW= https://sr.ht/~emersion/grim/ +WWW= https://gitlab.freedesktop.org/emersion/grim LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= wayland-protocols>=1.14:graphics/wayland-protocols +BUILD_DEPENDS= wayland-protocols>=1.37:graphics/wayland-protocols LIB_DEPENDS= libpng.so:graphics/png \ libwayland-client.so:graphics/wayland USES= compiler:c11 gnome meson pkgconfig xorg +USE_GITLAB= yes USE_GNOME= cairo USE_XORG= pixman +GL_SITE= https://gitlab.freedesktop.org +GL_ACCOUNT= emersion PLIST_FILES= bin/${PORTNAME} OPTIONS_DEFINE= JPEG MANPAGES diff --git a/x11/grim/distinfo b/x11/grim/distinfo index 12ceee6a8fb4..5f1329e22bec 100644 --- a/x11/grim/distinfo +++ b/x11/grim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686745509 -SHA256 (grim-v1.4.1.tar.gz) = 5ed8e70fcd83a7e203e92d34dbb82a1342d3f13ad98a6b0310cc97e1a9342ded -SIZE (grim-v1.4.1.tar.gz) = 18372 +TIMESTAMP = 1751826241 +SHA256 (grim-v1.5.0.tar.bz2) = f27cbbc87c191a10b4643cb1f600a3b6cce1613cfb46e4b199b098fb3b83a5a9 +SIZE (grim-v1.5.0.tar.bz2) = 18502 diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index 3e0c6aa0774d..304ffa7cde68 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,7 +1,7 @@ PORTNAME= kitty DISTVERSIONPREFIX= v DISTVERSION= 0.42.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 wayland MAINTAINER= nivit@FreeBSD.org diff --git a/x11/nwg-bar/Makefile b/x11/nwg-bar/Makefile index f939b6b7c1c5..a977beccdcba 100644 --- a/x11/nwg-bar/Makefile +++ b/x11/nwg-bar/Makefile @@ -1,7 +1,7 @@ PORTNAME= nwg-bar DISTVERSIONPREFIX= v DISTVERSION= 0.1.6 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= x11 wayland MAINTAINER= ports@FreeBSD.org diff --git a/x11/nwg-dock-hyprland/Makefile b/x11/nwg-dock-hyprland/Makefile index 24ee2297fdd6..de71a642ad9b 100644 --- a/x11/nwg-dock-hyprland/Makefile +++ b/x11/nwg-dock-hyprland/Makefile @@ -1,7 +1,7 @@ PORTNAME= nwg-dock-hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.4.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MAINTAINER= ports@FreeBSD.org diff --git a/x11/nwg-dock/Makefile b/x11/nwg-dock/Makefile index 9807ee9d3663..2baba1d7828b 100644 --- a/x11/nwg-dock/Makefile +++ b/x11/nwg-dock/Makefile @@ -1,7 +1,7 @@ PORTNAME= nwg-dock DISTVERSIONPREFIX= v DISTVERSION= 0.4.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MAINTAINER= ports@FreeBSD.org diff --git a/x11/nwg-drawer/Makefile b/x11/nwg-drawer/Makefile index 216a9407c572..9722f89d7b91 100644 --- a/x11/nwg-drawer/Makefile +++ b/x11/nwg-drawer/Makefile @@ -1,7 +1,7 @@ PORTNAME= nwg-drawer DISTVERSIONPREFIX= v DISTVERSION= 0.6.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 wayland MAINTAINER= ports@FreeBSD.org diff --git a/x11/nwg-look/Makefile b/x11/nwg-look/Makefile index 4432f6188bd0..4fd302264f85 100644 --- a/x11/nwg-look/Makefile +++ b/x11/nwg-look/Makefile @@ -1,7 +1,7 @@ PORTNAME= nwg-look DISTVERSIONPREFIX= v DISTVERSION= 1.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 wayland MAINTAINER= ports@FreeBSD.org diff --git a/x11/nwg-menu/Makefile b/x11/nwg-menu/Makefile index 59f222b5365a..d4c1d87707dd 100644 --- a/x11/nwg-menu/Makefile +++ b/x11/nwg-menu/Makefile @@ -1,7 +1,7 @@ PORTNAME= nwg-menu DISTVERSIONPREFIX= v DISTVERSION= 0.1.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 wayland MAINTAINER= ports@FreeBSD.org diff --git a/x11/p5-X11-XCB/Makefile b/x11/p5-X11-XCB/Makefile index 83e109467c12..2a3e6ca68931 100644 --- a/x11/p5-X11-XCB/Makefile +++ b/x11/p5-X11-XCB/Makefile @@ -1,5 +1,5 @@ PORTNAME= X11-XCB -PORTVERSION= 0.23 +DISTVERSION= 0.24 CATEGORIES= x11 perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,28 +11,25 @@ WWW= https://metacpan.org/release/X11-XCB LICENSE= ART10 GPLv1+ LICENSE_COMB= dual -LIB_DEPENDS= libxcb.so:x11/libxcb \ - libxcb-util.so:x11/xcb-util \ - libxcb-icccm.so:x11/xcb-util-wm -BUILD_DEPENDS= \ - ${LOCALBASE}/share/xcb/xcb.xsd:x11/xcb-proto \ +BUILD_DEPENDS= ${LOCALBASE}/share/xcb/xcb.xsd:x11/xcb-proto \ p5-Data-Dump>=0:devel/p5-Data-Dump \ p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \ p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \ p5-XML-Descent>=0:textproc/p5-XML-Descent \ p5-XML-Simple>=0:textproc/p5-XML-Simple \ p5-XS-Object-Magic>=0:devel/p5-XS-Object-Magic -RUN_DEPENDS= \ - p5-Mouse>=0:devel/p5-Mouse \ +LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm \ + libxcb-util.so:x11/xcb-util \ + libxcb.so:x11/libxcb +RUN_DEPENDS= p5-Mouse>=0:devel/p5-Mouse \ p5-Try-Tiny>=0:lang/p5-Try-Tiny \ p5-XS-Object-Magic>=0:devel/p5-XS-Object-Magic -TEST_DEPENDS= \ - p5-Test-Deep>=0:devel/p5-Test-Deep \ +TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \ p5-Test-Exception>=0:devel/p5-Test-Exception USES= localbase perl5 xorg USE_PERL5= configure -USE_XORG= x11 xcb xorgproto xinerama +USE_XORG= x11 xcb xinerama xorgproto MAKE_JOBS_UNSAFE= yes post-install: diff --git a/x11/p5-X11-XCB/distinfo b/x11/p5-X11-XCB/distinfo index a8c9e920d192..1a1d12ffcbed 100644 --- a/x11/p5-X11-XCB/distinfo +++ b/x11/p5-X11-XCB/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728130534 -SHA256 (X11-XCB-0.23.tar.gz) = 70aecd338e0a75cbb1272bde181c10343f2aa700fa0dd9d5375f4b006a8b7b5b -SIZE (X11-XCB-0.23.tar.gz) = 170952 +TIMESTAMP = 1751647413 +SHA256 (X11-XCB-0.24.tar.gz) = 788519673a43c4751e73061a8821b658fc95f06d5c19c9f1debb605fb20ba045 +SIZE (X11-XCB-0.24.tar.gz) = 170844 diff --git a/x11/p5-X11-XCB/pkg-descr b/x11/p5-X11-XCB/pkg-descr index acd4cffef805..b2f102e37600 100644 --- a/x11/p5-X11-XCB/pkg-descr +++ b/x11/p5-X11-XCB/pkg-descr @@ -1,2 +1,2 @@ -The modul bindings wrap libxcb, a C library to speak with X11. It -provides an object oriented interface to the libxcb methods using Mouse. +Perl bindings around libxcb, a C library for X11 interaction. It provides +an object oriented interface to the libxcb methods. diff --git a/x11/py-mouseinfo/Makefile b/x11/py-mouseinfo/Makefile index ebdbd7903321..6ba851ef24cc 100644 --- a/x11/py-mouseinfo/Makefile +++ b/x11/py-mouseinfo/Makefile @@ -1,6 +1,6 @@ PORTNAME= mouseinfo DISTVERSION= 0.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11/py-mouseinfo/files/patch-src_mouseinfo_____init____.py b/x11/py-mouseinfo/files/patch-src_mouseinfo_____init____.py new file mode 100644 index 000000000000..a778e04c1f3e --- /dev/null +++ b/x11/py-mouseinfo/files/patch-src_mouseinfo_____init____.py @@ -0,0 +1,66 @@ +--- src/mouseinfo/__init__.py.orig 2025-07-05 20:10:22 UTC ++++ src/mouseinfo/__init__.py +@@ -203,7 +203,7 @@ elif sys.platform == 'darwin': + getPixel = _macGetPixel + + +-elif platform.system() == 'Linux': ++elif platform.system() == 'Linux' or platform.system() == 'FreeBSD': + from Xlib.display import Display + import errno + +@@ -229,7 +229,7 @@ elif platform.system() == 'Linux': + + def _linuxScreenshot(filename=None): + if not scrotExists: +- raise NotImplementedError('"scrot" must be installed to use screenshot functions in Linux. Run: sudo apt-get install scrot') ++ raise NotImplementedError('"scrot" must be installed to use screenshot functions in FreeBSD/Linux.') + + if filename is not None: + tmpFilename = filename +@@ -247,7 +247,7 @@ elif platform.system() == 'Linux': + os.unlink(tmpFilename) + return im + else: +- raise Exception('The scrot program must be installed to take a screenshot with PyScreeze on Linux. Run: sudo apt-get install scrot') ++ raise Exception('The scrot program must be installed to take a screenshot with PyScreeze on FreeBSD/Linux') + screenshot = _linuxScreenshot + + def _linuxSize(): +@@ -262,14 +262,14 @@ RUNNING_PYTHON_2 = sys.version_info[0] == 2 + + RUNNING_PYTHON_2 = sys.version_info[0] == 2 + +-if platform.system() == 'Linux': ++if platform.system() == 'Linux' or platform.system() == 'FreeBSD': + if RUNNING_PYTHON_2: + try: + import Tkinter as tkinter + ttk = tkinter + from Tkinter import Event + except ImportError: +- sys.exit('NOTE: You must install tkinter on Linux to use MouseInfo. Run the following: sudo apt-get install python-tk python-dev') ++ sys.exit('NOTE: You must install tkinter on FreeBSD/Linux to use MouseInfo.') + else: + # Running Python 3+: + try: +@@ -277,7 +277,7 @@ if platform.system() == 'Linux': + from tkinter import ttk + from tkinter import Event + except ImportError: +- sys.exit('NOTE: You must install tkinter on Linux to use MouseInfo. Run the following: sudo apt-get install python3-tk python3-dev') ++ sys.exit('NOTE: You must install tkinter on FreeBSD/Linux to use MouseInfo.') + else: + # Running Windows or macOS: + if RUNNING_PYTHON_2: +@@ -358,8 +358,8 @@ class MouseInfoWindow: + pyperclip.copy(textToCopy) + self.statusbarSV.set('Copied ' + textToCopy) + except pyperclip.PyperclipException as e: +- if platform.system() == 'Linux': +- self.statusbarSV.set('Copy failed. Run "sudo apt-get install xsel".') ++ if platform.system() == 'Linux' or platform.system() == 'FreeBSD': ++ self.statusbarSV.set('Copy failed. You must nstall xsel".') + else: + self.statusbarSV.set('Clipboard error: ' + str(e)) + diff --git a/x11/py-pyautogui/Makefile b/x11/py-pyautogui/Makefile index 8329e82f0b21..ec994a2535f6 100644 --- a/x11/py-pyautogui/Makefile +++ b/x11/py-pyautogui/Makefile @@ -1,6 +1,5 @@ PORTNAME= pyautogui -DISTVERSION= 0.9.53 -PORTREVISION= 2 +DISTVERSION= 0.9.54 CATEGORIES= x11 python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,9 +18,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-xlib>0:x11-toolkits/py-python-xlib@${ ${PYTHON_PKGNAMEPREFIX}pyscreeze>0:x11/py-pyscreeze@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mouseinfo>0:x11/py-mouseinfo@${PY_FLAVOR} -USES= python +USES= python dos2unix USE_PYTHON= distutils autoplist NO_ARCH= yes +DOS2UNIX_GLOB= *.py + .include <bsd.port.mk> diff --git a/x11/py-pyautogui/distinfo b/x11/py-pyautogui/distinfo index ef262012272a..4befb41ec0ab 100644 --- a/x11/py-pyautogui/distinfo +++ b/x11/py-pyautogui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682517697 -SHA256 (PyAutoGUI-0.9.53.tar.gz) = d31de8f712218d90be7fc98091fce1a12a3e9196e0c814eb9afd73bb2ec97035 -SIZE (PyAutoGUI-0.9.53.tar.gz) = 59031 +TIMESTAMP = 1751744669 +SHA256 (PyAutoGUI-0.9.54.tar.gz) = dd1d29e8fd118941cb193f74df57e5c6ff8e9253b99c7b04f39cfc69f3ae04b2 +SIZE (PyAutoGUI-0.9.54.tar.gz) = 61236 diff --git a/x11/py-pyautogui/files/patch-pyautogui_____init____.py b/x11/py-pyautogui/files/patch-pyautogui_____init____.py new file mode 100644 index 000000000000..451541f36524 --- /dev/null +++ b/x11/py-pyautogui/files/patch-pyautogui_____init____.py @@ -0,0 +1,40 @@ +--- pyautogui/__init__.py.orig 2025-07-05 19:46:17 UTC ++++ pyautogui/__init__.py +@@ -540,7 +540,7 @@ elif sys.platform == "win32": + from . import _pyautogui_osx as platformModule + elif sys.platform == "win32": + from . import _pyautogui_win as platformModule +-elif platform.system() == "Linux": ++elif platform.system() == "Linux" or platform.system() == "FreeBSD": + from . import _pyautogui_x11 as platformModule + else: + raise NotImplementedError("Your platform (%s) is not supported by PyAutoGUI." % (platform.system())) +@@ -848,8 +848,8 @@ def _normalizeButton(button): + + # Check that `button` has a valid value: + button = button.lower() +- if platform.system() == "Linux": +- # Check for valid button arg on Linux: ++ if platform.system() == "Linux" or platform.system() == "FreeBSD": ++ # Check for valid button arg on FreeBSD/Linux: + if button not in (LEFT, MIDDLE, RIGHT, PRIMARY, SECONDARY, 1, 2, 3, 4, 5, 6, 7): + raise PyAutoGUIException( + "button argument must be one of ('left', 'middle', 'right', 'primary', 'secondary', 1, 2, 3, 4, 5, 6, 7)" +@@ -1125,7 +1125,7 @@ def doubleClick(x=None, y=None, interval=0.0, button=L + platformModule._multiClick(x, y, button, 2) + _logScreenshot(logScreenshot, 'click', '%s,%s,%s,2' % (x, y, button), folder='.') + else: +- # Click for Windows or Linux: ++ # Click for Windows, FreeBSD or Linux: + click(x, y, 2, interval, button, duration, tween, logScreenshot, _pause=False) + + +@@ -1167,7 +1167,7 @@ def tripleClick(x=None, y=None, interval=0.0, button=L + _logScreenshot(logScreenshot, "click", "%s,%s,%s,3" % (x, y, button), folder=".") + platformModule._multiClick(x, y, button, 3) + else: +- # Click for Windows or Linux: ++ # Click for Windows, FreeBSD or Linux: + click(x, y, 3, interval, button, duration, tween, logScreenshot, _pause=False) + + diff --git a/x11/py-pyscreeze/Makefile b/x11/py-pyscreeze/Makefile index 799c74f467ce..55004a3a918b 100644 --- a/x11/py-pyscreeze/Makefile +++ b/x11/py-pyscreeze/Makefile @@ -1,10 +1,8 @@ PORTNAME= pyscreeze -DISTVERSION= 0.1.28 -PORTREVISION= 1 +DISTVERSION= 1.0.1 CATEGORIES= x11 python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= PyScreeze-${DISTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= cross-platform screenshot module for python diff --git a/x11/py-pyscreeze/distinfo b/x11/py-pyscreeze/distinfo index 42a1959fc685..f153f14d5a29 100644 --- a/x11/py-pyscreeze/distinfo +++ b/x11/py-pyscreeze/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682524999 -SHA256 (PyScreeze-0.1.28.tar.gz) = 4428600ed19b30cd3f4b5d83767d198fc1dbae7439eecf9bd795445c009b67ae -SIZE (PyScreeze-0.1.28.tar.gz) = 25547 +TIMESTAMP = 1751745551 +SHA256 (pyscreeze-1.0.1.tar.gz) = cf1662710f1b46aa5ff229ee23f367da9e20af4a78e6e365bee973cad0ead4be +SIZE (pyscreeze-1.0.1.tar.gz) = 27826 diff --git a/x11/py-pyscreeze/files/patch-pyscreeze_____init____.py b/x11/py-pyscreeze/files/patch-pyscreeze_____init____.py new file mode 100644 index 000000000000..0c981964cf72 --- /dev/null +++ b/x11/py-pyscreeze/files/patch-pyscreeze_____init____.py @@ -0,0 +1,52 @@ +--- pyscreeze/__init__.py.orig 2025-07-05 20:35:11 UTC ++++ pyscreeze/__init__.py +@@ -64,7 +64,7 @@ try: + + GNOMESCREENSHOT_EXISTS = False + try: +- if sys.platform.startswith('linux'): ++ if sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): + whichProc = subprocess.Popen(['which', 'gnome-screenshot'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + GNOMESCREENSHOT_EXISTS = whichProc.wait() == 0 + except OSError as ex: +@@ -77,7 +77,7 @@ try: + + SCROT_EXISTS = False + try: +- if sys.platform.startswith('linux'): ++ if sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): + whichProc = subprocess.Popen(['which', 'scrot'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + SCROT_EXISTS = whichProc.wait() == 0 + except OSError as ex: +@@ -89,7 +89,7 @@ except OSError as ex: + raise + + # On Linux, figure out which window system is being used. +-if sys.platform.startswith('linux'): ++if sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): + RUNNING_X11 = False + RUNNING_WAYLAND = False + if os.environ.get('XDG_SESSION_TYPE') == 'x11': +@@ -622,11 +622,11 @@ def _screenshot_linux(imageFilename=None, region=None) + subprocess.call(['gnome-screenshot', '-f', tmpFilename]) + elif RUNNING_WAYLAND and SCROT_EXISTS and not GNOMESCREENSHOT_EXISTS: + raise PyScreezeException( +- 'Your computer uses the Wayland window system. Scrot works on the X11 window system but not Wayland. You must install gnome-screenshot by running `sudo apt install gnome-screenshot`' # noqa ++ 'Your computer uses the Wayland window system. Scrot works on the X11 window system but not Wayland. You must install gnome-screenshot' # noqa + ) + else: + raise Exception( +- 'To take screenshots, you must install Pillow version 9.2.0 or greater and gnome-screenshot by running `sudo apt install gnome-screenshot`' # noqa ++ 'To take screenshots, you must install Pillow version 9.2.0 or greater and gnome-screenshot' # noqa + ) + + im = Image.open(tmpFilename) +@@ -772,7 +772,7 @@ elif sys.platform == 'win32': + screenshot = _screenshot_osx + elif sys.platform == 'win32': + screenshot = _screenshot_win32 +-elif sys.platform.startswith('linux'): ++elif sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): + # Everything else is considered to be Linux. + screenshot = _screenshot_linux + else: diff --git a/x11/py-python-xapp/Makefile b/x11/py-python-xapp/Makefile index 4cedbf58113e..8e16f3093490 100644 --- a/x11/py-python-xapp/Makefile +++ b/x11/py-python-xapp/Makefile @@ -1,6 +1,5 @@ PORTNAME= python-xapp -DISTVERSION= 2.4.1 -PORTREVISION= 1 +DISTVERSION= 2.4.2 CATEGORIES= x11 gnome PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DIST_SUBDIR= gnome diff --git a/x11/py-python-xapp/distinfo b/x11/py-python-xapp/distinfo index d78cd164de61..18854ef67c69 100644 --- a/x11/py-python-xapp/distinfo +++ b/x11/py-python-xapp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716277794 -SHA256 (gnome/linuxmint-python3-xapp-2.4.1_GH0.tar.gz) = d994f922a9816c71d9b565f4b2552cba4ca33011efb1203fb8199d9b2d0d7f3d -SIZE (gnome/linuxmint-python3-xapp-2.4.1_GH0.tar.gz) = 21181 +TIMESTAMP = 1735622936 +SHA256 (gnome/linuxmint-python3-xapp-2.4.2_GH0.tar.gz) = 39e4c3f06732e9d197b9aed31444653da2976c1d66dded870b52cc9782f2237d +SIZE (gnome/linuxmint-python3-xapp-2.4.2_GH0.tar.gz) = 21482 diff --git a/x11/py-pyvirtualdisplay/Makefile b/x11/py-pyvirtualdisplay/Makefile index b85a083cd1d0..1ce95e8c1d70 100644 --- a/x11/py-pyvirtualdisplay/Makefile +++ b/x11/py-pyvirtualdisplay/Makefile @@ -1,6 +1,6 @@ PORTNAME= pyvirtualdisplay PORTVERSION= 0.2.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +13,7 @@ WWW= https://github.com/ponty/pyvirtualdisplay LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cogapp>=2.3:devel/py-cogapp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyscreenshot>0:x11/py-pyscreenshot@${PY_FLAVOR} \ diff --git a/x11/remontoire/Makefile b/x11/remontoire/Makefile index e47082e7e866..09c18e22b287 100644 --- a/x11/remontoire/Makefile +++ b/x11/remontoire/Makefile @@ -1,25 +1,29 @@ PORTNAME= remontoire -DISTVERSION= 1.4.0 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 1.4.4 CATEGORIES= x11 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= atanubiswas484@gmail.com COMMENT= Keybinding viewer for i3 and other programs WWW= https://github.com/regolith-linux/remontoire LICENSE= GPLv3 +BUILD_DEPENDS= appstream-util:devel/appstream-glib LIB_DEPENDS= libgee-0.8.so:devel/libgee \ libjson-glib-1.0.so:devel/json-glib -USES= gettext-tools gnome meson pkgconfig python:build shebangfix vala:build +USES= desktop-file-utils gettext-tools gnome meson pkgconfig \ + python:build shebangfix vala:build USE_GITHUB= yes -USE_GNOME= gtk30 GH_ACCOUNT= regolith-linux +USE_GNOME= gtk30 +GLIB_SCHEMAS= org.regolith-linux.remontoire.gschema.xml + SHEBANG_FILES= build-aux/meson/postinstall.py + PLIST_FILES= bin/${PORTNAME} \ share/appdata/org.regolith-linux.remontoire.appdata.xml \ share/applications/org.regolith-linux.remontoire.desktop -GLIB_SCHEMAS= org.regolith-linux.remontoire.gschema.xml .include <bsd.port.mk> diff --git a/x11/remontoire/distinfo b/x11/remontoire/distinfo index 0d2db9199787..92690cc1ebea 100644 --- a/x11/remontoire/distinfo +++ b/x11/remontoire/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1602948600 -SHA256 (regolith-linux-remontoire-1.4.0_GH0.tar.gz) = 35777a10a753b15debe64867deca2332733f6bee6b85936e75e0e0514aa900da -SIZE (regolith-linux-remontoire-1.4.0_GH0.tar.gz) = 25130 +TIMESTAMP = 1752440082 +SHA256 (regolith-linux-remontoire-v1.4.4_GH0.tar.gz) = a54ebc08e6d4f63806df2dc0f88e4ef57433aa2d7712b36ddb788cc81c943016 +SIZE (regolith-linux-remontoire-v1.4.4_GH0.tar.gz) = 41267 diff --git a/x11/rio/Makefile b/x11/rio/Makefile index 62245e643ba5..edd357a5c749 100644 --- a/x11/rio/Makefile +++ b/x11/rio/Makefile @@ -14,6 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv7= rustc-LLVM ERROR: out of memory +BROKEN_i386= rustc-LLVM ERROR: out of memory LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 diff --git a/x11/showmethekey/Makefile b/x11/showmethekey/Makefile index 1eea7e82da43..aa157be621b0 100644 --- a/x11/showmethekey/Makefile +++ b/x11/showmethekey/Makefile @@ -1,6 +1,6 @@ PORTNAME= showmethekey DISTVERSIONPREFIX= v -DISTVERSION= 1.18.3 +DISTVERSION= 1.18.4 CATEGORIES= x11 wayland MAINTAINER= eduardo@FreeBSD.org diff --git a/x11/showmethekey/distinfo b/x11/showmethekey/distinfo index ec1192044c70..e3139b70e65b 100644 --- a/x11/showmethekey/distinfo +++ b/x11/showmethekey/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1748551537 -SHA256 (AlynxZhou-showmethekey-v1.18.3_GH0.tar.gz) = dee790c12e4946587d5b9979ad3ec37862a0f59e300756db5c93e39cc4efa0ff -SIZE (AlynxZhou-showmethekey-v1.18.3_GH0.tar.gz) = 5278234 +TIMESTAMP = 1751881961 +SHA256 (AlynxZhou-showmethekey-v1.18.4_GH0.tar.gz) = ab0d921aa8daf7b56db9579c1b48e89ff177a42232ca1c6dbb17f352b766574b +SIZE (AlynxZhou-showmethekey-v1.18.4_GH0.tar.gz) = 5279536 diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile index e31a97d5aea6..6c472165e5a1 100644 --- a/x11/swayimg/Makefile +++ b/x11/swayimg/Makefile @@ -1,6 +1,6 @@ PORTNAME= swayimg DISTVERSIONPREFIX= v -DISTVERSION= 4.3 +DISTVERSION= 4.5 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -10,15 +10,13 @@ WWW= https://github.com/artemsen/swayimg LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= wayland-protocols>=1.35:graphics/wayland-protocols LIB_DEPENDS= libinotify.so:devel/libinotify \ - libwayland-client.so:graphics/wayland \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libxkbcommon.so:x11/libxkbcommon TEST_DEPENDS= googletest>0:devel/googletest -USES= meson pkgconfig +USES= desktop-file-utils meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= artemsen MESON_ARGS= -Dversion="${DISTVERSIONFULL}" @@ -32,10 +30,18 @@ PLIST_FILES= bin/${PORTNAME} \ ${DATADIR}/${PORTNAME}rc \ ${NULL} +# XXX Drop after FreeBSD 13.5 EOL around 2026-04-30 +# https://cgit.freebsd.org/src/commit/?id=af93fea71038 +.if !exists(/usr/include/sys/timerfd.h) +LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim +.endif + OPTIONS_DEFINE= AVIF BASH GIF HEIF JPEG JSON JXL LIBEXIF LIBRSVG2 \ OPENEXR PNG RAW SIXEL TIFF WEBP ZSH -OPTIONS_DEFAULT=AVIF BASH GIF HEIF JPEG JSON JXL LIBEXIF LIBRSVG2 \ - OPENEXR PNG RAW SIXEL TIFF WEBP ZSH +OPTIONS_DEFAULT=AVIF BASH DRM GIF HEIF JPEG JSON JXL LIBEXIF LIBRSVG2 \ + OPENEXR PNG RAW SIXEL TIFF WAYLAND WEBP ZSH +OPTIONS_MULTI= GUI +OPTIONS_MULTI_GUI= DRM WAYLAND OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/} AVIF_LIB_DEPENDS= libavif.so:graphics/libavif @@ -45,6 +51,10 @@ BASH_BUILD_DEPENDS= bash-completion>0:shells/bash-completion BASH_MESON_ENABLED= bash BASH_PLIST_FILES= share/bash-completion/completions/${PORTNAME} +DRM_DESC= KMS console support +DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm +DRM_MESON_ENABLED= drm + GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_MESON_ENABLED= gif @@ -83,6 +93,10 @@ SIXEL_MESON_ENABLED= sixel TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_MESON_ENABLED= tiff +WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.35:graphics/wayland-protocols +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland +WAYLAND_MESON_ENABLED= wayland + WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp WEBP_MESON_ENABLED= webp diff --git a/x11/swayimg/distinfo b/x11/swayimg/distinfo index 5e289943c8db..71e228c9a158 100644 --- a/x11/swayimg/distinfo +++ b/x11/swayimg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750862253 -SHA256 (artemsen-swayimg-v4.3_GH0.tar.gz) = 5213a9627421eb8907cfff5b3f6d91d53597281b42e4871cebf83fc7dfc1d2a6 -SIZE (artemsen-swayimg-v4.3_GH0.tar.gz) = 785384 +TIMESTAMP = 1752047007 +SHA256 (artemsen-swayimg-v4.5_GH0.tar.gz) = 4f0c491f873e37b85342a92d9b0ecc570a059bb971040c23075d4c3ab401680b +SIZE (artemsen-swayimg-v4.5_GH0.tar.gz) = 788904 diff --git a/x11/swaync/Makefile b/x11/swaync/Makefile index 29cbf328c94a..8925b0b4fc0b 100644 --- a/x11/swaync/Makefile +++ b/x11/swaync/Makefile @@ -1,6 +1,6 @@ PORTNAME= swaync DISTVERSIONPREFIX= v -PORTVERSION= 0.11.0 +PORTVERSION= 0.12.0 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -10,17 +10,19 @@ WWW= https://github.com/ErikReider/SwayNotificationCenter LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= sassc:textproc/sassc +BUILD_DEPENDS= blueprint-compiler:devel/blueprint-compiler \ + sassc:textproc/sassc LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ libgee-0.8.so:devel/libgee \ - libgranite.so:x11-toolkits/granite \ - libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \ - libhandy-1.so:x11-toolkits/libhandy + libgraphene-1.0.so:graphics/graphene \ + libwayland-client.so:graphics/wayland \ + libgranite-7.so:x11-toolkits/granite7 \ + libgtk4-layer-shell.so:x11-toolkits/gtk4-layer-shell USES= compiler:c11 gnome meson pkgconfig \ python:build shebangfix vala:build USE_GITHUB= yes -USE_GNOME= cairo gdkpixbuf gtk30 introspection:build +USE_GNOME= cairo gdkpixbuf gtk40 libadwaita GH_ACCOUNT= ErikReider GH_PROJECT= SwayNotificationCenter SHEBANG_FILES= build-aux/meson/postinstall.py diff --git a/x11/swaync/distinfo b/x11/swaync/distinfo index c44154e66ea9..eb175a7065c8 100644 --- a/x11/swaync/distinfo +++ b/x11/swaync/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744053426 -SHA256 (ErikReider-SwayNotificationCenter-v0.11.0_GH0.tar.gz) = 7f69fe248994404af4115d335929b3bd2faf8c6321374b5b3e3fa2c97d169c90 -SIZE (ErikReider-SwayNotificationCenter-v0.11.0_GH0.tar.gz) = 1717108 +TIMESTAMP = 1752236102 +SHA256 (ErikReider-SwayNotificationCenter-v0.12.0_GH0.tar.gz) = 9dcc103fddad0cff872755c09c937642989e6bc0af73040e2af7982667bfdec7 +SIZE (ErikReider-SwayNotificationCenter-v0.12.0_GH0.tar.gz) = 1726976 diff --git a/x11/swaync/files/patch-src_meson.build b/x11/swaync/files/patch-src_meson.build deleted file mode 100644 index 9f705c2cd349..000000000000 --- a/x11/swaync/files/patch-src_meson.build +++ /dev/null @@ -1,15 +0,0 @@ -Drop after x11-toolkits/libhandy >= 1.8.0 update - -src/meson.build:77:2: ERROR: Dependency lookup for libhandy-1 with method 'pkgconfig' failed: Invalid version, need 'libhandy-1' ['>= 1.8.0'] found '1.6.2'. - ---- src/meson.build.orig 2024-02-10 16:19:01 UTC -+++ src/meson.build -@@ -74,7 +74,7 @@ app_deps = [ - dependency('gio-unix-2.0', version: '>= 2.50'), - dependency('gtk+-3.0', version: '>= 3.22'), - dependency('json-glib-1.0', version: '>= 1.0'), -- dependency('libhandy-1', version: '>= 1.8.0'), -+ dependency('libhandy-1', version: '>= 1.6.0'), - dependency('granite', version: '>= 6.2.0'), - dependency('gtk-layer-shell-0', - fallback: ['gtk-layer-shell-0', 'gtk-layer-shell'], diff --git a/x11/wallutils/Makefile b/x11/wallutils/Makefile index e04310b5854c..3281237b6c1d 100644 --- a/x11/wallutils/Makefile +++ b/x11/wallutils/Makefile @@ -1,6 +1,6 @@ PORTNAME= wallutils DISTVERSION= 5.12.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 wayland MAINTAINER= eduardo@FreeBSD.org diff --git a/x11/wayst/Makefile b/x11/wayst/Makefile new file mode 100644 index 000000000000..fd6f59b42c75 --- /dev/null +++ b/x11/wayst/Makefile @@ -0,0 +1,44 @@ +PORTNAME= wayst +DISTVERSION= g20250601 +CATEGORIES= x11 wayland + +MAINTAINER= seafork@disroot.org +COMMENT= Simple terminal emulator for Wayland and X11 +WWW= https://github.com/91861/wayst + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libutf8proc.so:textproc/utf8proc + +USES= gl gmake pkgconfig + +USE_GITHUB= yes +GH_ACCOUNT= 91861 +GH_TAGNAME= f5a6c22 + +USE_GL= egl gl + +PLIST_FILES= bin/wayst + +OPTIONS_DEFAULT= WAYLAND X11 +OPTIONS_MULTI= BACKEND +OPTIONS_MULTI_BACKEND= WAYLAND X11 + +WAYLAND_DESC= Use Wayland as the windowing protocol +X11_DESC= Use X11 as the windowing protocol + +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ + libxkbcommon.so:x11/libxkbcommon +WAYLAND_MAKE_ARGS= window_protocol+="wayland" + +X11_USES= xorg +X11_USE= XORG=x11,xrandr,xrender +X11_MAKE_ARGS= window_protocol+="x11" + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wayst + +.include <bsd.port.mk> diff --git a/x11/wayst/distinfo b/x11/wayst/distinfo new file mode 100644 index 000000000000..ffce1159779b --- /dev/null +++ b/x11/wayst/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1751717366 +SHA256 (91861-wayst-g20250601-f5a6c22_GH0.tar.gz) = b6aab52d875b814b6b629daa8653a860ac382bc0a415f0d4fa502f3927f2b370 +SIZE (91861-wayst-g20250601-f5a6c22_GH0.tar.gz) = 623207 diff --git a/x11/wayst/files/patch-Makefile b/x11/wayst/files/patch-Makefile new file mode 100644 index 000000000000..8dcdc7a9ce79 --- /dev/null +++ b/x11/wayst/files/patch-Makefile @@ -0,0 +1,32 @@ +--- Makefile.orig 2025-06-01 11:32:46 UTC ++++ Makefile +@@ -1,5 +1,5 @@ EXEC = wayst + EXEC = wayst +-INSTALL_DIR = /usr/local/bin ++PREFIX ?= /usr/local/bin + + ARGS = + +@@ -37,8 +37,7 @@ else + CFLAGS = -std=c18 -MD -fshort-enums + LDFLAGS = + else +- CFLAGS = -std=c18 -MD -O2 -mtune=generic -ffast-math -fshort-enums -flto=auto +- LDFLAGS = -O2 -flto=auto ++ CFLAGS += -std=c18 -MD + endif + + ifeq ($(libutf8proc),off) +@@ -102,10 +101,10 @@ install: + $(RM) -f $(EXEC) $(OBJ) $(OBJ:.o=.d) + + install: +- cp $(EXEC) $(INSTALL_DIR)/ ++ cp $(EXEC) $(DESTDIR)$(PREFIX)/bin/$(EXEC) + + uninstall: +- $(RM) $(INSTALL_DIR)/$(EXEC) ++ $(RM) $(DESTDIR)$(PREFIX)/$(EXEC) + + -include $(OBJ:.o=.d) + diff --git a/x11/wayst/pkg-descr b/x11/wayst/pkg-descr new file mode 100644 index 000000000000..f44456fe72d4 --- /dev/null +++ b/x11/wayst/pkg-descr @@ -0,0 +1,19 @@ +Simple terminal emulator for Wayland and X11 with OpenGL rendering and +minimal dependencies. + +# Features +- Unicode support +- Text reflow +- 24-bit colors +- Dynamic colors +- All text properties (squiggly underline, blinking, overline etc.) +- Resizable font +- Subpixel antialiasing +- Mouse reporting +- Scrollback +- Mouse text selection +- Clipboard +- Configurable keybindings +- Clickable links, OSC 8 links +- Command history and marks +- Terminal image protocol and sixel graphics (experimental) diff --git a/x11/wl-kbptr/Makefile b/x11/wl-kbptr/Makefile index beb2f07fb3df..e0b62a0888c5 100644 --- a/x11/wl-kbptr/Makefile +++ b/x11/wl-kbptr/Makefile @@ -1,9 +1,9 @@ PORTNAME= wl-kbptr DISTVERSIONPREFIX= v -DISTVERSION= 0.3.0 +DISTVERSION= 0.4.0 CATEGORIES= x11 wayland -MAINTAINER= jbeich@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Control the mouse pointer with the keyboard on Wayland WWW= https://github.com/moverest/wl-kbptr @@ -24,7 +24,8 @@ USES= compiler:c11 gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= cairo GH_ACCOUNT= moverest -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} \ + share/applications/${PORTNAME}.desktop OPTIONS_DEFINE= OPENCV OPTIONS_SLAVE= ${${FLAVOR}_OPTIONS_SLAVE} diff --git a/x11/wl-kbptr/distinfo b/x11/wl-kbptr/distinfo index 2bc7e41b3a58..49b7dbb21521 100644 --- a/x11/wl-kbptr/distinfo +++ b/x11/wl-kbptr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743703239 -SHA256 (moverest-wl-kbptr-v0.3.0_GH0.tar.gz) = 69775029acb8ff7d814a2868afe22e72b8c9c99cbb35b0acf57eccd3609b089c -SIZE (moverest-wl-kbptr-v0.3.0_GH0.tar.gz) = 53657 +TIMESTAMP = 1751561797 +SHA256 (moverest-wl-kbptr-v0.4.0_GH0.tar.gz) = e3655f5305987dbac389a25e64c2f5a028c1651db70ea757024c4efa55c24338 +SIZE (moverest-wl-kbptr-v0.4.0_GH0.tar.gz) = 57749 diff --git a/x11/wmenu/Makefile b/x11/wmenu/Makefile index 33a2ebd90609..ae10b0395978 100644 --- a/x11/wmenu/Makefile +++ b/x11/wmenu/Makefile @@ -18,6 +18,14 @@ LIB_DEPENDS= libwayland-client.so:graphics/wayland \ USES= compiler:c11 gnome meson pkgconfig USE_GNOME= cairo pango +# XXX Drop after FreeBSD 13.5 EOL around 2026-04-30 +# https://cgit.freebsd.org/src/commit/?id=af93fea71038 +.if !exists(/usr/include/sys/timerfd.h) +LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim +CPPFLAGS+= `pkg-config --cflags epoll-shim` +LDFLAGS+= `pkg-config --libs epoll-shim` +.endif + WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= bin/wmenu \ diff --git a/x11/xapp/Makefile b/x11/xapp/Makefile index cea1e537bb49..e0c3b57618a5 100644 --- a/x11/xapp/Makefile +++ b/x11/xapp/Makefile @@ -1,6 +1,5 @@ PORTNAME= xapp -PORTVERSION= 2.8.2 -PORTREVISION= 1 +DISTVERSION= 2.8.9 CATEGORIES= x11 gnome DIST_SUBDIR= gnome @@ -14,25 +13,44 @@ LICENSE_FILE?= ${WRKSRC}/COPYING.LESSER LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu RUN_DEPENDS= bash:shells/bash -USES= gettext-tools gnome meson pkgconfig python shebangfix vala:build xorg +USES= gettext-tools gnome meson pkgconfig python shebangfix xorg USE_GITHUB= yes GH_ACCOUNT= linuxmint -USE_GNOME= cairo gdkpixbuf glib20 gtk-update-icon-cache gtk30 \ - intltool introspection:build libgnomekbd pygobject3 +USE_GNOME= cairo gdkpixbuf glib20 gtk30 libgnomekbd USE_LDCONFIG= yes USE_XORG= x11 GLIB_SCHEMAS= org.x.apps.gschema.xml -SHEBANG_FILES= data libxapp meson-scripts schemas scripts status-applets \ - test-scripts +SHEBANG_FILES= data schemas scripts status-applets test-scripts PLIST_SUB+= LIBVERSION=${PORTVERSION} PORTSCOUT= limit:^[0-9.]+$$ # ignore master.mint* tags -OPTIONS_DEFINE= DOCS -OPTIONS_SUB= yes +BINARY_ALIAS= python3=${PYTHON_CMD} + +OPTIONS_DEFINE= DOCS INTROSPECTION MATE STATUS VAPI XFCE +OPTIONS_DEFAULT= INTROSPECTION MATE STATUS VAPI XFCE +OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc -DOCS_MESON_ON= -Ddocs=true +DOCS_MESON_TRUE= docs + +INTROSPECTION_DESC= Enable GObject introspection +INTROSPECTION_MESON_TRUE= introspection +INTROSPECTION_USE= GNOME=pygobject3,introspection:build + +MATE_DESC= Install mate specific items +MATE_MESON_TRUE= mate + +STATUS_DESC= Build the XApp StatusNotifier service +STATUS_MESON_TRUE= status-notifier + +VAPI_DESC= Enable Vala bindings +VAPI_MESON_TRUE= vapi +VAPI_USES= vala:build +VAPI_IMPLIES= INTROSPECTION + +XFCE_DESC= Install xfce specific items +XFCE_MESON_TRUE= xfce .include <bsd.port.mk> diff --git a/x11/xapp/distinfo b/x11/xapp/distinfo index 6dbec6861fcc..00419dd36ad1 100644 --- a/x11/xapp/distinfo +++ b/x11/xapp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716275951 -SHA256 (gnome/linuxmint-xapp-2.8.2_GH0.tar.gz) = 07b00d02d2bdd93c043e370305071df80f21ded6404f7309b590a8f896e635b2 -SIZE (gnome/linuxmint-xapp-2.8.2_GH0.tar.gz) = 272539 +TIMESTAMP = 1752081537 +SHA256 (gnome/linuxmint-xapp-2.8.9_GH0.tar.gz) = cc2de98f8b2c73f7611af770d398a05560c4419b9390000464b8bcd517c70375 +SIZE (gnome/linuxmint-xapp-2.8.9_GH0.tar.gz) = 276821 diff --git a/x11/xapp/pkg-plist b/x11/xapp/pkg-plist index 9e039328b5f6..1795c71e19e2 100644 --- a/x11/xapp/pkg-plist +++ b/x11/xapp/pkg-plist @@ -1,9 +1,9 @@ bin/pastebin bin/upload-system-info bin/xapp-gpu-offload -bin/xfce4-set-wallpaper +%%XFCE%%bin/xfce4-set-wallpaper etc/X11/xinit/xinitrc.d/80xapp-gtk3-module.sh -etc/xdg/autostart/xapp-sn-watcher.desktop +%%STATUS%%etc/xdg/autostart/xapp-sn-watcher.desktop include/xapp/libxapp/xapp-dark-mode-manager.h include/xapp/libxapp/xapp-favorites.h include/xapp/libxapp/xapp-gpu-offload-helper.h @@ -20,50 +20,50 @@ include/xapp/libxapp/xapp-statusicon-interface.h include/xapp/libxapp/xapp-style-manager.h include/xapp/libxapp/xapp-util.h include/xapp/libxapp/xapp-visibility-group.h -lib/girepository-1.0/XApp-1.0.typelib +%%INTROSPECTION%%lib/girepository-1.0/XApp-1.0.typelib lib/gtk-3.0/modules/libxapp-gtk3-module.so lib/libxapp.so lib/libxapp.so.1 lib/libxapp.so.%%LIBVERSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/XApp.py -lib/xapps/xapp-sn-watcher +%%INTROSPECTION%%%%PYTHON_SITELIBDIR%%/gi/overrides/XApp.py +%%STATUS%%lib/xapps/xapp-sn-watcher libdata/pkgconfig/xapp.pc -libexec/xapps/applet_constants.py -libexec/xapps/mate-xapp-status-applet.py -share/dbus-1/services/org.mate.panel.applet.MateXAppStatusAppletFactory.service -share/dbus-1/services/org.x.StatusNotifierWatcher.service -share/gir-1.0/XApp-1.0.gir +%%MATE%%libexec/xapps/applet_constants.py +%%MATE%%libexec/xapps/mate-xapp-status-applet.py +%%MATE%%share/dbus-1/services/org.mate.panel.applet.MateXAppStatusAppletFactory.service +%%STATUS%%share/dbus-1/services/org.x.StatusNotifierWatcher.service +%%INTROSPECTION%%share/gir-1.0/XApp-1.0.gir share/glade/catalogs/xapp-glade-catalog.xml -%%DOCS%%share/gtk-doc/html/libxapp/XAppDarkModeManager.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppFavorites.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppGpuOffloadHelper.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppGtkWindow.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppIconChooserButton.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppIconChooserDialog.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppKbdLayoutController.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppMonitorBlanker.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppObjectManagerClient.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppPreferencesWindow.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppStackSidebar.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppStatusIcon.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppStatusIconMonitor.html -%%DOCS%%share/gtk-doc/html/libxapp/XAppVisibilityGroup.html -%%DOCS%%share/gtk-doc/html/libxapp/annotation-glossary.html -%%DOCS%%share/gtk-doc/html/libxapp/api-index-full.html -%%DOCS%%share/gtk-doc/html/libxapp/ch01.html -%%DOCS%%share/gtk-doc/html/libxapp/deprecated-api-index.html -%%DOCS%%share/gtk-doc/html/libxapp/home.png -%%DOCS%%share/gtk-doc/html/libxapp/index.html -%%DOCS%%share/gtk-doc/html/libxapp/left-insensitive.png -%%DOCS%%share/gtk-doc/html/libxapp/left.png -%%DOCS%%share/gtk-doc/html/libxapp/libxapp-xapp-util.html -%%DOCS%%share/gtk-doc/html/libxapp/libxapp.devhelp2 -%%DOCS%%share/gtk-doc/html/libxapp/object-tree.html -%%DOCS%%share/gtk-doc/html/libxapp/right-insensitive.png -%%DOCS%%share/gtk-doc/html/libxapp/right.png -%%DOCS%%share/gtk-doc/html/libxapp/style.css -%%DOCS%%share/gtk-doc/html/libxapp/up-insensitive.png -%%DOCS%%share/gtk-doc/html/libxapp/up.png +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppDarkModeManager.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppFavorites.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppGpuOffloadHelper.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppGtkWindow.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppIconChooserButton.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppIconChooserDialog.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppKbdLayoutController.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppMonitorBlanker.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppObjectManagerClient.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppPreferencesWindow.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppStackSidebar.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppStatusIcon.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppStatusIconMonitor.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppVisibilityGroup.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/annotation-glossary.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/api-index-full.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/ch01.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/deprecated-api-index.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/home.png +%%PORTDOCS%%share/gtk-doc/html/libxapp/index.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/left-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/libxapp/left.png +%%PORTDOCS%%share/gtk-doc/html/libxapp/libxapp-xapp-util.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/libxapp.devhelp2 +%%PORTDOCS%%share/gtk-doc/html/libxapp/object-tree.html +%%PORTDOCS%%share/gtk-doc/html/libxapp/right-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/libxapp/right.png +%%PORTDOCS%%share/gtk-doc/html/libxapp/style.css +%%PORTDOCS%%share/gtk-doc/html/libxapp/up-insensitive.png +%%PORTDOCS%%share/gtk-doc/html/libxapp/up.png share/icons/hicolor/scalable/actions/add-files-to-archive-symbolic.svg share/icons/hicolor/scalable/actions/category-search-symbolic.svg share/icons/hicolor/scalable/actions/extract-archive-symbolic.svg @@ -107,24 +107,30 @@ share/icons/hicolor/scalable/places/xapp-user-favorites.svg share/locale/af/LC_MESSAGES/xapp.mo share/locale/am/LC_MESSAGES/xapp.mo share/locale/ar/LC_MESSAGES/xapp.mo +share/locale/ast/LC_MESSAGES/xapp.mo share/locale/az/LC_MESSAGES/xapp.mo share/locale/be/LC_MESSAGES/xapp.mo share/locale/ber/LC_MESSAGES/xapp.mo share/locale/bg/LC_MESSAGES/xapp.mo share/locale/bn/LC_MESSAGES/xapp.mo +share/locale/br/LC_MESSAGES/xapp.mo share/locale/ca/LC_MESSAGES/xapp.mo share/locale/ca@valencia/LC_MESSAGES/xapp.mo +share/locale/ckb/LC_MESSAGES/xapp.mo share/locale/cs/LC_MESSAGES/xapp.mo share/locale/cy/LC_MESSAGES/xapp.mo share/locale/da/LC_MESSAGES/xapp.mo share/locale/de/LC_MESSAGES/xapp.mo share/locale/el/LC_MESSAGES/xapp.mo +share/locale/en_CA/LC_MESSAGES/xapp.mo share/locale/en_GB/LC_MESSAGES/xapp.mo share/locale/eo/LC_MESSAGES/xapp.mo share/locale/es/LC_MESSAGES/xapp.mo share/locale/et/LC_MESSAGES/xapp.mo share/locale/eu/LC_MESSAGES/xapp.mo +share/locale/fa/LC_MESSAGES/xapp.mo share/locale/fi/LC_MESSAGES/xapp.mo +share/locale/fil/LC_MESSAGES/xapp.mo share/locale/fr/LC_MESSAGES/xapp.mo share/locale/fr_CA/LC_MESSAGES/xapp.mo share/locale/he/LC_MESSAGES/xapp.mo @@ -146,6 +152,7 @@ share/locale/la/LC_MESSAGES/xapp.mo share/locale/lt/LC_MESSAGES/xapp.mo share/locale/mai/LC_MESSAGES/xapp.mo share/locale/ms/LC_MESSAGES/xapp.mo +share/locale/nb/LC_MESSAGES/xapp.mo share/locale/nl/LC_MESSAGES/xapp.mo share/locale/oc/LC_MESSAGES/xapp.mo share/locale/pl/LC_MESSAGES/xapp.mo @@ -155,16 +162,20 @@ share/locale/ro/LC_MESSAGES/xapp.mo share/locale/ru/LC_MESSAGES/xapp.mo share/locale/sk/LC_MESSAGES/xapp.mo share/locale/sl/LC_MESSAGES/xapp.mo +share/locale/sn/LC_MESSAGES/xapp.mo share/locale/sr/LC_MESSAGES/xapp.mo share/locale/sr@latin/LC_MESSAGES/xapp.mo share/locale/sv/LC_MESSAGES/xapp.mo +share/locale/te/LC_MESSAGES/xapp.mo +share/locale/th/LC_MESSAGES/xapp.mo share/locale/tr/LC_MESSAGES/xapp.mo share/locale/uk/LC_MESSAGES/xapp.mo share/locale/uz/LC_MESSAGES/xapp.mo +share/locale/vi/LC_MESSAGES/xapp.mo share/locale/zgh/LC_MESSAGES/xapp.mo share/locale/zh_CN/LC_MESSAGES/xapp.mo share/locale/zh_HK/LC_MESSAGES/xapp.mo share/locale/zh_TW/LC_MESSAGES/xapp.mo -share/mate-panel/applets/org.x.MateXAppStatusApplet.mate-panel-applet -share/vala/vapi/xapp.deps -share/vala/vapi/xapp.vapi +%%MATE%%share/mate-panel/applets/org.x.MateXAppStatusApplet.mate-panel-applet +%%VAPI%%share/vala/vapi/xapp.deps +%%VAPI%%share/vala/vapi/xapp.vapi diff --git a/x11/xdg-desktop-portal-wlr/Makefile b/x11/xdg-desktop-portal-wlr/Makefile index 4c1705400d01..0c5e675af706 100644 --- a/x11/xdg-desktop-portal-wlr/Makefile +++ b/x11/xdg-desktop-portal-wlr/Makefile @@ -32,6 +32,12 @@ PLIST_FILES= libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.wlr.service \ share/xdg-desktop-portal/portals/wlr.portal +# XXX Drop after FreeBSD 13.5 EOL around 2026-04-30 +# https://cgit.freebsd.org/src/commit/?id=af93fea71038 +.if !exists(/usr/include/sys/timerfd.h) +LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim +.endif + OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT=MANPAGES diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile index 571a5a031ffd..9b27c596b396 100644 --- a/x11/xfce4-screensaver/Makefile +++ b/x11/xfce4-screensaver/Makefile @@ -1,57 +1,56 @@ PORTNAME= xfce4-screensaver -PORTVERSION= 4.18.4 -PORTREVISION= 1 +PORTVERSION= 4.20.0 CATEGORIES= x11 xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce 4 screen saver and locker -WWW= https://git.xfce.org/apps/xfce4-screensaver/about/ +WWW= https://docs.xfce.org/apps/xfce4-screensaver/start LICENSE= GPLv2 LGPL20 LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB -BUILD_DEPENDS= xdt-csource:devel/xfce4-dev-tools LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ - libharfbuzz.so:print/harfbuzz \ libxklavier.so:x11/libxklavier -USES= compiler:c11 gettext-tools gl gmake gnome pkgconfig python \ - shebangfix tar:bzip2 xfce xorg +USES= compiler:c11 gettext-tools gl gnome meson pkgconfig python \ + shebangfix tar:xz xfce xorg USE_GL= gl -USE_GNOME= cairo gdkpixbuf glib20 gtk30 intltool libwnck3 +USE_GNOME= glib20 gtk30 libwnck3 USE_XFCE= garcon xfconf USE_XORG= ice sm x11 xext xrandr xscrnsaver xxf86vm SHEBANG_FILES= src/xfce4-screensaver-configure.py -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-maintainer-mode \ - --with-console-kit=yes \ - --with-systemd=no +MESON_ARGS= -Dsession-manager=consolekit \ + -Dwayland=disabled \ + -Dx11=enabled SCREENSAVER_DIR= share/applications/screensavers -OPTIONS_DEFINE= NLS PAM +PORTDOCS= docbook.css xfce4-screensaver.html + +OPTIONS_DEFINE= DOCS NLS PAM OPTIONS_DEFAULT= PAM OPTIONS_SUB= yes -NLS_USES= gettext-runtime -NLS_CONFIGURE_ENABLE= nls +DOCS_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \ + xmlto:textproc/xmlto +DOCS_MESON_ENABLED= docs +DOCS_MESON_ON= -Ddocdir=${DOCSDIR} -PAM_RUN_DEPENDS= pam_helper:security/pam_helper -PAM_CONFIGURE_ON= --enable-authentication-scheme=helper \ - --with-passwd-helper=${LOCALBASE}/bin/pam_helper -PAM_CONFIGURE_OFF= --disable-pam +NLS_USES= gettext-runtime -.include <bsd.port.pre.mk> +PAM_RUN_DEPENDS= pam_helper:security/pam_helper +PAM_MESON_ON= -Dauthentication-scheme=helper \ + -Dpasswd-helper=${LOCALBASE}/bin/pam_helper +PAM_MESON_OFF= -Dauthentication-scheme=pwent -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug=yes -.endif +post-patch-NLS-off: + @${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build post-patch-PAM-on: @${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \ @@ -64,4 +63,4 @@ post-install: post-install-PAM-on: ${INSTALL_DATA} ${FILESDIR}/xfce4-screensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xfce4-screensaver.sample -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/xfce4-screensaver/distinfo b/x11/xfce4-screensaver/distinfo index cdde698e4225..b4b9b5671324 100644 --- a/x11/xfce4-screensaver/distinfo +++ b/x11/xfce4-screensaver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734778246 -SHA256 (xfce4/xfce4-screensaver-4.18.4.tar.bz2) = cf717d032d2d0555978c479299da992af6dc3363ae7e758af9515c7166eac170 -SIZE (xfce4/xfce4-screensaver-4.18.4.tar.bz2) = 896547 +TIMESTAMP = 1752487125 +SHA256 (xfce4/xfce4-screensaver-4.20.0.tar.xz) = e370298d002848fdb2065fee254cb5b0efa0f2699b74299c234019c8d79b852e +SIZE (xfce4/xfce4-screensaver-4.20.0.tar.xz) = 273588 diff --git a/x11/xfce4-screensaver/pkg-plist b/x11/xfce4-screensaver/pkg-plist index 2072f304f9fb..70be1bf11ea4 100644 --- a/x11/xfce4-screensaver/pkg-plist +++ b/x11/xfce4-screensaver/pkg-plist @@ -6,7 +6,6 @@ bin/xfce4-screensaver-preferences etc/xdg/autostart/xfce4-screensaver.desktop etc/xdg/menus/xfce4-screensavers.menu libexec/xfce4-screensaver-dialog -libexec/xfce4-screensaver-gl-helper libexec/xfce4-screensaver/floaters libexec/xfce4-screensaver/popsquares libexec/xfce4-screensaver/slideshow @@ -60,6 +59,7 @@ share/icons/hicolor/scalable/apps/org.xfce.ScreenSaver.svg %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-screensaver.mo +%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-screensaver.mo %%NLS%%share/locale/sl/LC_MESSAGES/xfce4-screensaver.mo diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile index 10c9d77c5183..834aaf0f5893 100644 --- a/x11/xpra/Makefile +++ b/x11/xpra/Makefile @@ -1,5 +1,5 @@ PORTNAME= xpra -PORTVERSION= 6.3.1 +PORTVERSION= 6.3.2 CATEGORIES= x11 MASTER_SITES= https://xpra.org/src/ diff --git a/x11/xpra/distinfo b/x11/xpra/distinfo index 8a5e0fda78ea..fe2c1bdab881 100644 --- a/x11/xpra/distinfo +++ b/x11/xpra/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749146736 -SHA256 (xpra-6.3.1.tar.xz) = 4af330d4ffc04598433d19038aa161de47e20a295074fb9d25ddad3655c4ed73 -SIZE (xpra-6.3.1.tar.xz) = 10042176 +TIMESTAMP = 1752221931 +SHA256 (xpra-6.3.2.tar.xz) = 98153075f0c3ba2b33c270a2111b3c6ce2c8d5e8af74e8f55090b4dd02745f7a +SIZE (xpra-6.3.2.tar.xz) = 9087508 |