charlock_holmes 0.7.6 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7500e422c42f6d71a4c5f9636aacd33b08b18e6b
-  data.tar.gz: e5b90461b236138f959f2f228c507ecab06f06da
+SHA256:
+  metadata.gz: 63323878cbd6ae16be524e46cd02c593003b954a26f8b381595fdd8e4355d651
+  data.tar.gz: 7f8a02a33b2d9c3d0e3800ff2728a9f95b7a2e07692b2ca01b44953ae9cb54ed
 SHA512:
-  metadata.gz: a29314ed7ad3d8afa68c461d08ef3b6cc09f73d590b35f90200ad93f675288890f40a0d24f7c4d54a8e99792891b58e76d36aa6e476a392b378182fb8dd32537
-  data.tar.gz: a12c6bc1823c037a6b7b2a2fba7f1531072fc192e5411aa14de8eda041a1e5e92057b81b6344d27fd44f8dc63d81fceb092b1b9ab407ae2c04a158dcd3f87958
+  metadata.gz: d1e8235025a81e5dd289e52bcf1696c86ceaa7f39e6fa627fb2625a24a613e86868247bf2caedd5e837b1aea1db73f2259031093c668710cdd7498fea9b93b65
+  data.tar.gz: 7e60283edcbd9795185ea95717407361e02ec7b98114759a32924217231439edb45048890e210d2bda7a5408559ab05d65af9df13569be4a3699858aa2b1fcf8

data/ext/charlock_holmes/extconf.rb

@@ -1,14 +1,5 @@
 require 'mkmf'
 
-CWD = File.expand_path(File.dirname(__FILE__))
-def sys(cmd)
-  puts "  -- #{cmd}"
-  unless ret = xsystem(cmd)
-    raise "#{cmd} failed, please report issue on https://github.com/brianmario/charlock_holmes"
-  end
-  ret
-end
-
 if `which make`.strip.empty?
   STDERR.puts "\n\n"
   STDERR.puts "***************************************************************************************"
@@ -21,27 +12,28 @@ end
 # ICU dependency
 #
 
-dir_config 'icu'
-
-rubyopt = ENV.delete("RUBYOPT")
-
-icuconfig = ""
-icu4c = "/usr"
-# detect homebrew installs
-if !have_library 'icui18n'
-  base = if !`which brew`.empty?
-    `brew --cellar`.strip
-  elsif File.exists?("/usr/local/Cellar/icu4c")
-    '/usr/local/Cellar'
-  end
-
-  if base and icu4c = Dir[File.join(base, 'icu4c/*')].sort.last
-    $INCFLAGS << " -I#{icu4c}/include "
-    $LDFLAGS  << " -L#{icu4c}/lib "
-    icuconfig = "#{icu4c}/bin/icu-config"
+ldflags = cppflags = nil
+
+if RbConfig::CONFIG["host_os"] =~ /darwin/
+  begin
+    brew_prefix = `brew --prefix icu4c`.chomp
+    ldflags   = "#{brew_prefix}/lib"
+    cppflags  = "#{brew_prefix}/include"
+    pkg_conf  = "#{brew_prefix}/lib/pkgconfig"
+    # pkg_config should be less error prone than parsing compiler
+    # commandline options, but we need to set default ldflags and cpp flags
+    # in case the user doesn't have pkg-config installed
+    ENV['PKG_CONFIG_PATH'] ||= pkg_conf
+  rescue
   end
 end
 
+dir_config 'icu', cppflags, ldflags
+
+pkg_config("icu-i18n")
+pkg_config("icu-io")
+pkg_config("icu-uc")
+
 unless have_library 'icui18n' and have_header 'unicode/ucnv.h'
   STDERR.puts "\n\n"
   STDERR.puts "***************************************************************************************"
@@ -54,14 +46,7 @@ have_library 'z' or abort 'libz missing'
 have_library 'icuuc' or abort 'libicuuc missing'
 have_library 'icudata' or abort 'libicudata missing'
 
-# icu4c might be built in C++11 mode, but it also might not have been
-icuconfig = `which icu-config`.chomp if icuconfig.empty?
-if File.exist?(icuconfig) && `#{icuconfig} --cxxflags`.include?("c++11")
-  $CXXFLAGS << ' -std=c++11'
-end
-
 $CFLAGS << ' -Wall -funroll-loops'
 $CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
 
-ENV['RUBYOPT'] = rubyopt
 create_makefile 'charlock_holmes/charlock_holmes'

data/lib/charlock_holmes/version.rb

@@ -1,3 +1,3 @@
 module CharlockHolmes
-  VERSION = "0.7.6"
+  VERSION = "0.7.8"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charlock_holmes
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.8
 platform: ruby
 authors:
 - Brian Lopez
 - Vicent Martí
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -75,7 +74,6 @@ homepage: https://github.com/brianmario/charlock_holmes
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -91,9 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Character encoding detection, brought to you by ICU
 test_files: []