phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-11 04:12:36 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #5915

Browse source 
bb44d9e depends: fix a static qt5 crash when using certain versions of libxcb (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan 2015-03-17 08:00:50 +01:00
commit 5bd3a92da2
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 35 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
depends/packages/libxcb.mk
View file

@ -13,8 +13,13 @@ define $(package)_preprocess_cmds
sed "s/pthread-stubs//" -i configure sed "s/pthread-stubs//" -i configure
endef endef
# Don't install xcb headers to the default path in order to work around a qt
# build issue: https://bugreports.qt.io/browse/QTBUG-34748
# When using qt's internal libxcb, it may end up finding the real headers in
# depends staging. Use a non-default path to avoid that.
define $(package)_config_cmds define $(package)_config_cmds
$($(package)_autoconf) $($(package)_autoconf) --includedir=$(host_prefix)/include/xcb-shared
endef endef
define $(package)_build_cmds define $(package)_build_cmds

44
depends/patches/qt/fix-xcb-include-order.patch
View file

@ -1,21 +1,31 @@
--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2014-07-30 18:17:27.384458441 -0400 --- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-03-17 02:06:42.705930685 +0000
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2014-07-30 18:18:28.620459303 -0400 +++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-03-17 02:08:41.281926351 +0000
@@ -101,10 +101,6 @@ @@ -103,7 +103,6 @@
}
}
-DEFINES += $$QMAKE_DEFINES_XCB DEFINES += $$QMAKE_DEFINES_XCB
-LIBS += $$QMAKE_LIBS_XCB LIBS += $$QMAKE_LIBS_XCB
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
-
CONFIG += qpa/genericunixfontdatabase CONFIG += qpa/genericunixfontdatabase
contains(QT_CONFIG, dbus) { @@ -118,7 +117,8 @@
@@ -141,3 +137,7 @@ contains(QT_CONFIG, xcb-qt) {
INCLUDEPATH += ../../../3rdparty/xkbcommon/xkbcommon/ DEFINES += XCB_USE_RENDER
} XCB_DIR = ../../../3rdparty/xcb
} - INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude
+ + QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
+DEFINES += $$QMAKE_DEFINES_XCB + QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
+LIBS += $$QMAKE_LIBS_XCB LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static
+INCLUDEPATH += $$QMAKE_CFLAGS_XCB } else {
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr
--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:07:04.641929383 +0000
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:10:15.485922059 +0000
@@ -8,7 +8,7 @@
XCB_DIR = ../../../../3rdparty/xcb
-INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude
+QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
# ignore compiler warnings in 3rdparty code
QMAKE_CFLAGS_STATIC_LIB+=-w