From b48806cacbabe2aa6cb6ef7309d68022ca781fb417732cad8484bbd63b082567 Mon Sep 17 00:00:00 2001 From: Martin Schreiner Date: Tue, 16 Jul 2024 04:17:35 +0000 Subject: [PATCH] Accepting request 1187635 from home:mschreiner:branches:editors - Removed patches, as they're no longer required (refreshing them deleted their contents): * vim-7.3-help_tags.patch * vim-7.4-highlight_fstab.patch - Reorganise all applied patches in the spec file. - Update to 9.1.0588: * 9.1.0588: The maze program no longer compiles on newer clang runtime(typst): Add typst runtime files * 9.1.0587: tests: Test_gui_lowlevel_keyevent is still flaky * 9.1.0586: ocaml runtime files are outdated runtime(termdebug): fix a few issues * 9.1.0585: tests: test_cpoptions leaves swapfiles around * 9.1.0584: Warning about redeclaring f_id() non-static runtime(doc): Add hint how to load termdebug from vimrc runtime(doc): document global insert behavior * 9.1.0583: filetype: *.pdf_tex files are not recognized * 9.1.0582: Printed line doesn't overwrite colon when pressing Enter in Ex mode * 9.1.0581: Various lines are indented inconsistently * 9.1.0580: :lmap mapping for keypad key not applied when typed in Select mode * 9.1.0579: Ex command is still executed after giving E1247 * 9.1.0578: no tests for :Tohtml * 9.1.0577: Unnecessary checks for v:sizeoflong in test_put.vim * 9.1.0576: tests: still an issue with test_gettext_make * 9.1.0575: Wrong comments in alt_tabpage() * 9.1.0574: ex: wrong handling of commands after bar runtime(doc): add a note for netrw bug reports * 9.1.0573: ex: no implicit print for single addresses runtime(vim): make &indentexpr available from the outside * 9.1.0572: cannot specify tab page closing behaviour runtime(doc): remove obsolete Ex insert behavior OBS-URL: https://build.opensuse.org/request/show/1187635 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=859 --- vim-7.3-help_tags.patch | 12 --- vim-7.4-highlight_fstab.patch | 13 --- vim-8.2.2411-globalvimrc.patch | 8 +- vim-9.1.0512.tar.gz | 3 - vim-9.1.0588.tar.gz | 3 + vim.changes | 156 +++++++++++++++++++++++++++++++++ vim.spec | 46 +++++----- 7 files changed, 184 insertions(+), 57 deletions(-) delete mode 100644 vim-7.3-help_tags.patch delete mode 100644 vim-7.4-highlight_fstab.patch delete mode 100644 vim-9.1.0512.tar.gz create mode 100644 vim-9.1.0588.tar.gz diff --git a/vim-7.3-help_tags.patch b/vim-7.3-help_tags.patch deleted file mode 100644 index 7aa9eba..0000000 --- a/vim-7.3-help_tags.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: vim-8.2.2411/runtime/doc/Makefile -=================================================================== ---- vim-8.2.2411.orig/runtime/doc/Makefile -+++ vim-8.2.2411/runtime/doc/Makefile -@@ -331,6 +331,7 @@ CONVERTED = \ - all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED) - - # Use Vim to generate the tags file. Can only be used when Vim has been -+ export VIMRUNTIME=../; \ - # compiled and installed. Supports multiple languages. - vimtags: $(DOCS) - @$(VIMEXE) --clean -esX -V1 -u doctags.vim diff --git a/vim-7.4-highlight_fstab.patch b/vim-7.4-highlight_fstab.patch deleted file mode 100644 index 92f4766..0000000 --- a/vim-7.4-highlight_fstab.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: vim-9.0.1188/runtime/syntax/fstab.vim -=================================================================== ---- vim-9.0.1188.orig/runtime/syntax/fstab.vim -+++ vim-9.0.1188/runtime/syntax/fstab.vim -@@ -35,7 +35,7 @@ syn match fsOperator /[,=:#]/ - " Device - syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError - syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained --syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs sysfs usbfs -+syn keyword fsDeviceKeyword contained none proc linproc tmpfs debugfs devpts devtmpfs sysfs usbfs - syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel - syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID - syn keyword fsDeviceKeyword contained PARTLABEL nextgroup=fsDevicePARTLABEL diff --git a/vim-8.2.2411-globalvimrc.patch b/vim-8.2.2411-globalvimrc.patch index 7e08ad4..153ba8a 100644 --- a/vim-8.2.2411-globalvimrc.patch +++ b/vim-8.2.2411-globalvimrc.patch @@ -1,8 +1,8 @@ -Index: vim-8.2.2411/src/main.c +Index: vim-9.1.0530/src/main.c =================================================================== ---- vim-8.2.2411.orig/src/main.c -+++ vim-8.2.2411/src/main.c -@@ -3130,7 +3130,10 @@ source_startup_scripts(mparm_T *parmp) +--- vim-9.1.0530.orig/src/main.c ++++ vim-9.1.0530/src/main.c +@@ -3251,7 +3251,10 @@ source_startup_scripts(mparm_T *parmp) * Get system wide defaults, if the file name is defined. */ #ifdef SYS_VIMRC_FILE diff --git a/vim-9.1.0512.tar.gz b/vim-9.1.0512.tar.gz deleted file mode 100644 index 4044fd8..0000000 --- a/vim-9.1.0512.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df114f987c6c73d102800dd77416c3018c8dfa61addb7ba05954cabaa1a301d5 -size 17950920 diff --git a/vim-9.1.0588.tar.gz b/vim-9.1.0588.tar.gz new file mode 100644 index 0000000..22e28c9 --- /dev/null +++ b/vim-9.1.0588.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e9bfbf8a1a73518d039b263c58ed0952c4cf3eb257e37d466ecae090bdc5fd6 +size 17999885 diff --git a/vim.changes b/vim.changes index e5a01f3..1f3c160 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,159 @@ +------------------------------------------------------------------- +Tue Jul 16 03:55:52 UTC 2024 - Martin Schreiner + +- Removed patches, as they're no longer required (refreshing them + deleted their contents): + * vim-7.3-help_tags.patch + * vim-7.4-highlight_fstab.patch +- Reorganise all applied patches in the spec file. +- Update to 9.1.0588: + * 9.1.0588: The maze program no longer compiles on newer clang + runtime(typst): Add typst runtime files + * 9.1.0587: tests: Test_gui_lowlevel_keyevent is still flaky + * 9.1.0586: ocaml runtime files are outdated + runtime(termdebug): fix a few issues + * 9.1.0585: tests: test_cpoptions leaves swapfiles around + * 9.1.0584: Warning about redeclaring f_id() non-static + runtime(doc): Add hint how to load termdebug from vimrc + runtime(doc): document global insert behavior + * 9.1.0583: filetype: *.pdf_tex files are not recognized + * 9.1.0582: Printed line doesn't overwrite colon when pressing Enter in Ex mode + * 9.1.0581: Various lines are indented inconsistently + * 9.1.0580: :lmap mapping for keypad key not applied when typed in Select mode + * 9.1.0579: Ex command is still executed after giving E1247 + * 9.1.0578: no tests for :Tohtml + * 9.1.0577: Unnecessary checks for v:sizeoflong in test_put.vim + * 9.1.0576: tests: still an issue with test_gettext_make + * 9.1.0575: Wrong comments in alt_tabpage() + * 9.1.0574: ex: wrong handling of commands after bar + runtime(doc): add a note for netrw bug reports + * 9.1.0573: ex: no implicit print for single addresses + runtime(vim): make &indentexpr available from the outside + * 9.1.0572: cannot specify tab page closing behaviour + runtime(doc): remove obsolete Ex insert behavior + * 9.1.0571: tests: Test_gui_lowlevel_keyevent is flaky + runtime(logindefs): update syntax with new keywords + * 9.1.0570: tests: test_gettext_make can be improved + runtime(filetype): Fix Prolog file detection regex + * 9.1.0569: fnamemodify() treats ".." and "../" differently + runtime(mojo): include mojo ftplugin and indent script + * 9.1.0568: Cannot expand paths from 'cdpath' setting + * 9.1.0567: Cannot use relative paths as findfile() stop directories + * 9.1.0566: Stop dir in findfile() doesn't work properly w/o trailing slash + * 9.1.0565: Stop directory doesn't work properly in 'tags' + * 9.1.0564: id() can be faster + * 9.1.0563: Cannot process any Key event + * 9.1.0562: tests: inconsistency in test_findfile.vim + runtime(fstab): Add missing keywords to fstab syntax + * 9.1.0561: netbeans: variable used un-initialized (Coverity) + * 9.1.0560: bindtextdomain() does not indicate an error + * 9.1.0559: translation of vim scripts can be improved + * 9.1.0558: filetype: prolog detection can be improved + * 9.1.0557: moving in the buffer list doesn't work as documented + runtime(doc): fix inconsistencies in :h file-searching + * 9.1.0556: :bwipe doesn't remove file from jumplist of other tabpages + runtime(htmlangular): correct comment + * 9.1.0555: filetype: angular ft detection is still problematic + * 9.1.0554: :bw leaves jumplist and tagstack data around + * 9.1.0553: filetype: *.mcmeta files are not recognized + * 9.1.0552: No test for antlr4 filetype + * 9.1.0551: filetype: htmlangular files are not properly detected + * 9.1.0550: filetype: antlr4 files are not recognized + * 9.1.0549: fuzzycollect regex based completion not working as expected + runtime(doc): autocmd_add() accepts a list not a dict + * 9.1.0548: it's not possible to get a unique id for some vars + runtime(tmux): Update syntax script + * 9.1.0547: No way to get the arity of a Vim function + * 9.1.0546: vim-tiny fails on CTRL-X/CTRL-A + runtime(hlsplaylist): include hlsplaylist ftplugin file + runtime(doc): fix typo in :h ft-csv-syntax + runtime(doc): Correct shell command to get $VIMRUNTIME into + shell + * 9.1.0545: MSVC conversion warning + * 9.1.0544: filetype: ldapconf files are not recognized + runtime(cmakecache): include cmakecache ftplugin file + runtime(lex): include lex ftplugin file + runtime(yacc): include yacc ftplugin file + runtime(squirrel): include squirrel ftplugin file + runtime(objcpp): include objcpp ftplugin file + runtime(tf): include tf ftplugin file + runtime(mysql): include mysql ftplugin file + runtime(javacc): include javacc ftplugin file + runtime(cabal): include cabal ftplugin file + runtime(cuda): include CUDA ftplugin file + runtime(editorconfig): include editorconfig ftplugin file + runtime(kivy): update kivy syntax, include ftplugin + runtime(syntax-tests): Stop generating redundant "*_* 99.dump" + files + * 9.1.0543: Behavior of CursorMovedC is strange + runtime(vim): Update base-syntax, improve :match command + highlighting + * 9.1.0542: Vim9: confusing string() output for object functions + * 9.1.0541: failing test with Vim configured without channel + * 9.1.0540: Unused assignment in sign_define_cmd() + runtime(doc): add page-scrolling keys to index.txt + runtime(doc): add reference to xterm-focus-event from + FocusGained/Lost + * 9.1.0539: Not enough tests for what v9.1.0535 fixed + runtime(doc): clarify how to re-init csv syntax file + * 9.1.0538: not possible to assign priority when defining a sign + * 9.1.0537: signed number detection for CTRL-X/A can be improved + * 9.1.0536: filetype: zone files are not recognized + * 9.1.0535: newline escape wrong in ex mode + runtime(man): honor cmd modifiers before `g:ft_man_open_mode` + runtime(man): use `nnoremap` to map to Ex commands + * 9.1.0534: completion wrong with fuzzy when cycling back to original + runtime(syntax-tests): Abort and report failed cursor progress + runtime(syntax-tests): Introduce self tests for screen dumping + runtime(syntax-tests): Clear and redraw the ruler line with + the shell info + runtime(syntax-tests): Allow for folded and wrapped lines in + syntax test files + * 9.1.0533: Vim9: need more tests for nested objects equality + CI: Pre-v* 9.0.0110 versions generate bogus documentation tag entries + runtime(doc): Remove wrong help tag CTRL-SHIFT-CR + * 9.1.0532: filetype: Cedar files not recognized + runtime(doc): document further keys that scroll page up/down + * 9.1.0531: resource leak in mch_get_random() + runtime(tutor): Fix wrong spanish translation + runtime(netrw): fix remaining case of register clobber + * 9.1.0530: xxd: MSVC warning about non-ASCII character + * 9.1.0529: silent! causes following try/catch to not work + runtime(rust): use shiftwidth() in indent script + * 9.1.0528: spell completion message still wrong in translations + * 9.1.0527: inconsistent parameter in Makefiles for Vim executable + * 9.1.0526: Unwanted cursor movement with pagescroll at start of buffer + runtime(doc): mention $XDG_CONFIG_HOME instead of $HOME/.config + * 9.1.0525: Right release selects immediately when pum is truncated. + * 9.1.0524: the recursive parameter in the *_equal functions can be removed + runtime(termdebug): Add Deprecation warnings + * 9.1.0523: Vim9: cannot downcast an object + * 9.1.0522: Vim9: string(object) hangs for recursive references + * 9.1.0521: if_py: _PyObject_CallFunction_SizeT is dropped in Python 3.13 + * 9.1.0520: Vim9: incorrect type checking for modifying lists + runtime(manpager): avoid readonly prompt + * 9.1.0519: MS-Windows: libvterm compilation can be optimized + * 9.1.0518: initialize the random buffer can be improved + * 9.1.0517: MS-Windows: too long lines in Make_mvc.mak + runtime(terraform): Add filetype plugin for terraform + runtime(dockerfile): enable spellchecking of comments in + syntax script + runtime(doc): rename variable for pandoc markdown support + runtime(doc): In builtin overview use {buf} as param for + appendbufline/setbufline + runtime(doc): clarify, that register 1-* 9 will always be shifted + runtime(netrw): save and restore register 0-* 9, a and unnamed + runtime(termdebug): Refactored StartDebug_term and EndDebug + functions + runtime(java): Compose "g:java_highlight_signature" and + "g:java_highlight_functions" + * 9.1.0516: need more tests for nested dicts and list comparision + * 9.1.0515: Vim9: segfault in object_equal() + * 9.1.0514: Vim9: issue with comparing objects recursively + runtime(termdebug): Change some variables to Enums + runtime(vim): Update base-syntax, fix function tail comments + * 9.1.0513: Vim9: segfault with object comparison + ------------------------------------------------------------------- Sun Jun 23 18:33:41 UTC 2024 - Martin Schreiner diff --git a/vim.spec b/vim.spec index b58a8ed..7320df7 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 9.1 -%define patchlevel 0512 +%define patchlevel 0588 %define patchlevel_compact %{patchlevel} %define VIM_SUBDIR vim91 %define site_runtimepath %{_datadir}/vim/site @@ -60,22 +60,20 @@ Source31: gvim_256.png Source32: gvim_512.png # /Section Source99: %{name}-7.4-rpmlintrc -Patch3: %{name}-7.4-disable_lang_no.patch -Patch4: %{name}-7.3-gvimrc_fontset.patch -Patch5: %{name}-7.4-highlight_fstab.patch -Patch6: %{name}-7.3-sh_is_bash.patch -Patch7: %{name}-7.3-filetype_ftl.patch -Patch8: %{name}-7.3-help_tags.patch -Patch9: %{name}-7.3-use_awk.patch -Patch10: %{name}-7.3-name_vimrc.patch -Patch11: %{name}-7.3-mktemp_tutor.patch -Patch15: %{name}-7.4-filetype_apparmor.patch -Patch18: %{name}-7.3-filetype_spec.patch -Patch21: %{name}-7.3-filetype_changes.patch -Patch22: %{name}-7.4-filetype_mine.patch -Patch100: vim73-no-static-libpython.patch -Patch101: vim-8.0.1568-defaults.patch -Patch104: vim-8.2.2411-globalvimrc.patch +Patch1: %{name}-7.4-disable_lang_no.patch +Patch2: %{name}-7.3-gvimrc_fontset.patch +Patch3: %{name}-7.3-sh_is_bash.patch +Patch4: %{name}-7.3-filetype_ftl.patch +Patch5: %{name}-7.3-use_awk.patch +Patch6: %{name}-7.3-name_vimrc.patch +Patch7: %{name}-7.3-mktemp_tutor.patch +Patch8: %{name}-7.4-filetype_apparmor.patch +Patch9: %{name}-7.3-filetype_spec.patch +Patch10: %{name}-7.3-filetype_changes.patch +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 BuildRequires: autoconf BuildRequires: db-devel BuildRequires: fdupes @@ -210,23 +208,21 @@ a hex dump back to its original binary form. %prep %setup -q -n %{name}-%{pkg_version}.%{patchlevel} +%patch -P 1 -p1 +%patch -P 2 -p1 %patch -P 3 -p1 %patch -P 4 -p1 %patch -P 5 -p1 %patch -P 6 -p1 %patch -P 7 -p1 +cp %{SOURCE23} runtime/syntax/apparmor.vim %patch -P 8 -p1 %patch -P 9 -p1 %patch -P 10 -p1 %patch -P 11 -p1 -cp %{SOURCE23} runtime/syntax/apparmor.vim -%patch -P 15 -p1 -%patch -P 18 -p1 -%patch -P 21 -p1 -%patch -P 22 -p1 -%patch -P 100 -p1 -%patch -P 101 -p1 -%patch -P 104 -p1 +%patch -P 12 -p1 +%patch -P 13 -p1 +%patch -P 14 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . %build