Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Apr 2018 08:21:14 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r466399 - head/textproc/rubygem-charlock_holmes
Message-ID:  <201804040821.w348LEVf012628@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Apr  4 08:21:13 2018
New Revision: 466399
URL: https://svnweb.freebsd.org/changeset/ports/466399

Log:
  textproc/rubygem-charlock_holmes: unbreak with ICU 61
  
  transliterator.cpp:39:3: error: unknown type name 'StringEnumeration'; did you mean 'icu::StringEnumeration'?
    StringEnumeration *id_list;
    ^~~~~~~~~~~~~~~~~
    icu::StringEnumeration
  /usr/local/include/unicode/strenum.h:57:20: note: 'icu::StringEnumeration' declared here
  class U_COMMON_API StringEnumeration : public UObject {
                     ^
  transliterator.cpp:47:13: error: use of undeclared identifier 'Transliterator'; did you mean 'icu::Transliterator'?
    id_list = Transliterator::getAvailableIDs(status);
              ^~~~~~~~~~~~~~
              icu::Transliterator
  /usr/local/include/unicode/translit.h:243:18: note: 'icu::Transliterator' declared here
  class U_I18N_API Transliterator : public UObject {
                   ^
  transliterator.cpp:81:3: error: unknown type name 'Transliterator'; did you mean 'UTransliterator'?
    Transliterator *trans;
    ^~~~~~~~~~~~~~
    UTransliterator
  /usr/local/include/unicode/utrans.h:70:15: note: 'UTransliterator' declared here
  typedef void* UTransliterator;
                ^
  transliterator.cpp:86:3: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'?
    UnicodeString *u_txt;
    ^~~~~~~~~~~~~
    icu::UnicodeString
  /usr/local/include/unicode/unistr.h:286:20: note: 'icu::UnicodeString' declared here
  class U_COMMON_API UnicodeString : public Replaceable
                     ^
  transliterator.cpp:101:11: error: use of undeclared identifier 'Transliterator'; did you mean 'icu::Transliterator'?
    trans = Transliterator::createInstance(UnicodeString(id, id_len), UTRANS_FORWARD, p_error, status);
            ^~~~~~~~~~~~~~
            icu::Transliterator
  /usr/local/include/unicode/translit.h:243:18: note: 'icu::Transliterator' declared here
  class U_I18N_API Transliterator : public UObject {
                   ^
  transliterator.cpp:101:42: error: use of undeclared identifier 'UnicodeString'
    trans = Transliterator::createInstance(UnicodeString(id, id_len), UTRANS_FORWARD, p_error, status);
                                           ^
  transliterator.cpp:106:15: error: unknown type name 'UnicodeString'; did you mean 'icu::UnicodeString'?
    u_txt = new UnicodeString(txt, txt_len);
                ^~~~~~~~~~~~~
                icu::UnicodeString
  /usr/local/include/unicode/unistr.h:286:20: note: 'icu::UnicodeString' declared here
  class U_COMMON_API UnicodeString : public Replaceable
                     ^
  transliterator.cpp:107:8: error: member reference base type 'UTransliterator' (aka 'void *') is not a structure or union
    trans->transliterate(*u_txt);
    ~~~~~^ ~~~~~~~~~~~~~
  transliterator.cpp:108:3: error: no template named 'StringByteSink'; did you mean 'icu::StringByteSink'?
    StringByteSink<std::string> sink(&result);
    ^~~~~~~~~~~~~~
    icu::StringByteSink
  /usr/local/include/unicode/bytestream.h:232:7: note: 'icu::StringByteSink' declared here
  class StringByteSink : public ByteSink {
        ^
  
  https://ssl.icu-project.org/trac/changeset/40705
  
  PR:		227042
  Reported by:	antoine (via exp-run)
  Obtained from:	upstream

Modified:
  head/textproc/rubygem-charlock_holmes/Makefile   (contents, props changed)
  head/textproc/rubygem-charlock_holmes/distinfo   (contents, props changed)

Modified: head/textproc/rubygem-charlock_holmes/Makefile
==============================================================================
--- head/textproc/rubygem-charlock_holmes/Makefile	Wed Apr  4 08:20:59 2018	(r466398)
+++ head/textproc/rubygem-charlock_holmes/Makefile	Wed Apr  4 08:21:13 2018	(r466399)
@@ -6,6 +6,9 @@ PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
+PATCH_SITES=	https://github.com/brianmario/charlock_holmes/commit/
+PATCHFILES=	018be8532670.patch:-p1
+
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Gems for character encoding detection
 

Modified: head/textproc/rubygem-charlock_holmes/distinfo
==============================================================================
--- head/textproc/rubygem-charlock_holmes/distinfo	Wed Apr  4 08:20:59 2018	(r466398)
+++ head/textproc/rubygem-charlock_holmes/distinfo	Wed Apr  4 08:21:13 2018	(r466399)
@@ -1,3 +1,5 @@
 TIMESTAMP = 1504489308
 SHA256 (rubygem/charlock_holmes-0.7.5.gem) = 9e942575e702c96e3747f494756a72eee008a185d6c7ebd1049c4dd0b529b625
 SIZE (rubygem/charlock_holmes-0.7.5.gem) = 10752
+SHA256 (rubygem/018be8532670.patch) = f54871c047f27ad057720c1f3ef7578bb87edc2c9e5ee3623a3d26b9dde40f13
+SIZE (rubygem/018be8532670.patch) = 2324



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804040821.w348LEVf012628>