Skip to content

Commit 5a1421c

Browse files
authored
Merge pull request dogecoin#3474 from patricklodder/1.15.0-remove-bip70-depends
depends: remove bip70-related artifacts
2 parents 6544cb0 + 886b0d5 commit 5a1421c

File tree

4 files changed

+9
-58
lines changed

4 files changed

+9
-58
lines changed

depends/packages/native_protobuf.mk

-25
This file was deleted.

depends/packages/packages.mk

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
packages:=boost openssl libevent zeromq
22
native_packages := native_ccache
33

4-
qt_native_packages = native_protobuf
5-
qt_packages = qrencode protobuf zlib
4+
qt_packages = qrencode zlib
65

76
qt_x86_64_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon
87
qt_i686_linux_packages:=$(qt_x86_64_linux_packages)

depends/packages/protobuf.mk

-29
This file was deleted.

depends/packages/qt.mk

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $(package)_download_path=http://download.qt.io/new_archive/qt/5.7/$($(package)_v
44
$(package)_suffix=opensource-src-$($(package)_version).tar.gz
55
$(package)_file_name=qtbase-$($(package)_suffix)
66
$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
7-
$(package)_dependencies=openssl zlib
7+
$(package)_dependencies=zlib
88
$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon
99
$(package)_build_subdir=qtbase
1010
$(package)_qt_libs=corelib network widgets gui plugins testlib printsupport
@@ -49,13 +49,16 @@ $(package)_config_opts += -no-iconv
4949
$(package)_config_opts += -no-kms
5050
$(package)_config_opts += -no-linuxfb
5151
$(package)_config_opts += -no-libjpeg
52+
$(package)_config_opts += -no-libproxy
5253
$(package)_config_opts += -no-libudev
5354
$(package)_config_opts += -no-mitshm
5455
$(package)_config_opts += -no-mtdev
5556
$(package)_config_opts += -no-pulseaudio
57+
$(package)_config_opts += -no-openssl
5658
$(package)_config_opts += -no-openvg
5759
$(package)_config_opts += -no-reduce-relocations
5860
$(package)_config_opts += -no-qml-debug
61+
$(package)_config_opts += -no-securetransport
5962
$(package)_config_opts += -no-sql-db2
6063
$(package)_config_opts += -no-sql-ibase
6164
$(package)_config_opts += -no-sql-oci
@@ -65,14 +68,14 @@ $(package)_config_opts += -no-sql-odbc
6568
$(package)_config_opts += -no-sql-psql
6669
$(package)_config_opts += -no-sql-sqlite
6770
$(package)_config_opts += -no-sql-sqlite2
71+
$(package)_config_opts += -no-system-proxies
6872
$(package)_config_opts += -no-use-gold-linker
6973
$(package)_config_opts += -no-xcb-xlib
7074
$(package)_config_opts += -no-xinput2
7175
$(package)_config_opts += -no-xrender
7276
$(package)_config_opts += -nomake examples
7377
$(package)_config_opts += -nomake tests
7478
$(package)_config_opts += -opensource
75-
$(package)_config_opts += -openssl-linked
7679
$(package)_config_opts += -optimized-qmake
7780
$(package)_config_opts += -pch
7881
$(package)_config_opts += -pkg-config
@@ -92,6 +95,7 @@ $(package)_config_opts += -no-feature-colordialog
9295
$(package)_config_opts += -no-feature-concurrent
9396
$(package)_config_opts += -no-feature-fontcombobox
9497
$(package)_config_opts += -no-feature-ftp
98+
$(package)_config_opts += -no-feature-http
9599
$(package)_config_opts += -no-feature-image_heuristic_mask
96100
$(package)_config_opts += -no-feature-imageformat_bmp
97101
$(package)_config_opts += -no-feature-imageformat_jpeg
@@ -100,6 +104,8 @@ $(package)_config_opts += -no-feature-imageformat_xbm
100104
$(package)_config_opts += -no-feature-keysequenceedit
101105
$(package)_config_opts += -no-feature-lcdnumber
102106
$(package)_config_opts += -no-feature-networkdiskcache
107+
$(package)_config_opts += -no-feature-networkproxy
108+
$(package)_config_opts += -no-feature-socks5
103109
$(package)_config_opts += -no-feature-style-windowsmobile
104110
$(package)_config_opts += -no-feature-style-windowsce
105111
$(package)_config_opts += -no-feature-syntaxhighlighter

0 commit comments

Comments
 (0)