[arch-commits] Commit in vim/trunk (PKGBUILD use-perls-inline-functions.patch)
Evangelos Foutras
foutrelis at archlinux.org
Tue May 25 01:55:47 UTC 2021
Date: Tuesday, May 25, 2021 @ 01:55:47
Author: foutrelis
Revision: 416438
upgpkg: vim 8.2.2885-2: drop previous patch; link to libperl for now
Reinstate --enable-perlinterp=dynamic when upstream supports Perl 5.34.
Modified:
vim/trunk/PKGBUILD
Deleted:
vim/trunk/use-perls-inline-functions.patch
----------------------------------+
PKGBUILD | 25 ++++-------
use-perls-inline-functions.patch | 84 -------------------------------------
2 files changed, 11 insertions(+), 98 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-25 00:15:33 UTC (rev 416437)
+++ PKGBUILD 2021-05-25 01:55:47 UTC (rev 416438)
@@ -11,7 +11,7 @@
pkgname=('vim' 'gvim' 'vim-runtime')
pkgver=8.2.2885
_versiondir=82
-pkgrel=1
+pkgrel=2
pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
url='https://www.vim.org'
arch=('x86_64')
@@ -19,17 +19,14 @@
makedepends=('glibc' 'libgcrypt' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'gtk3' 'lua'
'gawk' 'tcl' 'pcre' 'zlib' 'libcanberra')
source=(https://github.com/vim/vim/archive/v${pkgver}/${pkgbase}-${pkgver}.tar.gz
- use-perls-inline-functions.patch
vimrc
archlinux.vim
vimdoc.hook)
sha256sums=('029f2785403e9677a33100c959de4bde1c1f920f0b10b6f3870f92e8bb24045c'
- '709bd36ef796b5e71df08b4a76675ee86a7afdac5627f2dc05c320b8f012a385'
'b16e85e457397ab2043a7ee0a3c84307c6b4eac157fd0b721694761f25b3ed5b'
'cc3d931129854c298eb22e993ec14c2ad86cc1e70a08a64496f5e06559289972'
'8e9656934d9d7793063230d15a689e10455e6db9b9fe73afa0f294792795d8ae')
sha512sums=('daee8c437336b90ae50a2404c317ba39d62c70d18dd9e4bc20289e1ae3a614255d27b0da97e2ea363c4fb9b813d8a653111176ac1a2109745fb4e2c4be96b599'
- 'd09f21d139d1105276486e416a662baf611fd6e5c6574a3ccc469b06d90a83cb92ebf0b550c535b9d90d1378ca013f373b62f0d484a3a6918c9c0454028745a5'
'4b5bed0813f22af9e158ea9aa56a4a9862dd786ba2d201f20159ccf652da6190164aaed0b6b7217d578f7b25c33a8adcc307bfcf3caa8d173a7ff29e2a00fee7'
'fe091d289d876f45319c898f6021ef86d6a238b540c225a279c46efc5c36fa7d868cd0cee73a111811c4be90df160f85340bb251be3a437727dbe5c699950363'
'a02ad0d66f300160911aeb81d8886c6c558436ac4ee3fcd161dd65c6b1e5d1f41b9005a7f5bb5ba68d57027fc1c8e43daabf055bd6207fb5a216a67f758df8d1')
@@ -41,10 +38,6 @@
sed -E 's|^.*(#define VIMRC_FILE.*").*$|\1|g' -i feature.h
autoconf
)
-
- # https://github.com/vim/vim/issues/8250
- patch -d vim-${pkgver} -Np1 <use-perls-inline-functions.patch
-
cp -a vim-${pkgver} gvim-${pkgver}
}
@@ -63,7 +56,7 @@
--enable-multibyte \
--enable-cscope \
--enable-netbeans \
- --enable-perlinterp=dynamic \
+ --enable-perlinterp \
--enable-pythoninterp=dynamic \
--enable-python3interp=dynamic \
--enable-rubyinterp=dynamic \
@@ -87,7 +80,7 @@
--enable-multibyte \
--enable-cscope \
--enable-netbeans \
- --enable-perlinterp=dynamic \
+ --enable-perlinterp \
--enable-pythoninterp=dynamic \
--enable-python3interp=dynamic \
--enable-rubyinterp=dynamic \
@@ -142,13 +135,15 @@
}
package_vim() {
+ # TODO: move perl back into optdeps after --enable-perlinterp=dynamic
+ # starts working again (https://github.com/vim/vim/issues/8250)
depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl' 'glibc' 'libgcrypt' 'pcre'
- 'zlib')
+ 'zlib' 'perl')
optdepends=('python2: Python 2 language support'
'python: Python 3 language support'
'ruby: Ruby language support'
'lua: Lua language support'
- 'perl: Perl language support'
+ #'perl: Perl language support'
'tcl: Tcl language support')
conflicts=('gvim' 'vim-minimal' 'vim-python3')
provides=('xxd' 'vim-minimal' 'vim-python3' 'vim-plugin-runtime')
@@ -181,13 +176,15 @@
package_gvim() {
pkgdesc+=' (with advanced features, such as a GUI)'
+ # TODO: move perl back into optdeps after --enable-perlinterp=dynamic
+ # starts working again (https://github.com/vim/vim/issues/8250)
depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk3' 'glibc' 'libgcrypt' 'pcre'
- 'zlib' 'libcanberra')
+ 'zlib' 'libcanberra' 'perl')
optdepends=('python2: Python 2 language support'
'python: Python 3 language support'
'ruby: Ruby language support'
'lua: Lua language support'
- 'perl: Perl language support'
+ #'perl: Perl language support'
'tcl: Tcl language support')
provides=("vim=${pkgver}-${pkgrel}" "xxd" 'vim-plugin-runtime')
conflicts=('vim-minimal' 'vim')
Deleted: use-perls-inline-functions.patch
===================================================================
--- use-perls-inline-functions.patch 2021-05-25 00:15:33 UTC (rev 416437)
+++ use-perls-inline-functions.patch 2021-05-25 01:55:47 UTC (rev 416438)
@@ -1,84 +0,0 @@
-diff -upr vim-8.2.2885.orig/src/if_perl.xs vim-8.2.2885/src/if_perl.xs
---- vim-8.2.2885.orig/src/if_perl.xs 2021-05-24 23:56:15.000000000 +0300
-+++ vim-8.2.2885/src/if_perl.xs 2021-05-25 02:49:30.913667666 +0300
-@@ -37,13 +37,6 @@
-
- #include "vim.h"
-
--/* 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
--# define PERL_NO_INLINE_FUNCTIONS
--#endif
--
- #ifdef _MSC_VER
- // Work around for using MSVC and ActivePerl 5.18.
- # define __inline__ __inline
-@@ -651,66 +644,6 @@ static struct {
- {"", NULL},
- };
-
--/* Work around for perl-5.18.
-- * For now, only the definitions of S_SvREFCNT_dec are needed in
-- * "perl\lib\CORE\inline.h". */
--# if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
--static void
--S_SvREFCNT_dec(pTHX_ SV *sv)
--{
-- if (LIKELY(sv != NULL)) {
-- U32 rc = SvREFCNT(sv);
-- if (LIKELY(rc > 1))
-- SvREFCNT(sv) = rc - 1;
-- else
-- Perl_sv_free2(aTHX_ sv, rc);
-- }
--}
--# endif
--
--/* perl-5.32 needs Perl_SvREFCNT_dec */
--# if (PERL_REVISION == 5) && (PERL_VERSION >= 32)
--# define Perl_SvREFCNT_dec S_SvREFCNT_dec
--# endif
--
--/* perl-5.26 also needs S_TOPMARK and S_POPMARK. */
--# if (PERL_REVISION == 5) && (PERL_VERSION >= 26)
--PERL_STATIC_INLINE I32
--S_TOPMARK(pTHX)
--{
-- DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log,
-- "MARK top %p %" IVdf "\n",
-- PL_markstack_ptr,
-- (IV)*PL_markstack_ptr)));
-- return *PL_markstack_ptr;
--}
--
--PERL_STATIC_INLINE I32
--S_POPMARK(pTHX)
--{
-- DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log,
-- "MARK pop %p %" IVdf "\n",
-- (PL_markstack_ptr-1),
-- (IV)*(PL_markstack_ptr-1))));
-- assert((PL_markstack_ptr > PL_markstack) || !"MARK underflow");
-- return *PL_markstack_ptr--;
--}
--# endif
--
--/* perl-5.32 needs Perl_POPMARK */
--# if (PERL_REVISION == 5) && (PERL_VERSION >= 32)
--# define Perl_POPMARK S_POPMARK
--
--/* perl-5.32 needs Perl_SvTRUE */
--PERL_STATIC_INLINE bool
--Perl_SvTRUE(pTHX_ SV *sv) {
-- if (!LIKELY(sv))
-- return FALSE;
-- SvGETMAGIC(sv);
-- return SvTRUE_nomg_NN(sv);
--}
--# endif
--
- /*
- * Make all runtime-links of perl.
- *
More information about the arch-commits
mailing list