depends: remove unneeded native dependencies

diff --git a/contrib/depends/packages/fontconfig.mk b/contrib/depends/packages/fontconfig.mk
index 27df9c29192817074ce1db3ffc728eea52041b7c..0e2dd90a627eb19d0a3198537273b49e947aeb3f 100644 (file)
--- a/contrib/depends/packages/fontconfig.mk
+++ b/contrib/depends/packages/fontconfig.mk
@@ -1,4 +1,4 @@
-package=native_fontconfig
+package=fontconfig
 $(package)_version=2.12.6
 $(package)_download_path=https://www.freedesktop.org/software/fontconfig/release/
 $(package)_file_name=fontconfig-$($(package)_version).tar.bz2

diff --git a/contrib/depends/packages/freetype.mk b/contrib/depends/packages/freetype.mk
index a9662dcf07adc00ee6cc9f220882f8a4da2d5b35..f286971912931f6b0466214de5bddace5f4149e6 100644 (file)
--- a/contrib/depends/packages/freetype.mk
+++ b/contrib/depends/packages/freetype.mk
@@ -1,4 +1,4 @@
-package=native_freetype
+package=freetype
 $(package)_version=2.11.0
 $(package)_download_path=https://download.savannah.gnu.org/releases/freetype
 $(package)_file_name=freetype-$($(package)_version).tar.xz

diff --git a/contrib/depends/packages/native_expat.mk b/contrib/depends/packages/native_expat.mk
deleted file mode 100644 (file)
index f19635b..0000000
--- a/contrib/depends/packages/native_expat.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-package=native_expat
-$(package)_version=2.4.8
-$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$($(package)_version))/
-$(package)_file_name=expat-$($(package)_version).tar.xz
-$(package)_sha256_hash=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25
-
-# -D_DEFAULT_SOURCE defines __USE_MISC, which exposes additional
-# definitions in endian.h, which are required for a working
-# endianess check in configure when building with -flto.
-define $(package)_set_vars
-  $(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples
-  $(package)_config_opts += --disable-dependency-tracking --enable-option-checking
-  $(package)_config_opts += --without-xmlwf --with-pic
-  $(package)_cppflags += -D_DEFAULT_SOURCE
-endef
-
-define $(package)_config_cmds
-  echo "$($(package)_autoconf)" && \
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf share lib/cmake lib/*.la
-endef
\ No newline at end of file

diff --git a/contrib/depends/packages/native_fontconfig.mk b/contrib/depends/packages/native_fontconfig.mk
deleted file mode 100644 (file)
index 184ef21..0000000
--- a/contrib/depends/packages/native_fontconfig.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-package=native_fontconfig
-$(package)_version=2.12.6
-$(package)_download_path=https://www.freedesktop.org/software/fontconfig/release/
-$(package)_file_name=fontconfig-$($(package)_version).tar.bz2
-$(package)_sha256_hash=cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
-$(package)_dependencies=native_freetype native_expat
-$(package)_patches=gperf_header_regen.patch
-
-define $(package)_set_vars
-  $(package)_config_opts=--disable-docs --disable-static --disable-libxml2 --disable-iconv
-  $(package)_config_opts += --disable-dependency-tracking --enable-option-checking
-endef
-
-define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/gperf_header_regen.patch
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf var lib/*.la
-endef

diff --git a/contrib/depends/packages/native_freetype.mk b/contrib/depends/packages/native_freetype.mk
deleted file mode 100644 (file)
index a9662dc..0000000
--- a/contrib/depends/packages/native_freetype.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-package=native_freetype
-$(package)_version=2.11.0
-$(package)_download_path=https://download.savannah.gnu.org/releases/freetype
-$(package)_file_name=freetype-$($(package)_version).tar.xz
-$(package)_sha256_hash=8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
-
-define $(package)_set_vars
-  $(package)_config_opts  = --without-zlib --without-png --without-harfbuzz --without-bzip2 --enable-static --disable-shared
-  $(package)_config_opts += --enable-option-checking --without-brotli
-  $(package)_config_opts += --with-pic
-endef
-
-define $(package)_config_cmds
-  printenv && \
-  echo "$($(package)_autoconf)" && \
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf share/man lib/*.la
-endef

diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
index f9ffce165bd9b7923da9af74496a2223dc87f147..502941ee608ede117bac5cada485b821f0e4c575 100644 (file)
--- a/contrib/depends/packages/packages.mk
+++ b/contrib/depends/packages/packages.mk
@@ -1,5 +1,5 @@
 packages := boost openssl libiconv ldns unbound qrencode zbar sodium polyseed hidapi protobuf libusb zlib libgpg-error libgcrypt expat libzip
-native_packages := native_expat native_libxcb native_xcb_proto native_libXau native_xproto native_freetype native_fontconfig native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_wm native_qt native_protobuf
+native_packages := native_libxcb native_xcb_proto native_libXau native_xproto native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_wm native_qt native_protobuf
 
 linux_packages := eudev liblzma libarchive libfuse libsquashfuse libappimage appimage_runtime
 linux_native_packages = native_patchelf

diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index 2aae432eea3dad4937b4f363fb7eb9e12b69842c..11418d1a42426dff7317abd0d574cc4295cc2c24 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -5,7 +5,7 @@ $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae
 $(package)_darwin_dependencies=native_cctools native_qt openssl
-$(package)_mingw32_dependencies=openssl native_cmake native_qt native_freetype native_fontconfig native_libxkbcommon
+$(package)_mingw32_dependencies=openssl native_cmake native_qt native_libxkbcommon
 $(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert

diff --git a/contrib/depends/patches/native_fontconfig/gperf_header_regen.patch b/contrib/depends/patches/native_fontconfig/gperf_header_regen.patch
deleted file mode 100644 (file)
index b1a70d5..0000000
--- a/contrib/depends/patches/native_fontconfig/gperf_header_regen.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 7b6eb33ecd88768b28c67ce5d2d68a7eed5936b6
-Author: fanquake <fanquake@gmail.com>
-Date:   Tue Aug 25 14:34:53 2020 +0800
-
-    Remove rule that causes inadvertent header regeneration
-
-    Otherwise the makefile will needlessly attempt to re-generate the
-    headers with gperf. This can be dropped once the upstream build is fixed.
-
-    See #10851.
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index f4626ad..4ae1b00 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -912,7 +912,7 @@
-       ' - > $@.tmp && \
-       mv -f $@.tmp fcobjshash.gperf && touch $@ || ( $(RM) $@.tmp && false )
-
--fcobjshash.h: Makefile fcobjshash.gperf
-+fcobjshash.h:
-       $(AM_V_GEN) $(GPERF) --pic -m 100 fcobjshash.gperf > $@.tmp && \
-       mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
-

diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index 89f5cf64b1192b0cf91564cd09b31476e7813bb5..b5cff5881f96a046877c9d5029b0940d902b14bd 100644 (file)
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -21,6 +21,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND ARCHITECTURE STREQUAL "x86_64")
   SET(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} /home/user/.guix-profile/)
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  # MWF libs
+  SET(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} /gnu/store/3hw9n6yl57lgv01ffi15nk3cj2rjk1km-mingw-w64-x86_64-winpthreads-10.0.0-10.0.0)
+endif()
+
 SET(ENV{PKG_CONFIG_PATH} @prefix@/lib/pkgconfig)
 
 # use CACHE here because we need to be able to override these later