Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vim for openSUSE:Factory checked in at 2026-07-15 16:25:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vim (Old) and /work/SRC/openSUSE:Factory/.vim.new.1991 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vim" Wed Jul 15 16:25:55 2026 rev:403 rq:1365706 version:9.2.0780 Changes: -------- --- /work/SRC/openSUSE:Factory/vim/vim.changes 2026-07-06 12:27:51.770085323 +0200 +++ /work/SRC/openSUSE:Factory/.vim.new.1991/vim.changes 2026-07-15 16:31:17.465390288 +0200 @@ -1,0 +2,30 @@ +Mon Jul 13 21:47:00 UTC 2026 - Martin Schreiner <[email protected]> + +- Add vim-9.2.0780-modelinestrict-allow-wrap.patch: allow 'wrap' and + 'linebreak' to be set from a modeline (bsc#1268162). Upstream patch + 9.2.0350 added the 'modelinestrict' option, enabled by default, whose + hardcoded whitelist omits these two purely visual window-local + options, so 'nowrap' in a modeline was silently ignored while every + other setting on the same line was applied. +- Update vim-7.3-name_vimrc.patch: point SYS_VIMRC_FILE at + $VIMRUNTIME/suse.vimrc rather than /etc/vimrc, which we no longer own + (bsc#1268162). +- Update suse.vimrc: source /etc/vimrc at the end of the file, so that a + local system vimrc still overrides the distribution defaults. +- Drop vim-8.2.2411-globalvimrc.patch: its main.c fallback to suse.vimrc + fired only when do_source() of /etc/vimrc returned FAIL, which an + empty /etc/vimrc does not. A stale or empty /etc/vimrc therefore + suppressed the distribution defaults entirely, losing 'syntax on', the + cursor position restore and 'nomodeline' (bsc#1268162). +- Build gvim against GTK 3 instead of GTK 4 (bsc#1270238). + The GTK 4 clipboard code spins a nested main loop around + gdk_clipboard_read_async(), which deadlocks gvim on paste, and its + mime type negotiation does not interoperate with Qt clipboard + owners. + --enable-gui=gtk4 also forces with_x=no in vim's configure, so gvim + lost +X11, +xterm_clipboard, +xsmp and the CUT_BUFFER0 fallback. GTK 3 + keeps native Wayland support: + * Replace BuildRequires pkgconfig(gtk4) with pkgconfig(gtk+-3.0). + * Pass --enable-gui=gtk3 and --with-x=yes in GUI_OPTIONS. + +------------------------------------------------------------------- Old: ---- vim-8.2.2411-globalvimrc.patch New: ---- vim-9.2.0780-modelinestrict-allow-wrap.patch ----------(Old B)---------- Old: local system vimrc still overrides the distribution defaults. - Drop vim-8.2.2411-globalvimrc.patch: its main.c fallback to suse.vimrc fired only when do_source() of /etc/vimrc returned FAIL, which an ----------(Old E)---------- ----------(New B)---------- New: - Add vim-9.2.0780-modelinestrict-allow-wrap.patch: allow 'wrap' and 'linebreak' to be set from a modeline (bsc#1268162). Upstream patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim.spec ++++++ --- /var/tmp/diff_new_pack.DA31y6/_old 2026-07-15 16:31:20.997512664 +0200 +++ /var/tmp/diff_new_pack.DA31y6/_new 2026-07-15 16:31:21.009513080 +0200 @@ -72,9 +72,9 @@ Patch11: %{name}-7.4-filetype_mine.patch Patch12: %{name}73-no-static-libpython.patch Patch13: %{name}-8.0.1568-defaults.patch -Patch14: %{name}-8.2.2411-globalvimrc.patch Patch15: %{name}-9.1.1134-revert-putty-terminal-colors.patch Patch16: %{name}-9.1.1732-fix-inc-detection.patch +Patch17: %{name}-9.2.0780-modelinestrict-allow-wrap.patch BuildRequires: autoconf >= 2.71 BuildRequires: db-devel BuildRequires: fdupes @@ -87,7 +87,7 @@ BuildRequires: wayland-utils BuildRequires: pkgconfig(form) BuildRequires: pkgconfig(formw) -BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(libacl) BuildRequires: pkgconfig(lua) @@ -225,9 +225,9 @@ %patch -P 11 -p1 %patch -P 12 -p1 %patch -P 13 -p1 -%patch -P 14 -p1 %patch -P 15 -p1 %patch -P 16 -p1 +%patch -P 17 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . %build @@ -269,8 +269,10 @@ --disable-icon-cache-update \ --enable-xim \ --enable-fontset \ - --enable-gui=gtk4 \ - --enable-wayland" + --enable-gui=gtk3 \ + --enable-wayland \ + --with-x=yes \ + " export NOGUI_OPTIONS="\ --disable-gui \ ++++++ suse.vimrc ++++++ --- /var/tmp/diff_new_pack.DA31y6/_old 2026-07-15 16:31:21.473529157 +0200 +++ /var/tmp/diff_new_pack.DA31y6/_new 2026-07-15 16:31:21.477529295 +0200 @@ -1,7 +1,7 @@ -" /usr/etc/vimrc (configuration file for vim only) +" $VIMRUNTIME/suse.vimrc (configuration file for vim only) " author: Klaus Franken <[email protected]> -" author: Werner Fink <[email protected]> -" author: Florian La Roche <[email protected]> +" author: Werner Fink <[email protected]> +" author: Florian La Roche <[email protected]> " version: 2021/02/22 " commented lines start with `"' @@ -314,6 +314,13 @@ " that it potentially can open for malicious users to do harmful things. set nomodeline +" Let a local system vimrc override the defaults above. This file is the +" compiled-in SYS_VIMRC_FILE, so /etc/vimrc is no longer sourced by Vim +" itself and has to be chained from here (bsc#1268162). +if filereadable("/etc/vimrc") + source /etc/vimrc +endif + " get easier to use and more user friendly vim defaults -" /etc/vimrc ends here +" suse.vimrc ends here ++++++ vim-7.3-name_vimrc.patch ++++++ --- /var/tmp/diff_new_pack.DA31y6/_old 2026-07-15 16:31:21.517530682 +0200 +++ /var/tmp/diff_new_pack.DA31y6/_new 2026-07-15 16:31:21.521530820 +0200 @@ -1,13 +1,36 @@ -Index: vim-9.2.0677/src/feature.h +From: Martin Jungblut Schreiner <[email protected]> +Date: Sun, 12 Jul 2026 00:00:00 +0000 +Subject: [PATCH] Define the system-wide vimrc and gvimrc locations +Bug-SUSE: https://bugzilla.suse.com/show_bug.cgi?id=1268162 +Origin: other +Forwarded: no + +Upstream ships both defines commented out. Enable them. + +SYS_VIMRC_FILE points at $VIMRUNTIME/suse.vimrc rather than /etc/vimrc, +because we no longer own /etc/vimrc. do_source() expands environment +variables in the file name, so $VIMRUNTIME resolves at startup. suse.vimrc +sources /etc/vimrc at its end, so a local system vimrc still overrides the +distribution defaults. + +This replaces the previous arrangement, where main.c fell back to +suse.vimrc only when do_source() of /etc/vimrc returned FAIL. An empty +/etc/vimrc sources successfully, so that fallback never fired and the +distribution defaults were silently dropped: no 'syntax on', no +cursor-position restore, and 'modeline' left enabled instead of the +'nomodeline' we ship (bsc#1268162). vim-8.2.2411-globalvimrc.patch is +therefore dropped. + +Index: vim-9.2.0780/src/feature.h =================================================================== ---- vim-9.2.0677.orig/src/feature.h -+++ vim-9.2.0677/src/feature.h +--- vim-9.2.0780.orig/src/feature.h ++++ vim-9.2.0780/src/feature.h @@ -714,11 +714,12 @@ * SYS_VIMRC_FILE Name of the system-wide .vimrc file. */ // #define SYS_VIMRC_FILE "/etc/vimrc" - -+#define SYS_VIMRC_FILE "/etc/vimrc" ++#define SYS_VIMRC_FILE "$VIMRUNTIME/suse.vimrc" /* * SYS_GVIMRC_FILE Name of the system-wide .gvimrc file. */ ++++++ vim-9.2.0780-modelinestrict-allow-wrap.patch ++++++ From: Martin Jungblut Schreiner <[email protected]> Date: Sun, 12 Jul 2026 00:00:00 +0000 Subject: [PATCH] Allow 'wrap' and 'linebreak' in modelines under 'modelinestrict' Bug-SUSE: https://bugzilla.suse.com/show_bug.cgi?id=1268162 Origin: other Forwarded: no Upstream patch 9.2.0350 introduced the global 'modelinestrict' option (default on), which silently ignores any modeline setting that is not in a hardcoded whitelist. 'wrap' is not in that whitelist, so a modeline of the form # vim: ts=2 shiftwidth=2 noexpandtab nowrap applies every setting except 'nowrap'. This is a user-visible behaviour change between 9.2.0280 and 9.2.0398. 'wrap' and 'linebreak' are purely window-local display options with no security relevance: they change how an already-loaded buffer is rendered, they execute nothing and they read nothing from disk. They belong in the whitelist on the same grounds as 'rightleft' and 'foldcolumn', which are already permitted. Precedent for extending the list exists upstream in 9.2.0465, which added 'foldmarker'. Index: vim-9.2.0780/src/option.c =================================================================== --- vim-9.2.0780.orig/src/option.c +++ vim-9.2.0780/src/option.c @@ -1556,6 +1556,7 @@ "foldenable", "foldmarker", "foldmethod", + "linebreak", "modifiable", "readonly", "rightleft", @@ -1568,6 +1569,7 @@ "textwidth", "varsofttabstop", "vartabstop", + "wrap", NULL };
