static_holmes 0.7.7 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e35947554b465d48dc970a60031dcca03df441bd829b4464dba2ecf0bc792bb
-  data.tar.gz: 4cdfaff28364c07fc96a0a77a62d2fb5dbccc130859a4268065084e5abdff449
+  metadata.gz: d44feed3f25dc6342272d68eda9bedda3b3e5fa7a8ddd3eceabd439391702991
+  data.tar.gz: 99a711e297e7082271707217b9b8d220a7299399b4a855294d2e08af4d53b96a
 SHA512:
-  metadata.gz: 3007aa5b2d53c6046dc65086cb74881ea10f48fda3de2c89a053a42a820f5045b20ce2b716ce9ac0d51f3e6b704a85e9659958cf70c9631e74593637dfbae486
-  data.tar.gz: 13ad7377a3525419518ef4c20ce6c4763a8fc9e8b5cabaa30495d5d79cb8bf0b239e2238a4dcea5bc181572cec4356be3c2d65bf599c440a74a9f398881a6ec5
+  metadata.gz: c943b95a7cab86ddc69d02231eb1273ade055263b3e7e8a20fc2d0671f1ea6d44dbbcf58697b9c5e7ec8e498643c5b067b8dc60d1a3cfb2388d12ab92a15cf99
+  data.tar.gz: 0be53f5049292086423382ac269586e5b381ec5f6bf27b13b52ca8a36129a2a7f398ceba77c7d42b4f52272faee15ab03ee1adf67b266fb000a3b3acc6f6b84b

data/ext/charlock_holmes/common.h

@@ -38,4 +38,19 @@ static inline VALUE charlock_new_str2(const char *str)
 #endif
 }
 
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern void Init_charlock_holmes();
+extern void _init_charlock_encoding_detector();
+extern void _init_charlock_converter();
+extern void _init_charlock_transliterator();
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

data/ext/charlock_holmes/converter.c

@@ -29,7 +29,7 @@ static VALUE rb_converter_convert(VALUE self, VALUE rb_txt, VALUE rb_src_enc, VA
 	if (status != U_BUFFER_OVERFLOW_ERROR) {
 		rb_raise(rb_eArgError, "%s", u_errorName(status));
 	}
-	out_buf = malloc(out_len);
+	out_buf = (char *) malloc(out_len);
 
 	// now do the actual conversion
 	status = U_ZERO_ERROR;

data/ext/charlock_holmes/encoding_detector.c

@@ -352,7 +352,7 @@ static VALUE rb_encdec__alloc(VALUE klass)
 	UErrorCode status = U_ZERO_ERROR;
 	VALUE obj;
 
-	detector = calloc(1, sizeof(charlock_detector_t));
+	detector = (charlock_detector_t *) calloc(1, sizeof(charlock_detector_t));
 	obj = Data_Wrap_Struct(klass, NULL, rb_encdec__free, (void *)detector);
 
 	detector->csd = ucsdet_open(&status);

data/ext/charlock_holmes/ext.c

@@ -1,9 +1,5 @@
 #include "common.h"
 
-extern void _init_charlock_encoding_detector();
-extern void _init_charlock_converter();
-extern void _init_charlock_transliterator();
-
 VALUE rb_mCharlockHolmes;
 
 void Init_charlock_holmes() {
@@ -12,4 +8,4 @@ void Init_charlock_holmes() {
 	_init_charlock_encoding_detector();
 	_init_charlock_converter();
 	_init_charlock_transliterator();
-}
+}

data/ext/charlock_holmes/extconf.rb

@@ -34,8 +34,6 @@ pkg_config("icu-i18n")
 pkg_config("icu-io")
 pkg_config("icu-uc")
 
-$CXXFLAGS << ' -std=c++11' unless $CXXFLAGS.include?("-std=")
-
 unless have_library 'icui18n' and have_header 'unicode/ucnv.h'
   STDERR.puts "\n\n"
   STDERR.puts "***************************************************************************************"
@@ -51,6 +49,32 @@ have_library 'icudata' or abort 'libicudata missing'
 $CFLAGS << ' -Wall -funroll-loops'
 $CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
 
+minimal_program = <<~SRC
+  #include <unicode/translit.h>
+  int main() { return 0; }
+SRC
+
+# Pass -x c++ to force gcc to compile the test program
+# as C++ (as it will end in .c by default).
+compile_options = +"-x c++"
+
+icu_requires_version_flag = checking_for("icu that requires explicit C++ version flag") do
+  !try_compile(minimal_program, compile_options)
+end
+
+if icu_requires_version_flag
+  abort "Cannot compile icu with your compiler: recent versions require C++17 support." unless %w[c++20 c++17 c++11 c++0x].any? do |std|
+    checking_for("icu that compiles with #{std} standard") do
+      flags = compile_options + " -std=#{std}"
+      if try_compile(minimal_program, flags)
+        $CPPFLAGS << flags
+
+        true
+      end
+    end
+  end
+end
+
 def libflag_to_filename(ldflag)
   case ldflag
   when /\A-l(.+)/
@@ -69,6 +93,21 @@ def resolve_static_library(libflag, dirs)
 end
 
 def substitute_static_libs(packages)
+  packages.each do |pkg|
+    unless pkg_config(pkg)
+      message = <<~MSG
+        Unable to run `pkg-config #{pkg}`.
+
+        Check that PKG_CONFIG_PATH includes #{pkg}.pc (or unset it if it's already set).
+
+        Current environment:
+        PKG_CONFIG_PATH=#{ENV['PKG_CONFIG_PATH']}
+      MSG
+
+      raise message
+    end
+  end
+
   # First, find all the -l<lib> flags added by pkg-config. We want to drop
   # these dynamically linked libraries and substitute them with the static libraries.
   libflags = packages.map do |pkg|
@@ -79,7 +118,7 @@ def substitute_static_libs(packages)
   # library paths given by the -L flag from pkg-config.
   lib_paths = packages.map do |pkg|
     include_path = pkg_config(pkg, 'libs-only-L')&.strip
-    include_path&.split(' ').map { |lib| lib.gsub(/^-L/, '') }
+    include_path&.split(' ')&.map { |lib| lib.gsub(/^-L/, '') }
   end.flatten.uniq
 
   # Drop the -l<lib> flags and add in the static libraries.

data/lib/charlock_holmes/version.rb

@@ -1,3 +1,3 @@
 module CharlockHolmes
-  VERSION = "0.7.7"
+  VERSION = "0.7.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: static_holmes
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.11
 platform: ruby
 authors:
 - Brian Lopez
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-23 00:00:00.000000000 Z
+date: 2024-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Character encoding detection, brought to you by ICU