qiurui
/
freebsd-ports
mirror of https://git.FreeBSD.org/ports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

editors/vim: Update to 9.1.1744 and handle wayland properly 

Add --without-wayland for everything except the gtk3 FLAVOR. That
flavor now has a hard dep on wayland (it's already present from the
default gtk30 and libxkbcommon configurations).

This is a NOOP for everybody except gtk3 users who explicitly disabled
wayland in both gtk30 and libxkbcommon. The only effect for those
users is that wayland is now a LIB_DEP. There is no runtime effect
either way.

In the below PR, Piotr identified that vim will eagerly link against
wayland if present, even for a pure-console build.

The only toolkit that vim uses that can use wayland is gtk3, so
we now specify --without-wayland for everything else.

To complicate things, wayland support is optional in the gtk30 and
libxkbcommon ports. If either of those ports are built with wayland,
then vim has to link against libwayland-client regardless of the
relevant configure switches. So, adding a WAYLAND option for the gtk3
flavor would only work to disable wayland if it's disabled in both
gtk30 and libxkbcommon.

Instead, I'm making wayland a hard dep of the gtk3 flavor. For users
of our packages, this will be a transparent change. If your goal in
life is to never install wayland but you also want the gtk3 flavor,

PR:             289408
Reported by:    Piotr Smyrak
This commit is contained in:
Adam Weinberger 2025-09-09 13:01:10 -04:00
parent 3a96d77f11
commit 5b93ea9c80
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/vim/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= vim
PORTVERSION= 9.1.1723
PORTVERSION= 9.1.1744
DISTVERSIONPREFIX= v
CATEGORIES= editors
@ -22,7 +22,8 @@ CONFIGURE_ARGS= --disable-canberra \
--enable-cscope \
--enable-gui=${GUI} \
--enable-multibyte \
--with-tlib=ncursesw
--with-tlib=ncursesw \
--without-wayland
MAKE_ARGS= STRIP="${STRIP_CMD}" \
VIMRCLOC=${ETCDIR} \
VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER}
@ -69,7 +70,8 @@ USE_XORG= ice sm x11 xpm xt
.elif ${FLAVOR:U} == gtk3
GUI= gtk3
CONFIGURE_ARGS+=--enable-xim --enable-fontset
CONFIGURE_ARGS+=--enable-xim --enable-fontset --with-wayland
LIB_DEPENDS+= libwayland-client.so:graphics/wayland
PLIST_SUB+= GUI="" DESKTOP=""
USES+= desktop-file-utils gnome xorg
USE_GNOME= cairo gdkpixbufextra gtk30

6
editors/vim/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1756704100
SHA256 (vim-vim-v9.1.1723_GH0.tar.gz) = 057b339a2fa78729ff595393333d34a7d25ae77d833f55c2d89b03a2f55203bd
SIZE (vim-vim-v9.1.1723_GH0.tar.gz) = 18764005
TIMESTAMP = 1757437254
SHA256 (vim-vim-v9.1.1744_GH0.tar.gz) = 6784bdcc41d4ae45c74cc93288e744a545525dd553e2d7489120f93b6bf90d14
SIZE (vim-vim-v9.1.1744_GH0.tar.gz) = 18779452