From 1fd4798732899b1af772cd3f7e874f0a61f0594b Mon Sep 17 00:00:00 2001 From: tobtoht Date: Fri, 26 May 2023 00:07:35 +0200 Subject: [PATCH] depends: remove icu --- contrib/depends/packages/icu4c.mk | 27 --------------------------- contrib/depends/packages/packages.mk | 2 +- monero | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 contrib/depends/packages/icu4c.mk diff --git a/contrib/depends/packages/icu4c.mk b/contrib/depends/packages/icu4c.mk deleted file mode 100644 index bd990e3..0000000 --- a/contrib/depends/packages/icu4c.mk +++ /dev/null @@ -1,27 +0,0 @@ -package=icu4c -$(package)_version=73.1 -$(package)_download_path=https://github.com/unicode-org/icu/releases/download/release-73-1/ -$(package)_file_name=$(package)-73_1-src.tgz -$(package)_sha256_hash=a457431de164b4aa7eca00ed134d00dfbf88a77c6986a10ae7774fc076bb8c45 -$(package)_patches=icu-001-dont-build-static-dynamic-twice.patch - -define $(package)_set_vars - $(package)_build_opts=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION -fPIC -DENABLE_STATIC=YES -DPGKDATA_MODE=static" -endef - -define $(package)_config_cmds - patch -p1 < $($(package)_patch_dir)/icu-001-dont-build-static-dynamic-twice.patch && \ - mkdir builda &&\ - mkdir buildb &&\ - cd builda &&\ - sh ../source/runConfigureICU Linux &&\ - make &&\ - cd ../buildb &&\ - sh ../source/runConfigureICU MinGW --enable-static=yes --disable-shared --disable-layout --disable-layoutex --disable-tests --disable-tools --disable-samples --prefix=$(host_prefix) --with-cross-build=`pwd`/../builda &&\ - $(MAKE) $($(package)_build_opts) -endef - -define $(package)_stage_cmds - cd buildb &&\ - $(MAKE) $($(package)_build_opts) DESTDIR=$($(package)_staging_dir) install lib/* -endef diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index b4749d3..691bb61 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -7,7 +7,7 @@ linux_native_packages = darwin_packages := darwin_native_packages = darwin_sdk native_cctools native_libtapi native_clang -mingw32_packages = icu4c +mingw32_packages = mingw32_native_packages = qt_linux_packages := libxcb xcb_proto libXau xproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_cursor libxcb_util_wm freetype fontconfig qt diff --git a/monero b/monero index 4a7881a..bbebb16 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 4a7881a55606b41eb79509b33b0f291b64860922 +Subproject commit bbebb167879679703fd8f92970b336c25f4ee28c