pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/ruby-nokogiri textproc/ruby-nokogiri: fix dep...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/201d88ce950a
branches:  trunk
changeset: 458547:201d88ce950a
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Sep 18 08:05:09 2021 +0000

description:
textproc/ruby-nokogiri: fix dependency

Allow depending to misc/ruby-mini_portile2 2.7.0 and later.

* Override gemspec.
* There is dependency to mini_portile2 in ext/nokogiri/extconf.rb.  :(

No PKGREVISION bump since this change fix broken package.

diffstat:

 textproc/ruby-nokogiri/Makefile                              |   5 ++-
 textproc/ruby-nokogiri/distinfo                              |   3 +-
 textproc/ruby-nokogiri/patches/patch-ext_nokogiri_extconf.rb |  15 ++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 06ed163cb7c0 -r 201d88ce950a textproc/ruby-nokogiri/Makefile
--- a/textproc/ruby-nokogiri/Makefile   Sat Sep 18 07:53:57 2021 +0000
+++ b/textproc/ruby-nokogiri/Makefile   Sat Sep 18 08:05:09 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2021/09/11 09:54:46 tsutsui Exp $
+# $NetBSD: Makefile,v 1.62 2021/09/18 08:05:09 taca Exp $
 
 DISTNAME=      nokogiri-1.12.4
 CATEGORIES=    textproc
@@ -15,7 +15,8 @@
 USE_TOOLS+=            pkg-config
 MAKE_ENV+=             NOKOGIRI_USE_SYSTEM_LIBRARIES=yes
 RUBYGEM_OPTIONS+=      --format-executable
-OVERRIDE_GEMSPEC+=     :files ports/archives/libxml2-2.9.12.tar.gz= \
+OVERRIDE_GEMSPEC+=     mini_portile2>=2.6.1 \
+                       :files ports/archives/libxml2-2.9.12.tar.gz= \
                        ports/archives/libxslt-1.1.34.tar.gz=
 
 .include "../../devel/ruby-pkg-config/tool.mk"
diff -r 06ed163cb7c0 -r 201d88ce950a textproc/ruby-nokogiri/distinfo
--- a/textproc/ruby-nokogiri/distinfo   Sat Sep 18 07:53:57 2021 +0000
+++ b/textproc/ruby-nokogiri/distinfo   Sat Sep 18 08:05:09 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.42 2021/09/11 09:54:46 tsutsui Exp $
+$NetBSD: distinfo,v 1.43 2021/09/18 08:05:09 taca Exp $
 
 SHA1 (nokogiri-1.12.4.gem) = 0eb79e072c21a25d0131e143b69a963944306438
 RMD160 (nokogiri-1.12.4.gem) = cc3550259ed66d0a2871622c102050eca6d497c2
 SHA512 (nokogiri-1.12.4.gem) = cc590261b4fb475cd34cebf7cfb94d3a673250487e6f3b25923cfc689bb055aab1e16b727388becf2a2f0236801053495e5caaf25cbcd9e849da56b365f20dcb
 Size (nokogiri-1.12.4.gem) = 9588736 bytes
+SHA1 (patch-ext_nokogiri_extconf.rb) = bed43fcfa1e984727d71da270768c29e7017a074
diff -r 06ed163cb7c0 -r 201d88ce950a textproc/ruby-nokogiri/patches/patch-ext_nokogiri_extconf.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/ruby-nokogiri/patches/patch-ext_nokogiri_extconf.rb      Sat Sep 18 08:05:09 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_nokogiri_extconf.rb,v 1.1 2021/09/18 08:05:09 taca Exp $
+
+Allow depending to mini_portile2 2.6.1 and later.
+
+--- ext/nokogiri/extconf.rb.orig       2021-09-18 07:53:47.719767565 +0000
++++ ext/nokogiri/extconf.rb
+@@ -14,7 +14,7 @@ RECOMMENDED_LIBXML_VERSION = "2.9.3"
+ 
+ # The gem version constraint in the Rakefile is not respected at install time.
+ # Keep this version in sync with the one in the Rakefile !
+-REQUIRED_MINI_PORTILE_VERSION = "~> 2.6.1"
++REQUIRED_MINI_PORTILE_VERSION = ">= 2.6.1"
+ REQUIRED_PKG_CONFIG_VERSION = "~> 1.1"
+ 
+ # Keep track of what versions of what libraries we build against



Home | Main Index | Thread Index | Old Index