diff --git a/contrib/depends/packages/fontconfig.mk b/contrib/depends/packages/fontconfig.mk new file mode 100644 index 0000000..27df9c2 --- /dev/null +++ b/contrib/depends/packages/fontconfig.mk @@ -0,0 +1,32 @@ +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=freetype 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/freetype.mk b/contrib/depends/packages/freetype.mk new file mode 100644 index 0000000..a9662dc --- /dev/null +++ b/contrib/depends/packages/freetype.mk @@ -0,0 +1,29 @@ +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 8db6c5e..6e487c0 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -1,32 +1,19 @@ -native_packages := native_cmake -packages := boost openssl libiconv ldns unbound qrencode zbar sodium polyseed hidapi protobuf libusb zlib libgpg-error libgcrypt expat +packages := boost openssl libiconv ldns unbound qrencode zbar sodium polyseed hidapi protobuf libusb zlib libgpg-error libgcrypt expat libzip +native_packages := native_cmake 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 -hardware_packages := hidapi protobuf libusb -hardware_native_packages := native_protobuf +linux_packages := eudev liblzma libarchive libfuse libsquashfuse libappimage appimage_runtime +linux_native_packages = native_patchelf -linux_packages := eudev libzip liblzma libarchive libfuse libsquashfuse libappimage appimage_runtime -linux_native_packages = $(hardware_native_packages) native_patchelf +darwin_packages := +darwin_native_packages = native_cctools native_libtapi native_clang native_ds_store native_mac_alias -linux_native_packages += native_qt 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 +mingw32_packages = icu4c +mingw32_native_packages = -qt_linux_packages:=native_expat libxcb xcb_proto libXau xproto native_freetype native_fontconfig libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm qt -qt_darwin_packages=native_qt qt -qt_mingw32_packages=native_qt - -darwin_packages := libzip -darwin_native_packages = $(hardware_native_packages) native_ds_store native_mac_alias 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 +qt_linux_packages := libxcb xcb_proto libXau xproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm freetype fontconfig qt +qt_darwin_packages := qt +qt_mingw32_packages := qt tor_linux_packages := libevent tor_linux tor_darwin_packages := tor_darwin - -mingw32_packages = icu4c sodium $(hardware_packages) tor_mingw32 libzip qt -mingw32_native_packages = $(hardware_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 - -ifneq ($(build_os),darwin) -darwin_native_packages += native_cctools native_libtapi - -ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),) -darwin_native_packages+= native_clang -endif - -endif \ No newline at end of file +tor_mingw32_packages := tor_mingw32 \ No newline at end of file diff --git a/contrib/depends/patches/fontconfig/gperf_header_regen.patch b/contrib/depends/patches/fontconfig/gperf_header_regen.patch new file mode 100644 index 0000000..b1a70d5 --- /dev/null +++ b/contrib/depends/patches/fontconfig/gperf_header_regen.patch @@ -0,0 +1,24 @@ +commit 7b6eb33ecd88768b28c67ce5d2d68a7eed5936b6 +Author: fanquake +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 ) +