[med-svn] [Git][med-team/fis-gtm][master] Do not seek for icu-config which is removed from libicu-dev

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / fis-gtm


Commits:
cfc792b3 by Andreas Tille at 2019-02-09T08:11:22Z
Do not seek for icu-config which is removed from libicu-dev

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/no_icu-config.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+fis-gtm (6.3-005-2) UNRELEASED; urgency=medium
+
+  * Do not seek for icu-config which is removed from libicu-dev
+    Closes: #921781
+
+ -- Andreas Tille <tille at debian.org>  Sat, 09 Feb 2019 08:26:38 +0100
+
 fis-gtm (6.3-005-1) unstable; urgency=medium
 
   * Update to fis-gtm V6.3-005


=====================================
debian/patches/no_icu-config.patch
=====================================
@@ -0,0 +1,54 @@
+Description: icu-config is deprecated upstream and was removed from the
+ Debian package since it breaks multi-arch (see bugs #898820 and #920900)
+ This is an attempt to get rid of icu-config and replace it by pkg-config
+Bug-Debian: https://bugs.debian.org/921781
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 09 Feb 2019 08:26:38 +0100
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -737,24 +737,7 @@ install(FILES ${scripts}
+   PERMISSIONS ${install_permissions_script}
+   )
+ 
+-find_program(ICUCONFIG NAMES icu-config)
+-if(ICUCONFIG)
+-  execute_process(
+-    COMMAND ${ICUCONFIG} --version
+-    OUTPUT_VARIABLE icu_version
+-    RESULT_VARIABLE icu_failed
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
+-  if(icu_failed)
+-    message(FATAL_ERROR "Command\n ${ICUCONFIG} --version\nfailed (${icu_failed}).")
+-  elseif("x${icu_version}" MATCHES "^x([0-9]+\\.[0-9]+)")
+-    set(gtm_icu_version "${CMAKE_MATCH_1}")
+-  else()
+-    message(FATAL_ERROR "Command\n ${ICUCONFIG} --version\nproduced unrecognized output:\n ${icu_version}")
+-  endif()
+-else()
+-  message(FATAL_ERROR "Unable to find 'icu-config'.  Set ICUCONFIG in CMake cache.")
+-endif()
++set(gtm_icu_version "0.29")
+ 
+ find_program(LOCALECFG NAMES locale)
+ if(LOCALECFG)
+--- a/sr_unix/gtmprofile.gtc
++++ b/sr_unix/gtmprofile.gtc
+@@ -74,12 +74,12 @@ if [ $gtm_dist != "$old_gtm_dist" ] ; th
+     if [ -f "$gtm_dist/libgtmutil.$tmp_gtm_shlib" ] ; then gtmroutines="$gtm_dist/libgtmutil.$tmp_gtm_shlib $gtm_dist"
+     else gtmroutines=$gtm_dist ; fi
+     export gtmroutines
+-    # Set $gtm_icu_version if icu-config is available - should be set before checking for UTF-8 mode
+-    if [ -z "$gtm_icu_version" -a -n "`which icu-config`" ] ; then
+-	gtm_icu_version=`icu-config --version | gtm_chset=M $gtm_dist/mumps -run %XCMD 'Read x Write $FNumber(x*$Select(+x>5:.1,1:1),"",1)'`
++    # Set $gtm_icu_version if icu-io is available - should be set before checking for UTF-8 mode
++    if [ -z "$gtm_icu_version" -a -n "`pkg-config --version icu-io`" ] ; then
++	gtm_icu_version=`pkg-config --version icu-io | gtm_chset=M $gtm_dist/mumps -run %XCMD 'Read x Write $FNumber(x*$Select(+x>5:.1,1:1),"",1)'`
+         export gtm_icu_version
+ 	# Add library path to LD_LIBRARY_PATH
+-	extendlibpath=`icu-config --libdir`
++	extendlibpath=`pkg-config --libs icu-io`
+ 	if [ "" = "$LD_LIBRARY_PATH" ]; then LD_LIBRARY_PATH="$extendlibpath"; else LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$extendlibpath";fi; export LD_LIBRARY_PATH
+ 	if [ "ibm" = "$arch" ]; then
+ 		if [ "" = "$LIBPATH" ]; then LIBPATH="$extendlibpath"; else LIBPATH="$LIBPATH:$extendlibpath";fi; export LIBPATH;


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 
 upstream_disable_autorelink
 upstream_donot_deploy_all_encryption_libs
+no_icu-config.patch



View it on GitLab: https://salsa.debian.org/med-team/fis-gtm/commit/cfc792b322e7371a08ef9308be80df6f89e82add

-- 
View it on GitLab: https://salsa.debian.org/med-team/fis-gtm/commit/cfc792b322e7371a08ef9308be80df6f89e82add
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190209/1d161cc3/attachment-0001.html>