From 39db2f962c5bf2071afb322fe2d9e1f99148d878 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 30 Aug 2023 15:48:55 +0300
Subject: Release version 65.1.0+9

Add support for relocatable install dropping redundant $regex.replace() call in buildfile.

Add *.dylib to .gitignore files.
---
 libicui18n/.gitignore     |  1 +
 libicui18n/manifest       |  2 +-
 libicuio/.gitignore       |  1 +
 libicuio/manifest         |  2 +-
 libicuuc/.gitignore       |  1 +
 libicuuc/libicu/buildfile | 18 +++---------------
 libicuuc/manifest         |  2 +-
 7 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/libicui18n/.gitignore b/libicui18n/.gitignore
index 3dcc22f..d4a1da2 100644
--- a/libicui18n/.gitignore
+++ b/libicui18n/.gitignore
@@ -13,6 +13,7 @@
 *.ifc
 *.so
 *.so.*
+*.dylib
 *.dll
 *.a
 *.lib
diff --git a/libicui18n/manifest b/libicui18n/manifest
index f840d6a..960ce80 100644
--- a/libicui18n/manifest
+++ b/libicui18n/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libicui18n
-version: 65.1.0+8
+version: 65.1.0+9
 upstream-version: 65.1
 project: icu
 summary: ICU high-level internationalization C/C++ library
diff --git a/libicuio/.gitignore b/libicuio/.gitignore
index 3dcc22f..d4a1da2 100644
--- a/libicuio/.gitignore
+++ b/libicuio/.gitignore
@@ -13,6 +13,7 @@
 *.ifc
 *.so
 *.so.*
+*.dylib
 *.dll
 *.a
 *.lib
diff --git a/libicuio/manifest b/libicuio/manifest
index da7275b..c4268b6 100644
--- a/libicuio/manifest
+++ b/libicuio/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libicuio
-version: 65.1.0+8
+version: 65.1.0+9
 upstream-version: 65.1
 project: icu
 summary: ICU input/output C/C++ library
diff --git a/libicuuc/.gitignore b/libicuuc/.gitignore
index 3dcc22f..d4a1da2 100644
--- a/libicuuc/.gitignore
+++ b/libicuuc/.gitignore
@@ -13,6 +13,7 @@
 *.ifc
 *.so
 *.so.*
+*.dylib
 *.dll
 *.a
 *.lib
diff --git a/libicuuc/libicu/buildfile b/libicuuc/libicu/buildfile
index ca8e05c..63a6287 100644
--- a/libicuuc/libicu/buildfile
+++ b/libicuuc/libicu/buildfile
@@ -27,6 +27,9 @@ windows = ($tclass == 'windows')
 
 # Build options.
 #
+# Note that we build without plugins support (UCONFIG_ENABLE_PLUGINS macro is
+# undefined) and thus we don't define the DEFAULT_ICU_PLUGINS macro either.
+#
 cc.poptions  += -DU_ATTRIBUTE_DEPRECATED=
 cxx.poptions += -DU_COMMON_IMPLEMENTATION
 
@@ -103,21 +106,6 @@ switch $c.class
   }
 }
 
-# If install.root is specified, then define the DEFAULT_ICU_PLUGINS macro when
-# compiling uc/icuplug.cpp and leave it undefined otherwise.
-#
-if ($install.root != [null])
-{
-  plugins_dir = $install.resolve($install.lib)/icu
-
-  # Escape backslashes and quotes in the directory path prior to representing
-  # it as C++ string literal.
-  #
-  pd = $regex.replace($plugins_dir, '(\\|")', '\\\1')
-
-  uc/obj{icuplug}: cxx.poptions += -DDEFAULT_ICU_PLUGINS="\"$pd\""
-}
-
 switch $tclass, $tsys
 {
   case 'linux'
diff --git a/libicuuc/manifest b/libicuuc/manifest
index 5350fe2..27e35a2 100644
--- a/libicuuc/manifest
+++ b/libicuuc/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libicuuc
-version: 65.1.0+8
+version: 65.1.0+9
 upstream-version: 65.1
 project: icu
 summary: ICU basic internationalization C/C++ library
-- 
cgit v1.1