Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ruby:ver bump

Browse Source
This commit is contained in:
blue-devil
2020-05-19 00:08:37 +03:00
parent d4a5c44889
commit a0f015b3d4
5 changed files with 199 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/language/ruby/ruby/actions.py
+4 -2
View File
@@ -4,13 +4,15 @@
# Licensed under the GNU General Public License, version 3. # Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt # See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import get
from pisi.actionsapi import autotools from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import get
#WorkDir="ruby-%s" % get.srcVERSION().replace("_","-") #WorkDir="ruby-%s" % get.srcVERSION().replace("_","-")
def setup(): def setup():
# suppress compiler warnings
pisitools.cflags.add("-Wno-deprecated-declarations")
autotools.configure("--enable-shared \ autotools.configure("--enable-shared \
--enable-pthread \ --enable-pthread \
--disable-rpath \ --disable-rpath \
@@ -23,4 +25,4 @@ def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) autotools.rawInstall("DESTDIR=%s" % get.installDIR())
autotools.rawInstall("DESTDIR=%s install-doc" % get.installDIR()) autotools.rawInstall("DESTDIR=%s install-doc" % get.installDIR())
pisitools.dodoc("COPYING*", "ChangeLog", "README*") pisitools.dodoc("COPYING*", "LEGAL*", "README*")
programming/language/ruby/ruby/files/ruby-2.7.0-Initialize-ABRT-hook.patch
+77
View File
@@ -0,0 +1,77 @@
From eca084e4079c77c061045df9c21b219175b05228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
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
programming/language/ruby/ruby/files/ruby-2.7.0-Remove-RubyGems-dependency.patch
+32
View File
@@ -0,0 +1,32 @@
From 6532dbecf36d1f24dab1f2143afd171e0b7699eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
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
programming/language/ruby/ruby/pspec.xml
+71 -32
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
<Source> <Source>
<Name>ruby</Name> <Name>ruby</Name>
@@ -8,30 +8,36 @@
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Packager> </Packager>
<PartOf>programming.language.ruby</PartOf>
<License>Ruby</License> <License>Ruby</License>
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>An object-oriented scripting language</Summary> <Summary>An object-oriented scripting language</Summary>
<Description>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.</Description> <Description>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.</Description>
<Archive sha1sum="1416ce288fb8bfeae07a12b608540318c9cace71" type="targz">https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.5.tar.gz</Archive> <Archive sha1sum="6c92300d7fd3e9cbb433e5e687535dc5300848eb" type="tarxz">https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.1.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>tcltk-devel</Dependency>
<Dependency>gmp-devel</Dependency>
<Dependency>tcl-devel</Dependency> <Dependency>tcl-devel</Dependency>
<Dependency>gdbm-devel</Dependency> <Dependency>gmp-devel</Dependency>
<Dependency>zlib-devel</Dependency> <Dependency>zlib-devel</Dependency>
<Dependency>gdbm-devel</Dependency>
<Dependency>tcltk-devel</Dependency>
<Dependency>libffi-devel</Dependency> <Dependency>libffi-devel</Dependency>
<Dependency>openssl-devel</Dependency> <Dependency>openssl-devel</Dependency>
<Dependency>libyaml-devel</Dependency> <Dependency>libyaml-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches>
<!-- <Patch level="1">ruby-2.7.0-Remove-RubyGems-dependency.patch</Patch>
<Patch level="1">ruby-2.7.0-Initialize-ABRT-hook.patch</Patch> -->
</Patches>
</Source> </Source>
<Package> <Package>
<Name>ruby</Name> <Name>ruby</Name>
<Summary>An object-oriented language for quick and easy programming</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>gmp</Dependency>
<Dependency>tcl</Dependency> <Dependency>tcl</Dependency>
<Dependency>gdbm</Dependency> <Dependency>gmp</Dependency>
<Dependency>zlib</Dependency> <Dependency>zlib</Dependency>
<Dependency>gdbm</Dependency>
<Dependency>tcltk</Dependency> <Dependency>tcltk</Dependency>
<Dependency>libffi</Dependency> <Dependency>libffi</Dependency>
<Dependency>openssl</Dependency> <Dependency>openssl</Dependency>
@@ -39,18 +45,51 @@
<Dependency>readline</Dependency> <Dependency>readline</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<!-- ruby binaries -->
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/ruby/2.6.0/</Path>
<Path fileType="library">/usr/lib/ruby/site_ruby/</Path> <!-- ruby libraries -->
<Path fileType="library">/usr/lib/ruby/vendor_ruby/</Path> <Path fileType="library">/usr/lib/ruby/2.7.0/</Path>
<Path fileType="library">/usr/lib/ruby/libruby-static.a</Path>
<Path fileType="library">/usr/lib/libruby.so.2.6</Path> <Path fileType="library">/usr/lib/libruby.so.2.7.1</Path>
<Path fileType="library">/usr/lib/libruby.so.2.6.5</Path> <Path fileType="library">/usr/lib/libruby.so.2.7</Path>
<Path fileType="library">/usr/lib/libruby-static.a</Path>
<Path fileType="library">/usr/lib/libruby.so</Path> <Path fileType="library">/usr/lib/libruby.so</Path>
<Path fileType="doc">/usr/share/ri</Path>
<Path fileType="doc">/usr/share/doc</Path> <Path fileType="library">/usr/lib/ruby/site_ruby/2.7.0/</Path>
<Path fileType="man">/usr/share/man</Path> <Path fileType="library">/usr/lib/ruby/vendor_ruby/2.7.0/</Path>
<!-- ruby man files -->
<Path fileType="man">/usr/share/man/man1</Path>
<!-- ruby doc files -->
<Path fileType="doc">/usr/share/doc/ruby/LEGAL</Path>
<Path fileType="doc">/usr/share/doc/ruby/LICENSE</Path>
<Path fileType="doc">/usr/share/doc/ruby/README*</Path>
<Path fileType="doc">/usr/share/doc/ruby/COPYING*</Path>
</Files>
</Package>
<Package>
<Name>ruby-devel</Name>
<Summary>Development files for ruby</Summary>
<RuntimeDependencies>
<Dependency release="current">ruby</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/lib/pkgconfig/</Path>
<Path fileType="header">/usr/include</Path>
</Files>
</Package>
<Package>
<Name>ruby-docs</Name>
<Summary>Documentation files for ruby</Summary>
<RuntimeDependencies>
<Dependency release="current">ruby</Dependency>
</RuntimeDependencies>
<Files>
<!-- ruby index files -->
<Path fileType="doc">/usr/share/ri/</Path>
</Files> </Files>
</Package> </Package>
@@ -61,26 +100,26 @@
<Dependency>ruby</Dependency> <Dependency>ruby</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<!-- rubygems binary -->
<Path fileType="executable">/usr/bin/gem</Path> <Path fileType="executable">/usr/bin/gem</Path>
<Path fileType="library">/usr/lib/ruby/gems</Path> <!-- rubygems gem libraries -->
<Path fileType="data">/usr/share/ri/2.6.0/system/Gem</Path> <Path fileType="library">/usr/lib/ruby/gems/</Path>
</Files> <!-- ruby index files -->
</Package> <Path fileType="data">/usr/share/ri/2.7.0/system/Gem</Path>
<!-- rubygem man files -->
<Package> <Path fileType="man">/usr/share/man/man5</Path>
<Name>ruby-devel</Name>
<Summary>ruby için geliştirme dosyaları</Summary>
<RuntimeDependencies>
<Dependency release="current">ruby</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="header">/usr/lib/pkgconfig</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="7"> <Update release="8">
<Date>2020-04-26</Date>
<Version>2.7.1</Version>
<Comment>Minor version bump.</Comment>
<Name>Blue Devil</Name>
<Email>bluedevil@sctzine.com</Email>
</Update>
<Update release="7">
<Date>2020-01-07</Date> <Date>2020-01-07</Date>
<Version>2.6.5</Version> <Version>2.6.5</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
programming/language/ruby/ruby/translations.xml
+13
View File
@@ -11,5 +11,18 @@
<Package> <Package>
<Name>ruby-devel</Name> <Name>ruby-devel</Name>
<Summary xml:lang="tr">ruby için geliştirme dosyaları</Summary> <Summary xml:lang="tr">ruby için geliştirme dosyaları</Summary>
<Description xml:lang="tr">ruby-devel, ruby için geliştirme dosyalarını içerir.</Description>
</Package>
<Package>
<Name>ruby-docs</Name>
<Summary xml:lang="tr">ruby için belgelendirme dosyaları</Summary>
<Description xml:lang="tr">ruby-docs, libnotify için belgelendirme dosyalarını içerir.</Description>
</Package>
<Package>
<Name>rubygems</Name>
<Summary xml:lang="tr">ruby için standart kitaplık dosyaları</Summary>
<Description xml:lang="tr">rubygems, ruby için standart kitaplık dosyalarını içerir.</Description>
</Package> </Package>
</PISI> </PISI>