Compare commits
26
Commits
a6225347fe
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b22ec3ceb8
|
||
|
|
4ef05913da
|
||
|
|
007679f4dd
|
||
|
|
0b86da01ae
|
||
|
|
8ff7584ea8
|
||
|
|
7018b08a15
|
||
|
|
ec3430bc88
|
||
|
|
c128abd3b1
|
||
|
|
2af8b81c5f
|
||
|
|
55b82629e7
|
||
|
|
8ff2eb3297
|
||
|
|
6208bb5c99
|
||
|
|
546b11d5d2
|
||
|
|
968a146658
|
||
|
|
18ba143c9d
|
||
|
|
70e8f5cff8
|
||
|
|
9ed71db86b
|
||
|
|
b49c2107f4
|
||
|
|
7cd97bdb81
|
||
|
|
4046053e3b
|
||
|
|
6abc8aacb9
|
||
|
|
2934d920b0
|
||
|
|
daf29b5c80
|
||
|
|
823e26edeb
|
||
|
|
4902d310c3
|
||
|
|
60bf91b076
|
+2
-1
@@ -1,2 +1,3 @@
|
||||
# Exclude bpm archives
|
||||
# Ignore BPM archives and signatures
|
||||
*.bpm
|
||||
*.bpm.sig
|
||||
|
||||
+5
-3
@@ -1,9 +1,11 @@
|
||||
name: vim
|
||||
description: A highly configurable text editor
|
||||
version: 9.1.2028
|
||||
revision: 4
|
||||
version: 9.2.1001
|
||||
revision: 1
|
||||
url: https://www.vim.org/
|
||||
license: vim
|
||||
maintainers:
|
||||
- [email protected]
|
||||
architecture: any
|
||||
type: source
|
||||
keep:
|
||||
@@ -35,4 +37,4 @@ downloads:
|
||||
- url: https://github.com/vim/vim/archive/refs/tags/v${BPM_PKG_VERSION}.tar.gz
|
||||
extract_to: ${BPM_SOURCE}
|
||||
extract_strip_components: 1
|
||||
checksum: 4a06e3c7823e31f5d161ac660ce6d920b0042c7aa0ba6c6eeb8fae7228d9e99a
|
||||
checksum: e3a36210b5411e2c46785f81cb7f3ed6072dd9690ef930e3529744112899e155
|
||||
@@ -1,4 +1,4 @@
|
||||
# This is the source.sh script. It is executed by BPM in a temporary directory when compiling a source package
|
||||
# This is the recipe.sh script. It is executed by BPM in a temporary directory when compiling a source package
|
||||
# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
|
||||
# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
# This function is used for putting downloaded files to the correct location or applying patches
|
||||
prepare() {
|
||||
cd "$BPM_SOURCE"
|
||||
# Fix building with ruby 4.0
|
||||
patch -p1 -i "$BPM_WORKDIR"/fix-building-with-ruby-4.0.patch
|
||||
|
||||
# Define place for global vimrc file
|
||||
sed -E 's|^.*(#define SYS_.*VIMRC_FILE.*").*$|\1|g' -i src/feature.h
|
||||
@@ -37,8 +35,8 @@ build() {
|
||||
--enable-python3interp=dynamic \
|
||||
--enable-rubyinterp=dynamic \
|
||||
--enable-luainterp=dynamic \
|
||||
--enable-tclinterp=dynamic \
|
||||
--disable-canberra
|
||||
--disable-canberra \
|
||||
--disable-tclinterp
|
||||
make
|
||||
}
|
||||
|
||||
@@ -1,124 +0,0 @@
|
||||
From 293c5e235bf590bca1088e9ce0af71e1c25b3678 Mon Sep 17 00:00:00 2001
|
||||
From: EnumDev <[email protected]>
|
||||
Date: Tue, 30 Dec 2025 17:10:53 +0200
|
||||
Subject: [PATCH 1/3] Fix building with ruby 4.0
|
||||
|
||||
Signed-off-by: EnumDev <[email protected]>
|
||||
---
|
||||
src/if_ruby.c | 14 +++++++++++++-
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/if_ruby.c b/src/if_ruby.c
|
||||
index 6af508beccdc1..a2dc53da8b79f 100644
|
||||
--- a/src/if_ruby.c
|
||||
+++ b/src/if_ruby.c
|
||||
@@ -244,7 +244,11 @@ static int ruby_convert_to_vim_value(VALUE val, typval_T *rettv);
|
||||
# define rb_check_type dll_rb_check_type
|
||||
# endif
|
||||
# ifdef USE_TYPEDDATA
|
||||
-# define rb_check_typeddata dll_rb_check_typeddata
|
||||
+# if RUBY_VERSION >= 40
|
||||
+# define rbimpl_check_typeddata dll_rbimpl_check_typeddata
|
||||
+# else
|
||||
+# define define rb_check_typeddata dll_rb_check_typeddata
|
||||
+# endif
|
||||
# endif
|
||||
# define rb_class_path dll_rb_class_path
|
||||
# ifdef USE_TYPEDDATA
|
||||
@@ -373,7 +377,11 @@ VALUE *dll_rb_cTrueClass;
|
||||
static VALUE (*dll_rb_class_new_instance) (int,VALUE*,VALUE);
|
||||
static void (*dll_rb_check_type) (VALUE,int);
|
||||
# ifdef USE_TYPEDDATA
|
||||
+# if RUBY_VERSION >= 40
|
||||
+static void *(*dll_rbimpl_check_typeddata) (VALUE,const rb_data_type_t *);
|
||||
+# else
|
||||
static void *(*dll_rb_check_typeddata) (VALUE,const rb_data_type_t *);
|
||||
+# endif
|
||||
# endif
|
||||
static VALUE (*dll_rb_class_path) (VALUE);
|
||||
# ifdef USE_TYPEDDATA
|
||||
@@ -632,7 +640,11 @@ static struct
|
||||
{"rb_class_new_instance", (RUBY_PROC*)&dll_rb_class_new_instance},
|
||||
{"rb_check_type", (RUBY_PROC*)&dll_rb_check_type},
|
||||
# ifdef USE_TYPEDDATA
|
||||
+# if RUBY_VERSION >= 40
|
||||
+ {"rbimpl_check_typeddata", (RUBY_PROC*)&dll_rbimpl_check_typeddata},
|
||||
+# else
|
||||
{"rb_check_typeddata", (RUBY_PROC*)&dll_rb_check_typeddata},
|
||||
+# endif
|
||||
# endif
|
||||
{"rb_class_path", (RUBY_PROC*)&dll_rb_class_path},
|
||||
# ifdef USE_TYPEDDATA
|
||||
|
||||
From 9c7c407a83226bd72541fc3c080245e72d8b23e2 Mon Sep 17 00:00:00 2001
|
||||
From: EnumDev <[email protected]>
|
||||
Date: Wed, 31 Dec 2025 14:17:28 +0200
|
||||
Subject: [PATCH 2/3] Fix typo in src/if_ruby.c
|
||||
|
||||
Signed-off-by: EnumDev <[email protected]>
|
||||
---
|
||||
src/if_ruby.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/if_ruby.c b/src/if_ruby.c
|
||||
index a2dc53da8b79f..81252102b1d48 100644
|
||||
--- a/src/if_ruby.c
|
||||
+++ b/src/if_ruby.c
|
||||
@@ -247,7 +247,7 @@ static int ruby_convert_to_vim_value(VALUE val, typval_T *rettv);
|
||||
# if RUBY_VERSION >= 40
|
||||
# define rbimpl_check_typeddata dll_rbimpl_check_typeddata
|
||||
# else
|
||||
-# define define rb_check_typeddata dll_rb_check_typeddata
|
||||
+# define rb_check_typeddata dll_rb_check_typeddata
|
||||
# endif
|
||||
# endif
|
||||
# define rb_class_path dll_rb_class_path
|
||||
|
||||
From 4cd61636526b710f12ca2d987c1c898502718f2d Mon Sep 17 00:00:00 2001
|
||||
From: EnumDev <[email protected]>
|
||||
Date: Wed, 31 Dec 2025 21:05:02 +0200
|
||||
Subject: [PATCH 3/3] Always define rb_check_typeddata
|
||||
|
||||
Signed-off-by: EnumDev <[email protected]>
|
||||
---
|
||||
src/if_ruby.c | 10 ++--------
|
||||
1 file changed, 2 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/if_ruby.c b/src/if_ruby.c
|
||||
index 81252102b1d48..49fdc34dd5316 100644
|
||||
--- a/src/if_ruby.c
|
||||
+++ b/src/if_ruby.c
|
||||
@@ -246,9 +246,8 @@ static int ruby_convert_to_vim_value(VALUE val, typval_T *rettv);
|
||||
# ifdef USE_TYPEDDATA
|
||||
# if RUBY_VERSION >= 40
|
||||
# define rbimpl_check_typeddata dll_rbimpl_check_typeddata
|
||||
-# else
|
||||
-# define rb_check_typeddata dll_rb_check_typeddata
|
||||
# endif
|
||||
+# define rb_check_typeddata dll_rb_check_typeddata
|
||||
# endif
|
||||
# define rb_class_path dll_rb_class_path
|
||||
# ifdef USE_TYPEDDATA
|
||||
@@ -379,9 +378,8 @@ static void (*dll_rb_check_type) (VALUE,int);
|
||||
# ifdef USE_TYPEDDATA
|
||||
# if RUBY_VERSION >= 40
|
||||
static void *(*dll_rbimpl_check_typeddata) (VALUE,const rb_data_type_t *);
|
||||
-# else
|
||||
-static void *(*dll_rb_check_typeddata) (VALUE,const rb_data_type_t *);
|
||||
# endif
|
||||
+static void *(*dll_rb_check_typeddata) (VALUE,const rb_data_type_t *);
|
||||
# endif
|
||||
static VALUE (*dll_rb_class_path) (VALUE);
|
||||
# ifdef USE_TYPEDDATA
|
||||
@@ -640,11 +638,7 @@ static struct
|
||||
{"rb_class_new_instance", (RUBY_PROC*)&dll_rb_class_new_instance},
|
||||
{"rb_check_type", (RUBY_PROC*)&dll_rb_check_type},
|
||||
# ifdef USE_TYPEDDATA
|
||||
-# if RUBY_VERSION >= 40
|
||||
- {"rbimpl_check_typeddata", (RUBY_PROC*)&dll_rbimpl_check_typeddata},
|
||||
-# else
|
||||
{"rb_check_typeddata", (RUBY_PROC*)&dll_rb_check_typeddata},
|
||||
-# endif
|
||||
# endif
|
||||
{"rb_class_path", (RUBY_PROC*)&dll_rb_class_path},
|
||||
# ifdef USE_TYPEDDATA
|
||||
Reference in New Issue
Block a user