Summary: | net-libs/webkit-gtk - add ruby20 support | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Mark David Dumlao <madumlao> |
Component: | [OLD] GNOME | Assignee: | Gentoo Linux Gnome Desktop Team <gnome> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | ruby |
Priority: | Normal | Keywords: | EBUILD, PATCH |
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Attachments: |
net-libs/webkit-gtk-2.0.4 with ruby20 support
net-libs/webkit-gtk-2.0.4 with ruby20 support net-libs/webkit-gtk-1.10.2-r300 with ruby20 support |
Description
Mark David Dumlao
2013-08-24 07:06:46 UTC
Created attachment 356832 [details]
net-libs/webkit-gtk-2.0.4 with ruby20 support
Comment on attachment 356832 [details]
net-libs/webkit-gtk-2.0.4 with ruby20 support
obsoleted to add myconf edit
Created attachment 356836 [details]
net-libs/webkit-gtk-2.0.4 with ruby20 support
Created attachment 356838 [details]
net-libs/webkit-gtk-1.10.2-r300 with ruby20 support
webkit-gtk-2.0.4 successfully compiles with ruby20. Comment on attachment 356836 [details]
net-libs/webkit-gtk-2.0.4 with ruby20 support
--- webkit-gtk-2.0.4.ebuild 2013-08-06 13:47:01.760532080 +0200
+++ - 2013-08-24 15:40:00.070141057 +0200
@@ -59,7 +59,8 @@
DEPEND="${RDEPEND}
${PYTHON_DEPS}
dev-lang/perl
- || ( virtual/rubygems[ruby_targets_ruby19]
+ || ( virtual/rubygems[ruby_targets_ruby20]
+ virtual/rubygems[ruby_targets_ruby19]
virtual/rubygems[ruby_targets_ruby18] )
>=app-accessibility/at-spi2-core-2.5.3
>=dev-util/gtk-doc-am-1.10
@@ -206,7 +207,9 @@
"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
# Aqua support in gtk3 is untested
- if has_version "virtual/rubygems[ruby_targets_ruby19]"; then
+ if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+ myconf="${myconf} RUBY=$(type -P ruby20)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
myconf="${myconf} RUBY=$(type -P ruby19)"
else
myconf="${myconf} RUBY=$(type -P ruby18)"
Comment on attachment 356838 [details]
net-libs/webkit-gtk-1.10.2-r300 with ruby20 support
--- webkit-gtk-1.10.2-r300.ebuild 2013-08-06 13:47:01.740532459 +0200
+++ - 2013-08-24 15:40:31.482957844 +0200
@@ -54,7 +54,8 @@
DEPEND="${RDEPEND}
${PYTHON_DEPS}
dev-lang/perl
- || ( virtual/rubygems[ruby_targets_ruby19]
+ || ( virtual/rubygems[ruby_targets_ruby20]
+ virtual/rubygems[ruby_targets_ruby19]
virtual/rubygems[ruby_targets_ruby18] )
app-accessibility/at-spi2-core
>=dev-util/gtk-doc-am-1.10
@@ -219,7 +220,9 @@
"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
# Aqua support in gtk3 is untested
- if has_version "virtual/rubygems[ruby_targets_ruby19]"; then
+ if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+ myconf="${myconf} RUBY=$(type -P ruby20)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
myconf="${myconf} RUBY=$(type -P ruby19)"
else
myconf="${myconf} RUBY=$(type -P ruby18)"
webkit-gtk-1.10.2-r300 successfully compiles with ruby20. We had to introduce this explicit dependency because some ruby package (don't remember right now) caused webkit to pull almost all ruby interpreters available. We'll have a look at the patches. (In reply to Gilles Dartiguelongue from comment #9) > We had to introduce this explicit dependency because some ruby package > (don't remember right now) caused webkit to pull almost all ruby > interpreters available. > > We'll have a look at the patches. It's alright to have an explicit || dependency, what the bug is saying is that the || dependency should include all RUBY_TARGETs available. Right now we're only putting in ruby18 and ruby19, which causes mayhem for people who put RUBY_TARGETS="ruby20". ruby team, is this the right way for handling the deps? (In reply to Pacho Ramos from comment #11) > ruby team, is this the right way for handling the deps? @ruby team, we need a ruby equivalent of python-any-r1.eclass : a simple way to select the "best" ruby version to use for a non-ruby package whose build system uses ruby somewhere. ... and until such an eclass exists, I've applied Mark's patches. + 01 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + webkit-gtk-1.10.2-r300.ebuild, webkit-gtk-2.0.4.ebuild: + Allow building using ruby20 (bug #482296, thanks to Mark David Dumlao). (In reply to Alexandre Rostovtsev from comment #12) > (In reply to Pacho Ramos from comment #11) > > ruby team, is this the right way for handling the deps? > > @ruby team, we need a ruby equivalent of python-any-r1.eclass : a simple way > to select the "best" ruby version to use for a non-ruby package whose build > system uses ruby somewhere. Discussion about that is in https://bugs.gentoo.org/show_bug.cgi?id=444828 (In reply to Alexandre Rostovtsev from comment #13) > ... and until such an eclass exists, I've applied Mark's patches. > > + 01 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> > + webkit-gtk-1.10.2-r300.ebuild, webkit-gtk-2.0.4.ebuild: > + Allow building using ruby20 (bug #482296, thanks to Mark David Dumlao). I'm not sure why webkit-gtk depends on virtual/rubygems, rather than on dev-lang/ruby slots? Right now I would also put ruby19 at the front of the ||() list, but that's exactly the kind of micromanagement we should provide in an eclass. In any case both of these are nitpicks and what you have works. |