[Libreoffice-commits] core.git: 2 commits - lingucomponent/source postprocess/CustomTarget_registry.mk solenv/bin

[David Tardon]

 lingucomponent/source/languageguessing/simpleguesser.cxx |    5 -----
 postprocess/CustomTarget_registry.mk                     |    1 +
 solenv/bin/modules/installer/ziplist.pm                  |    1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit cc96b2738b608782edffb4cc368d45255f31377b
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jun 15 20:00:03 2015 +0200

    I guess we can revert this "temporary check" now
    
    On the other side, it has been in the code for only 2 years, so who
    knows .-)
    
    Revert "libexttextcat: fix the --with-system case too..."
    
    This reverts commit a81f44c707c4df56e7b999fa3b656d7fa4543d1b.
    
    Change-Id: I4e02ebe971f8a838bf2a1630ed38d4408245bf37

diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx
index cf53244..a777cf3 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.cxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.cxx
@@ -119,12 +119,7 @@ vector<Guess> SimpleGuesser::GuessLanguage(const char* text)
 
     const char *guess_list = textcat_Classify(h, text, len);
 
-// FIXME just a temporary check until new version with renamed macros deployed
-#if EXTTEXTCAT_VERSION_MAJOR > 3 || (EXTTEXTCAT_VERSION_MAJOR == 3 && (EXTTEXTCAT_VERSION_MINOR > 4 || (EXTTEXTCAT_VERSION_MINOR == 4 && (EXTTEXTCAT_VERSION_MICRO >= 1))))
     if (strcmp(guess_list, TEXTCAT_RESULT_SHORT_STR) == 0)
-#else
-    if (strcmp(guess_list, _TEXTCAT_RESULT_SHORT) == 0)
-#endif
         return guesses;
 
     int current_pointer = 0;
commit 5a2010ddb4d604c289ad2d6b74b54c10bc87bafc
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jun 15 19:50:44 2015 +0200

    fix fingerprint path with system libextextcat
    
    We want the right path in instdir already. Setting it during
    installation is too late.
    
    Change-Id: I3f7045ce4b4d3cb1f0dfac1c4fcd036db847621d

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 35de59e..5681889 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -566,6 +566,7 @@ postprocess_main_SED := \
 	-e 's,$${STARTCENTER_INFO_URL},https://www.libreoffice.org/,g' \
 	-e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \
 	-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \
+	-e 's,$${SYSTEM_LIBEXTTEXTCAT_DATA},$(SYSTEM_LIBEXTTEXTCAT_DATA),g' \
 
 $(call gb_XcdTarget_get_target,main.xcd) : \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 9f31455..0c5eb2a 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -839,7 +839,6 @@ sub add_variables_to_allvariableshashref
     $variableshashref->{'PRODUCTMINOR'} = $localminor;
 
     $variableshashref->{'PRODUCTBUILDID'} = $installer::globals::buildid;
-    $variableshashref->{'SYSTEM_LIBEXTTEXTCAT_DATA'} = $ENV{'SYSTEM_LIBEXTTEXTCAT_DATA'} , if( defined $ENV{'SYSTEM_LIBEXTTEXTCAT_DATA'} && $ENV{'SYSTEM_LIBEXTTEXTCAT_DATA'} ne "" );
 }
 
 1;