From f12fe41d7982cf4324859a6308845db55e20032b Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 8 Feb 2019 01:34:06 +0000 Subject: [PATCH] extra/ruby to 2.6.1-1.1 --- ...nature-of-rb_uint2big-and-rb_int2big.patch | 77 ------------------- ...-only-unsigned-long-for-rb_serial_t.patch} | 6 +- ...ture-of-rb_uint2inum-and-rb_int2inum.patch | 30 -------- extra/ruby/PKGBUILD | 16 ++-- 4 files changed, 8 insertions(+), 121 deletions(-) delete mode 100644 extra/ruby/0001-Revert-Signature-of-rb_uint2big-and-rb_int2big.patch rename extra/ruby/{0003-Use-only-unsigned-long-for-rb_serial_t.patch => 0001-Use-only-unsigned-long-for-rb_serial_t.patch} (83%) delete mode 100644 extra/ruby/0002-Revert-Signature-of-rb_uint2inum-and-rb_int2inum.patch diff --git a/extra/ruby/0001-Revert-Signature-of-rb_uint2big-and-rb_int2big.patch b/extra/ruby/0001-Revert-Signature-of-rb_uint2big-and-rb_int2big.patch deleted file mode 100644 index 3282fbd29..000000000 --- a/extra/ruby/0001-Revert-Signature-of-rb_uint2big-and-rb_int2big.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 6a05adeb927f02400f071962846bb3a83619bcbf Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Mon, 14 Jan 2019 21:33:21 -0700 -Subject: [PATCH 1/3] Revert "Signature of rb_uint2big and rb_int2big" - -This reverts commit d77e8a7da596fc23acd76c785548f6314114f97a. ---- - bignum.c | 10 +++++----- - include/ruby/ruby.h | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/bignum.c b/bignum.c -index ee3b49fd04..2f9e8cd323 100644 ---- a/bignum.c -+++ b/bignum.c -@@ -3154,7 +3154,7 @@ rb_big_norm(VALUE x) - } - - VALUE --rb_uint2big(uintptr_t n) -+rb_uint2big(VALUE n) - { - long i; - VALUE big = bignew(bdigit_roomof(SIZEOF_VALUE), 1); -@@ -3176,7 +3176,7 @@ rb_uint2big(uintptr_t n) - } - - VALUE --rb_int2big(intptr_t n) -+rb_int2big(SIGNED_VALUE n) - { - long neg = 0; - VALUE u; -@@ -3197,14 +3197,14 @@ rb_int2big(intptr_t n) - } - - VALUE --rb_uint2inum(uintptr_t n) -+rb_uint2inum(VALUE n) - { - if (POSFIXABLE(n)) return LONG2FIX(n); - return rb_uint2big(n); - } - - VALUE --rb_int2inum(intptr_t n) -+rb_int2inum(SIGNED_VALUE n) - { - if (FIXABLE(n)) return LONG2FIX(n); - return rb_int2big(n); -@@ -5963,7 +5963,7 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp) - zds = BDIGITS(z); - dd = bigdivrem_single(zds, xds, xn, dd); - if (modp) { -- *modp = rb_uint2big((uintptr_t)dd); -+ *modp = rb_uint2big((VALUE)dd); - BIGNUM_SET_SIGN(*modp, BIGNUM_SIGN(x)); - } - if (divp) *divp = z; -diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h -index d983114e0a..697ea7f45d 100644 ---- a/include/ruby/ruby.h -+++ b/include/ruby/ruby.h -@@ -772,8 +772,8 @@ rb_num2ll_inline(VALUE x) - double rb_num2dbl(VALUE); - #define NUM2DBL(x) rb_num2dbl((VALUE)(x)) - --VALUE rb_uint2big(uintptr_t); --VALUE rb_int2big(intptr_t); -+VALUE rb_uint2big(VALUE); -+VALUE rb_int2big(SIGNED_VALUE); - - VALUE rb_newobj(void); - VALUE rb_newobj_of(VALUE, VALUE); --- -2.20.1 - diff --git a/extra/ruby/0003-Use-only-unsigned-long-for-rb_serial_t.patch b/extra/ruby/0001-Use-only-unsigned-long-for-rb_serial_t.patch similarity index 83% rename from extra/ruby/0003-Use-only-unsigned-long-for-rb_serial_t.patch rename to extra/ruby/0001-Use-only-unsigned-long-for-rb_serial_t.patch index db8d957f6..3e4066d3a 100644 --- a/extra/ruby/0003-Use-only-unsigned-long-for-rb_serial_t.patch +++ b/extra/ruby/0001-Use-only-unsigned-long-for-rb_serial_t.patch @@ -1,14 +1,14 @@ -From 8da8ccfc11050c25aa262db3e84a36bc74899de9 Mon Sep 17 00:00:00 2001 +From 058bf8ae8686bd441188a62e950227e50214056b Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 14 Jan 2019 21:34:02 -0700 -Subject: [PATCH 3/3] Use only unsigned long for rb_serial_t +Subject: [PATCH] Use only unsigned long for rb_serial_t --- internal.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/internal.h b/internal.h -index 433ab6635d..a4f7e9bde3 100644 +index 28a2f74..8c16c5a 100644 --- a/internal.h +++ b/internal.h @@ -941,19 +941,9 @@ struct rb_subclass_entry { diff --git a/extra/ruby/0002-Revert-Signature-of-rb_uint2inum-and-rb_int2inum.patch b/extra/ruby/0002-Revert-Signature-of-rb_uint2inum-and-rb_int2inum.patch deleted file mode 100644 index 65bd5519f..000000000 --- a/extra/ruby/0002-Revert-Signature-of-rb_uint2inum-and-rb_int2inum.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 51c93162de459b14ebf07445c87aaf8ba3795b07 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Mon, 14 Jan 2019 21:33:29 -0700 -Subject: [PATCH 2/3] Revert "Signature of rb_uint2inum and rb_int2inum" - -This reverts commit b2033b8b8418b0c1ceed54bdc170c03dd45d1cf8. ---- - include/ruby/ruby.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h -index 697ea7f45d..c7c873e1c8 100644 ---- a/include/ruby/ruby.h -+++ b/include/ruby/ruby.h -@@ -263,10 +263,10 @@ typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1]; - #define RB_LONG2FIX(i) RB_INT2FIX(i) - #define LONG2FIX(i) RB_INT2FIX(i) - #define rb_fix_new(v) RB_INT2FIX(v) --VALUE rb_int2inum(intptr_t); -+VALUE rb_int2inum(SIGNED_VALUE); - - #define rb_int_new(v) rb_int2inum(v) --VALUE rb_uint2inum(uintptr_t); -+VALUE rb_uint2inum(VALUE); - - #define rb_uint_new(v) rb_uint2inum(v) - --- -2.20.1 - diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index f8e5a755a..e84ed1704 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,33 +4,27 @@ # Contributor: Jeramy Rutley # ALARM: Kevin Mihelich -# - patches to fix running ruby on 32-bit ARM +# - patch to fix running ruby on 32-bit ARM pkgname=(ruby ruby-docs) pkgver=2.6.1 -pkgrel=1 +pkgrel=1.1 arch=(x86_64) url='http://www.ruby-lang.org/en/' license=(BSD custom) makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk) options=(!emptydirs) source=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz - 0001-Revert-Signature-of-rb_uint2big-and-rb_int2big.patch - 0002-Revert-Signature-of-rb_uint2inum-and-rb_int2inum.patch - 0003-Use-only-unsigned-long-for-rb_serial_t.patch) + 0001-Use-only-unsigned-long-for-rb_serial_t.patch) sha512sums=('fb36289a955f0596c683cdadf1e4a9a9fd35222b1e1c6160c2e7cd82e5befd40a7aa4361e55f7a8f83c06ee899ec493821c7db34a60c4ac3bca0e874d33ef1a9' - '939bd57abc38aad6f5efa747f5e59737697ab89dfe1b58060ca83c88a217b0c6a15607eef7c8279ab85c7aabe8eb83e6cf6fb67988aa771117c6b80322c5b52e' - '4a1ad988ece8fd0b5f129523087c4fc7264bc8e56869fe8549bc006c8ae05552d743a67c3693e88eaf33d3e515b10817e9c8a5e386e1a369763a94fc84563739' - '8a98c909667bbeb47146d17397d7a27e82a90bb439c83b3c3c40687600a04040fefd567dcc0929d82dd1f6ef66fcfc84dcfe9b7a24eca3fb3b027328400358e4') + 'e832b64ee46721b4a8be4c44cc62a4ae3ca25e1a9fa9803e5001757d6ce11565bfa82d87182029b6d054f45bb556d4a1b515047edec8932c31dab4d0f3ad060c') prepare() { cd ruby-${pkgver} # remove bundled gems, we are going to ship them as separate packages rm -rf gems/ - patch -Np1 -i ../0001-Revert-Signature-of-rb_uint2big-and-rb_int2big.patch - patch -Np1 -i ../0002-Revert-Signature-of-rb_uint2inum-and-rb_int2inum.patch # fixes https://bugs.ruby-lang.org/issues/9507 - [[ $CARCH == 'arm' ]] && patch -Np1 -i ../0003-Use-only-unsigned-long-for-rb_serial_t.patch || true + [[ $CARCH == 'arm' ]] && patch -Np1 -i ../0001-Use-only-unsigned-long-for-rb_serial_t.patch || true } build() {