packages (RUBY_1_8): ruby/ruby-lib64.patch - update

glen glen at pld-linux.org
Tue Sep 27 01:13:18 CEST 2011


Author: glen                         Date: Mon Sep 26 23:13:18 2011 GMT
Module: packages                      Tag: RUBY_1_8
---- Log message:
- update

---- Files affected:
packages/ruby:
   ruby-lib64.patch (1.3 -> 1.3.2.1) 

---- Diffs:

================================================================
Index: packages/ruby/ruby-lib64.patch
diff -u packages/ruby/ruby-lib64.patch:1.3 packages/ruby/ruby-lib64.patch:1.3.2.1
--- packages/ruby/ruby-lib64.patch:1.3	Thu Feb 26 00:38:06 2009
+++ packages/ruby/ruby-lib64.patch	Tue Sep 27 01:13:13 2011
@@ -10,14 +10,14 @@
      XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
      EXEEXT=.x
 
---- ruby-1.8.7-p72/ext/tk/extconf.rb~	2009-02-26 01:29:16.000000000 +0200
-+++ ruby-1.8.7-p72/ext/tk/extconf.rb	2009-02-26 01:33:54.847015682 +0200
-@@ -182,7 +182,7 @@
+--- ruby-1.8.7-p352/ext/tk/extconf.rb~	2011-06-30 06:53:30.000000000 +0300
++++ ruby-1.8.7-p352/ext/tk/extconf.rb	2011-09-27 02:11:10.503467664 +0300
+@@ -1507,7 +1507,7 @@
  
  def find_X11(*opt_paths)
-   default_paths = 
--    [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib" ]
-+    [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib64", "/usr/X11R6/lib", "/usr/openwin/lib" ]
-   paths = opt_paths.compact.concat(default_paths)
-   st = find_library("X11", "XOpenDisplay", *paths)
-   unless st
+   defaults =
+-    [ "/usr/X11*/lib", "/usr/lib/X11*", "/usr/local/X11*", "/usr/openwin/lib" ]
++    [ "/usr/X11*/lib64", "/usr/X11*/lib", "/usr/lib/X11*", "/usr/local/X11*", "/usr/openwin/lib" ]
+   paths = []
+   opt_paths.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}
+   defaults.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby/ruby-lib64.patch?r1=1.3&r2=1.3.2.1&f=u



More information about the pld-cvs-commit mailing list