build: Add xkbcommon 0.8.4
Cherry-picked from: bitcoin/bitcoin 3272e34f and bitcoin/bitcoin cc25f892 and bitcoin/bitcoin a33381ac Conflicts resolved: - removed ci script and guix file changes that we don't have - removed changes to libxcb - squashed commits as cc25f892 was a fixup - rewrote the change to depends/README Co-authored-by: fanquake <fanquake@gmail.com> Co-authored-by: W. J. van der Laan <laanwj@protonmail.com>
This commit is contained in:
parent
0d0c5e5a7f
commit
557a921835
|
@ -40,7 +40,8 @@ MAX_VERSIONS = {
|
|||
'GCC': (4,4,0),
|
||||
'CXXABI': (1,3,3),
|
||||
'GLIBCXX': (3,4,13),
|
||||
'GLIBC': (2,11)
|
||||
'GLIBC': (2,11),
|
||||
'V': (0,5,0) # xkb (qt only)
|
||||
}
|
||||
# See here for a description of _IO_stdin_used:
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634261#109
|
||||
|
@ -66,6 +67,8 @@ b'ld-linux.so.2', # 32-bit dynamic linker
|
|||
b'libX11-xcb.so.1', # part of X11
|
||||
b'libX11.so.6', # part of X11
|
||||
b'libxcb.so.1', # part of X11
|
||||
b'libxkbcommon.so.0', # keyboard keymapping
|
||||
b'libxkbcommon-x11.so.0', # keyboard keymapping
|
||||
b'libfontconfig.so.1', # font support
|
||||
b'libfreetype.so.6', # font parsing
|
||||
b'libdl.so.2' # programming interface to dynamic linker
|
||||
|
@ -160,5 +163,3 @@ if __name__ == '__main__':
|
|||
retval = 1
|
||||
|
||||
exit(retval)
|
||||
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@ packages:
|
|||
- "libtool"
|
||||
- "automake"
|
||||
- "faketime"
|
||||
- "bison"
|
||||
- "bsdmainutils"
|
||||
- "ca-certificates"
|
||||
- "python"
|
||||
|
|
|
@ -9,7 +9,7 @@ work.
|
|||
|
||||
```
|
||||
sudo apt-get install autoconf automake binutils-gold ca-certificates curl \
|
||||
faketime git-core libtool pkg-config python
|
||||
faketime git-core libtool pkg-config python bison
|
||||
```
|
||||
|
||||
#### Generic linux: i686-pc-linux-gnu and x86_64-linux-gnu
|
||||
|
|
31
depends/packages/libxkbcommon.mk
Normal file
31
depends/packages/libxkbcommon.mk
Normal file
|
@ -0,0 +1,31 @@
|
|||
package=libxkbcommon
|
||||
$(package)_version=0.8.4
|
||||
$(package)_download_path=https://xkbcommon.org/download/
|
||||
$(package)_file_name=$(package)-$($(package)_version).tar.xz
|
||||
$(package)_sha256_hash=60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b
|
||||
$(package)_dependencies=libxcb
|
||||
|
||||
define $(package)_set_vars
|
||||
$(package)_config_opts = --enable-option-checking --disable-dependency-tracking
|
||||
$(package)_config_opts += --disable-static --disable-docs
|
||||
endef
|
||||
|
||||
define $(package)_preprocess_cmds
|
||||
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux
|
||||
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 lib/*.la
|
||||
endef
|
|
@ -4,7 +4,7 @@ native_packages := native_ccache
|
|||
qt_native_packages = native_protobuf
|
||||
qt_packages = qrencode protobuf zlib
|
||||
|
||||
qt_x86_64_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
|
||||
qt_x86_64_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans libxkbcommon
|
||||
qt_i686_linux_packages:=$(qt_x86_64_linux_packages)
|
||||
|
||||
qt_darwin_packages=qt
|
||||
|
|
|
@ -5,7 +5,7 @@ $(package)_suffix=opensource-src-$($(package)_version).tar.gz
|
|||
$(package)_file_name=qtbase-$($(package)_suffix)
|
||||
$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
|
||||
$(package)_dependencies=openssl zlib
|
||||
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
|
||||
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext libxkbcommon
|
||||
$(package)_build_subdir=qtbase
|
||||
$(package)_qt_libs=corelib network widgets gui plugins testlib printsupport
|
||||
$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
|
||||
|
@ -89,8 +89,7 @@ $(package)_config_opts_darwin += -device-option MAC_TARGET=$(host)
|
|||
$(package)_config_opts_darwin += -device-option MAC_LD64_VERSION=$(LD64_VERSION)
|
||||
endif
|
||||
|
||||
$(package)_config_opts_linux = -qt-xkbcommon
|
||||
$(package)_config_opts_linux += -qt-xcb
|
||||
$(package)_config_opts_linux = -qt-xcb
|
||||
$(package)_config_opts_linux += -system-freetype
|
||||
$(package)_config_opts_linux += -no-sm
|
||||
$(package)_config_opts_linux += -fontconfig
|
||||
|
|
Loading…
Reference in a new issue