diff options
author | MGislv | 2023-08-20 20:31:57 +0200 |
---|---|---|
committer | MGislv | 2023-08-20 20:31:57 +0200 |
commit | 79b6545fbce71df546e1e34eebaf9bc6ac58bbf3 (patch) | |
tree | cb86b33cf99d038af89cd4475ac31004426f0df2 | |
parent | db7ee084569d3d1bfe01528a36d4ff5eaf925065 (diff) | |
download | aur-79b6545fbce71df546e1e34eebaf9bc6ac58bbf3.tar.gz |
Update to 9.0.1736
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | fix-perl-build.patch | 66 |
3 files changed, 6 insertions, 77 deletions
@@ -1,6 +1,6 @@ pkgbase = vim-clipboard pkgdesc = Vi Improved, a highly configurable, improved version of the vi text editor - pkgver = 9.0.1678 + pkgver = 9.0.1736 pkgrel = 1 url = https://www.vim.org arch = x86_64 @@ -37,9 +37,7 @@ pkgbase = vim-clipboard replaces = vim replaces = vim-minimal replaces = gvim - source = https://github.com/vim/vim/archive/v9.0.1678/vim-9.0.1678.tar.gz - source = fix-perl-build.patch - sha512sums = c5ffb7ca56ff4eee70f06599dd84db2eb28ddadac229d4f7faf01174805923636a4ce61486bdf5a47910c929613dc9b9290dfc9288006222b4bc4ac891548bb8 - sha512sums = 184dd232db5b4a346e9751e58ad0a9b2f60d50d1a2aa2050415d288445606d80c239745f0d8987ff822d2acf6826104a81f8e59c8f1785095d1f319c0fe4abf0 + source = https://github.com/vim/vim/archive/v9.0.1736/vim-9.0.1736.tar.gz + sha512sums = 4ab23b5fea77065e1415d3e73106029eb2037f563ba5fbc64efe2605da0c03a1a279928c448d2010153b4624eb834dd83d2090c70301ef63b5cb904d08ae7455 pkgname = vim-clipboard @@ -6,7 +6,7 @@ # Directly based off of the official package pkgname=vim-clipboard -pkgver=9.0.1678 +pkgver=9.0.1736 pkgrel=1 pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' url='https://www.vim.org' @@ -23,14 +23,11 @@ optdepends=('python: Python language support' conflicts=('vim' 'gvim' 'vim-minimal') provides=('xxd' 'vim' 'vim-minimal' 'vim-plugin-runtime') replaces=('vim' 'vim-minimal' 'gvim') -source=(https://github.com/vim/vim/archive/v${pkgver}/vim-${pkgver}.tar.gz - fix-perl-build.patch) -sha512sums=('c5ffb7ca56ff4eee70f06599dd84db2eb28ddadac229d4f7faf01174805923636a4ce61486bdf5a47910c929613dc9b9290dfc9288006222b4bc4ac891548bb8' - '184dd232db5b4a346e9751e58ad0a9b2f60d50d1a2aa2050415d288445606d80c239745f0d8987ff822d2acf6826104a81f8e59c8f1785095d1f319c0fe4abf0') +source=(https://github.com/vim/vim/archive/v${pkgver}/vim-${pkgver}.tar.gz) +sha512sums=('4ab23b5fea77065e1415d3e73106029eb2037f563ba5fbc64efe2605da0c03a1a279928c448d2010153b4624eb834dd83d2090c70301ef63b5cb904d08ae7455') prepare() { cd vim-${pkgver}/src - patch -Np2 -i ../../fix-perl-build.patch # define the place for the global vimrc file (set to /etc/vimrc) sed -E 's|^.*(#define SYS_.*VIMRC_FILE.*").*$|\1|g' -i feature.h sed -E 's|^.*(#define VIMRC_FILE.*").*$|\1|g' -i feature.h diff --git a/fix-perl-build.patch b/fix-perl-build.patch deleted file mode 100644 index 087a55de243b..000000000000 --- a/fix-perl-build.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/src/if_perl.xs b/src/if_perl.xs -index c69ed9e..6c1003c 100644 ---- a/src/if_perl.xs -+++ b/src/if_perl.xs -@@ -40,7 +40,7 @@ - /* Work around for perl-5.18. - * Don't include "perl\lib\CORE\inline.h" for now, - * include it after Perl_sv_free2 is defined. */ --#ifdef DYNAMIC_PERL -+#if (PERL_REVISION == 5) && (PERL_VERSION >= 18) - # define PERL_NO_INLINE_FUNCTIONS - #endif - -@@ -402,14 +402,14 @@ static bool (*Perl_sv_2bool)(pTHX_ SV*); - static IV (*Perl_sv_2iv)(pTHX_ SV*); - static SV* (*Perl_sv_2mortal)(pTHX_ SV*); - # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) --static char* (*Perl_sv_2pv_flags)(pTHX_ SV*, STRLEN*, I32); -+static char* (*Perl_sv_2pv_flags)(pTHX_ SV*, STRLEN* const, const U32); - static char* (*Perl_sv_2pv_nolen)(pTHX_ SV*); - # else - static char* (*Perl_sv_2pv)(pTHX_ SV*, STRLEN*); - # endif - static char* (*Perl_sv_2pvbyte)(pTHX_ SV*, STRLEN*); - # if (PERL_REVISION == 5) && (PERL_VERSION >= 32) --static char* (*Perl_sv_2pvbyte_flags)(pTHX_ SV*, STRLEN*, I32); -+static char* (*Perl_sv_2pvbyte_flags)(pTHX_ SV*, STRLEN* const, const U32); - # endif - static SV* (*Perl_sv_bless)(pTHX_ SV*, HV*); - # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) -@@ -710,7 +710,7 @@ S_POPMARK(pTHX) - # endif - - /* perl-5.34 needs Perl_SvTRUE_common; used in SvTRUE_nomg_NN */ --# if (PERL_REVISION == 5) && (PERL_VERSION >= 34) -+# if (PERL_REVISION == 5) && (PERL_VERSION == 34) - PERL_STATIC_INLINE bool - Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback) - { -@@ -737,7 +737,7 @@ Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback) - # endif - - /* perl-5.32 needs Perl_SvTRUE */ --# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) -+# if (PERL_REVISION == 5) && (PERL_VERSION == 32) - PERL_STATIC_INLINE bool - Perl_SvTRUE(pTHX_ SV *sv) { - if (!LIKELY(sv)) -@@ -1649,7 +1649,7 @@ Buffers(...) - PPCODE: - if (items == 0) - { -- if (GIMME == G_SCALAR) -+ if (GIMME_V == G_SCALAR) - { - i = 0; - FOR_ALL_BUFFERS(vimbuf) -@@ -1700,7 +1700,7 @@ Windows(...) - PPCODE: - if (items == 0) - { -- if (GIMME == G_SCALAR) -+ if (GIMME_V == G_SCALAR) - XPUSHs(sv_2mortal(newSViv(win_count()))); - else - { |