Merge pull request #1518 from wingtk/wip/nacho/icu-revert

Revert meson build system for icu and update to 76.1
wingtk · Jan 15, 2025 · a8f29ca · a8f29ca
2 parents 1bd8b58 + c126936
commit a8f29ca
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 797 deletions.
diff --git a/gvsbuild/patches/icu/COPYING b/gvsbuild/patches/icu/COPYING
diff --git a/gvsbuild/patches/icu/meson.build b/gvsbuild/patches/icu/meson.build
diff --git a/gvsbuild/patches/icu/pc-files-debug/icu-uc.pc b/gvsbuild/patches/icu/pc-files-debug/icu-uc.pc
@@ -0,0 +1,12 @@
+# On windows, the prefix is automagically build from the location of the .pc file
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: icu-uc
+Description: International Components for Unicode: Common and Data libraries
+Version: @version@
+
+Libs: -L${libdir} -licuucd -licudt
+Cflags: -I${includedir}/unicode
diff --git a/gvsbuild/patches/icu/pc-files/icu-uc.pc b/gvsbuild/patches/icu/pc-files/icu-uc.pc
@@ -0,0 +1,12 @@
+# On windows, the prefix is automagically build from the location of the .pc file
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: icu-uc
+Description: International Components for Unicode: Common and Data libraries
+Version: @version@
+
+Libs: -L${libdir} -licuuc -licudt
+Cflags: -I${includedir}/unicode
diff --git a/gvsbuild/patches/icu/source/common/meson.build b/gvsbuild/patches/icu/source/common/meson.build
diff --git a/gvsbuild/patches/icu/source/data/export_module.py b/gvsbuild/patches/icu/source/data/export_module.py
diff --git a/gvsbuild/patches/icu/source/data/meson.build b/gvsbuild/patches/icu/source/data/meson.build