From a0f015b3d410853baa8fd720ebe1c29873a57c83 Mon Sep 17 00:00:00 2001 From: blue-devil Date: Tue, 19 May 2020 00:08:37 +0300 Subject: [PATCH] ruby:ver bump --- programming/language/ruby/ruby/actions.py | 6 +- .../ruby-2.7.0-Initialize-ABRT-hook.patch | 77 +++++++++++++ ...uby-2.7.0-Remove-RubyGems-dependency.patch | 32 ++++++ programming/language/ruby/ruby/pspec.xml | 105 ++++++++++++------ .../language/ruby/ruby/translations.xml | 15 ++- 5 files changed, 199 insertions(+), 36 deletions(-) create mode 100644 programming/language/ruby/ruby/files/ruby-2.7.0-Initialize-ABRT-hook.patch create mode 100644 programming/language/ruby/ruby/files/ruby-2.7.0-Remove-RubyGems-dependency.patch diff --git a/programming/language/ruby/ruby/actions.py b/programming/language/ruby/ruby/actions.py index 3dfc2ab1f2..468b0fd405 100644 --- a/programming/language/ruby/ruby/actions.py +++ b/programming/language/ruby/ruby/actions.py @@ -4,13 +4,15 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/licenses/gpl.txt +from pisi.actionsapi import get from pisi.actionsapi import autotools from pisi.actionsapi import pisitools -from pisi.actionsapi import get #WorkDir="ruby-%s" % get.srcVERSION().replace("_","-") def setup(): + # suppress compiler warnings + pisitools.cflags.add("-Wno-deprecated-declarations") autotools.configure("--enable-shared \ --enable-pthread \ --disable-rpath \ @@ -23,4 +25,4 @@ def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) autotools.rawInstall("DESTDIR=%s install-doc" % get.installDIR()) - pisitools.dodoc("COPYING*", "ChangeLog", "README*") + pisitools.dodoc("COPYING*", "LEGAL*", "README*") \ No newline at end of file diff --git a/programming/language/ruby/ruby/files/ruby-2.7.0-Initialize-ABRT-hook.patch b/programming/language/ruby/ruby/files/ruby-2.7.0-Initialize-ABRT-hook.patch new file mode 100644 index 0000000000..58c92cfcbf --- /dev/null +++ b/programming/language/ruby/ruby/files/ruby-2.7.0-Initialize-ABRT-hook.patch @@ -0,0 +1,77 @@ +From eca084e4079c77c061045df9c21b219175b05228 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Mon, 6 Jan 2020 13:56:04 +0100 +Subject: [PATCH] Initialize ABRT hook. + +The ABRT hook used to be initialized by preludes via patches [[1], [2]]. +Unfortunately, due to [[3]] and especially since [[4]], this would +require boostrapping [[5]]. + +To keep the things simple for now, load the ABRT hook via C. + +[1]: https://bugs.ruby-lang.org/issues/8566 +[2]: https://bugs.ruby-lang.org/issues/15306 +[3]: https://bugs.ruby-lang.org/issues/16254 +[4]: https://github.com/ruby/ruby/pull/2735 +[5]: https://lists.fedoraproject.org/archives/list/ruby-sig@lists.fedoraproject.org/message/LH6L6YJOYQT4Y5ZNOO4SLIPTUWZ5V45Q/ +--- + abrt.c | 12 ++++++++++++++ + common.mk | 3 ++- + ruby.c | 4 ++++ + 3 files changed, 18 insertions(+), 1 deletion(-) + create mode 100644 abrt.c + +diff --git a/abrt.c b/abrt.c +new file mode 100644 +index 0000000000..74b0bd5c0f +--- /dev/null ++++ b/abrt.c +@@ -0,0 +1,12 @@ ++#include "internal.h" ++ ++void ++Init_abrt(void) ++{ ++ rb_eval_string( ++ " begin\n" ++ " require 'abrt'\n" ++ " rescue LoadError\n" ++ " end\n" ++ ); ++} +diff --git a/common.mk b/common.mk +index b2e5b2b6d0..f39f81da5c 100644 +--- a/common.mk ++++ b/common.mk +@@ -81,7 +81,8 @@ ENC_MK = enc.mk + MAKE_ENC = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \ + RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(mflags) + +-COMMONOBJS = array.$(OBJEXT) \ ++COMMONOBJS = abrt.$(OBJEXT) \ ++ array.$(OBJEXT) \ + ast.$(OBJEXT) \ + bignum.$(OBJEXT) \ + class.$(OBJEXT) \ +diff --git a/ruby.c b/ruby.c +index 60c57d6259..1eec16f2c8 100644 +--- a/ruby.c ++++ b/ruby.c +@@ -1439,10 +1439,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt) + + void Init_builtin_features(void); + ++/* abrt.c */ ++void Init_abrt(void); ++ + static void + ruby_init_prelude(void) + { + Init_builtin_features(); ++ Init_abrt(); + rb_const_remove(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX")); + } + +-- +2.24.1 + diff --git a/programming/language/ruby/ruby/files/ruby-2.7.0-Remove-RubyGems-dependency.patch b/programming/language/ruby/ruby/files/ruby-2.7.0-Remove-RubyGems-dependency.patch new file mode 100644 index 0000000000..420521788d --- /dev/null +++ b/programming/language/ruby/ruby/files/ruby-2.7.0-Remove-RubyGems-dependency.patch @@ -0,0 +1,32 @@ +From 6532dbecf36d1f24dab1f2143afd171e0b7699eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Wed, 4 Sep 2019 15:07:07 +0200 +Subject: [PATCH] Remove RubyGems dependency. + +Since `Process::RLIMIT_NOFILE` is platform specific, better to use Ruby +introspection than detecting platform. +--- + .../vendor/net-http-persistent/lib/net/http/persistent.rb | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +index a54be2a..06739f1 100644 +--- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb ++++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +@@ -202,10 +202,10 @@ class Bundler::Persistent::Net::HTTP::Persistent + ## + # The default connection pool size is 1/4 the allowed open files. + +- if Gem.win_platform? then +- DEFAULT_POOL_SIZE = 256 +- else ++ if Process.const_defined? :RLIMIT_NOFILE + DEFAULT_POOL_SIZE = Process.getrlimit(Process::RLIMIT_NOFILE).first / 4 ++ else ++ DEFAULT_POOL_SIZE = 256 + end + + ## +-- +2.23.0 + diff --git a/programming/language/ruby/ruby/pspec.xml b/programming/language/ruby/ruby/pspec.xml index 7cd407390a..c19c2a9840 100644 --- a/programming/language/ruby/ruby/pspec.xml +++ b/programming/language/ruby/ruby/pspec.xml @@ -1,5 +1,5 @@ - + ruby @@ -8,30 +8,36 @@ PisiLinux Community admins@pisilinux.org + programming.language.ruby Ruby app:console An object-oriented scripting language Ruby is a dynamic, open source programming language with a focus on simplicity and productivity. It has an elegant syntax that is natural to read and easy to write. - https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.5.tar.gz + https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.1.tar.xz - tcltk-devel - gmp-devel tcl-devel - gdbm-devel + gmp-devel zlib-devel + gdbm-devel + tcltk-devel libffi-devel openssl-devel libyaml-devel + + + ruby + An object-oriented language for quick and easy programming - gmp tcl - gdbm + gmp zlib + gdbm tcltk libffi openssl @@ -39,18 +45,51 @@ readline + /usr/bin - /usr/lib/ruby/2.6.0/ - /usr/lib/ruby/site_ruby/ - /usr/lib/ruby/vendor_ruby/ - /usr/lib/ruby/libruby-static.a - /usr/lib/libruby.so.2.6 - /usr/lib/libruby.so.2.6.5 - /usr/lib/libruby-static.a + + + /usr/lib/ruby/2.7.0/ + + /usr/lib/libruby.so.2.7.1 + /usr/lib/libruby.so.2.7 /usr/lib/libruby.so - /usr/share/ri - /usr/share/doc - /usr/share/man + + /usr/lib/ruby/site_ruby/2.7.0/ + /usr/lib/ruby/vendor_ruby/2.7.0/ + + /usr/share/man/man1 + + /usr/share/doc/ruby/LEGAL + /usr/share/doc/ruby/LICENSE + /usr/share/doc/ruby/README* + /usr/share/doc/ruby/COPYING* + + + + + + ruby-devel + Development files for ruby + + ruby + + + /usr/lib/pkgconfig/ + /usr/include + + + + + ruby-docs + Documentation files for ruby + + ruby + + + + /usr/share/ri/ + @@ -61,26 +100,26 @@ ruby + /usr/bin/gem - /usr/lib/ruby/gems - /usr/share/ri/2.6.0/system/Gem - - - - - ruby-devel - ruby için geliştirme dosyaları - - ruby - - - /usr/include - /usr/lib/pkgconfig + + /usr/lib/ruby/gems/ + + /usr/share/ri/2.7.0/system/Gem + + /usr/share/man/man5 - + + 2020-04-26 + 2.7.1 + Minor version bump. + Blue Devil + bluedevil@sctzine.com + + 2020-01-07 2.6.5 Version bump. @@ -137,4 +176,4 @@ ayhanyalcinsoy@pisilinux.org - + \ No newline at end of file diff --git a/programming/language/ruby/ruby/translations.xml b/programming/language/ruby/ruby/translations.xml index f72670482f..3a86990df4 100644 --- a/programming/language/ruby/ruby/translations.xml +++ b/programming/language/ruby/ruby/translations.xml @@ -11,5 +11,18 @@ ruby-devel ruby için geliştirme dosyaları + ruby-devel, ruby için geliştirme dosyalarını içerir. - + + + ruby-docs + ruby için belgelendirme dosyaları + ruby-docs, libnotify için belgelendirme dosyalarını içerir. + + + + rubygems + ruby için standart kitaplık dosyaları + rubygems, ruby için standart kitaplık dosyalarını içerir. + + \ No newline at end of file