Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (edd0786171dade1200f4142d9d2f4dcd533d9dfe)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (edd0786171dade1200f4142d9d2f4dcd533d9dfe)
  • Date: Mon, 28 Oct 2024 03:58:07 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

audio-players/mpd/HISTORY | 3 ++
audio-players/mpd/patches/icu-76.patch | 49
+++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+)

New commits:
commit edd0786171dade1200f4142d9d2f4dcd533d9dfe
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

audio-players/mpd: added patch to build with ICU 76

diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 57ddd85..2739348 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2024-10-27 Pavel Vinogradov <public AT sourcemage.org>
+ * patches/icu-76.patch: added to build with ICU 76
+
2024-07-06 Pavel Vinogradov <public AT sourcemage.org>
* patches/fmt-11.patch: added to build with fmt 11

diff --git a/audio-players/mpd/patches/icu-76.patch
b/audio-players/mpd/patches/icu-76.patch
new file mode 100644
index 0000000..f82fc4d
--- /dev/null
+++ b/audio-players/mpd/patches/icu-76.patch
@@ -0,0 +1,49 @@
+From 1a063fee7ec1077e248ff97ebf1f92c5c5941a67 Mon Sep 17 00:00:00 2001
+From: Michael Cho <michael AT michaelcho.dev>
+Date: Sat, 26 Oct 2024 10:29:53 -0400
+Subject: [PATCH] meson.build: support building with ICU 76
+
+ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer
+add `icu-uc` when linking to shared libraries. This results in failure:
+```
+src/lib/icu/libicu.a.p/Converter.cxx.o: undefined reference to symbol
'ucnv_fromUnicode_76'
+```
+
+[^1]:
https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56
+---
+ src/lib/icu/meson.build | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build
+index 3ecc0a517f..e6cf8cdcea 100644
+--- a/src/lib/icu/meson.build
++++ b/src/lib/icu/meson.build
+@@ -1,5 +1,7 @@
+-icu_dep = dependency('icu-i18n', version: '>= 50', required:
get_option('icu'))
+-conf.set('HAVE_ICU', icu_dep.found())
++icu_i18n_dep = dependency('icu-i18n', version: '>= 50', required:
get_option('icu'))
++icu_uc_dep = dependency('icu-uc', version: '>= 50', required:
get_option('icu'))
++have_icu = icu_i18n_dep.found() and icu_uc_dep.found()
++conf.set('HAVE_ICU', have_icu)
+
+ icu_sources = [
+ 'Canonicalize.cxx',
+@@ -13,7 +15,7 @@ if is_windows
+ endif
+
+ iconv_dep = []
+-if icu_dep.found()
++if have_icu
+ icu_sources += [
+ 'Init.cxx',
+ 'Util.cxx',
+@@ -31,7 +33,8 @@ icu = static_library(
+ icu_sources,
+ include_directories: inc,
+ dependencies: [
+- icu_dep,
++ icu_i18n_dep,
++ icu_uc_dep,
+ iconv_dep,
+ fmt_dep,
+ ],


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (edd0786171dade1200f4142d9d2f4dcd533d9dfe), Pavel Vinogradov, 10/27/2024

Archive powered by MHonArc 2.6.24.

Top of Page