sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libxkbcommon: update to 0.8.2

Browse Source
This commit is contained in:
Leonid Pliushch 2018-09-28 17:14:26 +03:00 committed by Yaksh Bariya
parent e3c127ebb2
commit 80b4d45273
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11-packages/libxkbcommon/build.sh
View File

@ -2,10 +2,9 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
TERMUX_PKG_HOMEPAGE=https://xkbcommon.org/ TERMUX_PKG_HOMEPAGE=https://xkbcommon.org/
TERMUX_PKG_DESCRIPTION="Keymap handling library for toolkits and window systems" TERMUX_PKG_DESCRIPTION="Keymap handling library for toolkits and window systems"
TERMUX_PKG_VERSION=0.8.0 TERMUX_PKG_VERSION=0.8.2
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=0683c42c7e39b8f68786eab9140461031c8f2dd9616442cf77770d2aea956e7d TERMUX_PKG_SHA256=fd19874aefbcbc9da751292ba7abee8952405cd7d9042466e41a9c6ed3046322
TERMUX_PKG_DEPENDS="libxcb, xkeyboard-config" TERMUX_PKG_DEPENDS="libxcb, xkeyboard-config"
TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros" TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"

32
x11-packages/libxkbcommon/no_tests.patch → x11-packages/libxkbcommon/disable_tests.patch
View File

@ -1,7 +1,7 @@
diff -uNr libxkbcommon-xkbcommon-0.8.0/meson.build libxkbcommon-xkbcommon-0.8.0.mod/meson.build diff -uNr libxkbcommon-xkbcommon-0.8.2/meson.build libxkbcommon-xkbcommon-0.8.2.mod/meson.build
--- libxkbcommon-xkbcommon-0.8.0/meson.build 2017-12-15 21:41:51.000000000 +0200 --- libxkbcommon-xkbcommon-0.8.2/meson.build 2018-08-05 08:55:39.000000000 +0300
+++ libxkbcommon-xkbcommon-0.8.0.mod/meson.build 2018-06-16 14:57:09.610121607 +0300 +++ libxkbcommon-xkbcommon-0.8.2.mod/meson.build 2018-09-28 17:13:05.819072368 +0300
@@ -261,193 +261,6 @@ @@ -263,205 +263,6 @@
) )
endif endif
@ -28,6 +28,16 @@ diff -uNr libxkbcommon-xkbcommon-0.8.0/meson.build libxkbcommon-xkbcommon-0.8.0.
- include_directories: include_directories('src'), - include_directories: include_directories('src'),
- link_with: libxkbcommon_test_internal, - link_with: libxkbcommon_test_internal,
-) -)
-if get_option('enable-x11')
- x11_test_dep = declare_dependency(
- link_with: libxkbcommon_x11_internal,
- dependencies: [
- test_dep,
- xcb_dep,
- xcb_xkb_dep,
- ],
- )
-endif
-test( -test(
- 'keysym', - 'keysym',
- executable('test-keysym', 'test/keysym.c', dependencies: test_dep), - executable('test-keysym', 'test/keysym.c', dependencies: test_dep),
@ -106,15 +116,20 @@ diff -uNr libxkbcommon-xkbcommon-0.8.0/meson.build libxkbcommon-xkbcommon-0.8.0.
-if get_option('enable-x11') -if get_option('enable-x11')
- test( - test(
- 'x11', - 'x11',
- executable('test-x11', 'test/x11.c', dependencies: test_dep, link_with: libxkbcommon_x11_internal), - executable('test-x11', 'test/x11.c', dependencies: x11_test_dep),
- env: test_env, - env: test_env,
- ) - )
- # test/x11comp is meant to be run, but it is (temporarily?) disabled. - # test/x11comp is meant to be run, but it is (temporarily?) disabled.
- # See: https://github.com/xkbcommon/libxkbcommon/issues/30 - # See: https://github.com/xkbcommon/libxkbcommon/issues/30
- executable('test-x11comp', 'test/x11comp.c', dependencies: test_dep, link_with: libxkbcommon_x11_internal) - executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
-endif -endif
- -
- -
-# Fuzzing target programs.
-executable('fuzz-keymap', 'fuzz/keymap/target.c', dependencies: test_dep)
-executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
-
-
-# Demo programs. -# Demo programs.
-executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep) -executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep)
-executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep) -executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep)
@ -122,7 +137,7 @@ diff -uNr libxkbcommon-xkbcommon-0.8.0/meson.build libxkbcommon-xkbcommon-0.8.0.
- executable('interactive-evdev', 'test/interactive-evdev.c', dependencies: test_dep) - executable('interactive-evdev', 'test/interactive-evdev.c', dependencies: test_dep)
-endif -endif
-if get_option('enable-x11') -if get_option('enable-x11')
- executable('interactive-x11', 'test/interactive-x11.c', dependencies: test_dep, link_with: libxkbcommon_x11_internal) - executable('interactive-x11', 'test/interactive-x11.c', dependencies: x11_test_dep)
-endif -endif
-if get_option('enable-wayland') -if get_option('enable-wayland')
- wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) - wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false)
@ -155,13 +170,10 @@ diff -uNr libxkbcommon-xkbcommon-0.8.0/meson.build libxkbcommon-xkbcommon-0.8.0.
- -
- -
-# Benchmarks. -# Benchmarks.
-# For clock_gettime, on some systems.
-rt_dep = cc.find_library('rt', required: false)
-libxkbcommon_bench_internal = static_library( -libxkbcommon_bench_internal = static_library(
- 'xkbcommon-bench-internal', - 'xkbcommon-bench-internal',
- 'bench/bench.c', - 'bench/bench.c',
- 'bench/bench.h', - 'bench/bench.h',
- dependencies: rt_dep,
- link_with: libxkbcommon_test_internal, - link_with: libxkbcommon_test_internal,
-) -)
-bench_dep = declare_dependency( -bench_dep = declare_dependency(