mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
From 3b154996a27ede1c94cbc590e2db3858389d18c2 Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
Date: Tue, 12 Mar 2019 11:46:24 +0100
|
||||
Subject: [PATCH] Fix meson.build for meson 0.50.0.
|
||||
|
||||
Since meson 0.50.0 it is not possible anymore to specify an
|
||||
absolute directory for subdir. To keep current functionality,
|
||||
use install_dir instead.
|
||||
|
||||
atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path.
|
||||
|
||||
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
|
||||
Upstream: https://github.com/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
atspi/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/atspi/meson.build b/atspi/meson.build
|
||||
index 17bfc45..2e44ffd 100644
|
||||
--- a/atspi/meson.build
|
||||
+++ b/atspi/meson.build
|
||||
@@ -57,7 +57,7 @@ atspi_headers = [
|
||||
|
||||
atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
|
||||
|
||||
-install_headers(atspi_headers, subdir: atspi_includedir)
|
||||
+install_headers(atspi_headers, install_dir: atspi_includedir)
|
||||
|
||||
atspi_enums = gnome.mkenums('atspi-enum-types',
|
||||
sources: [ 'atspi-constants.h', 'atspi-types.h' ],
|
||||
--
|
||||
2.21.0
|
||||
|
||||
25
package/at-spi2-core/Config.in
Normal file
25
package/at-spi2-core/Config.in
Normal file
@@ -0,0 +1,25 @@
|
||||
config BR2_PACKAGE_AT_SPI2_CORE
|
||||
bool "at-spi2-core"
|
||||
depends on BR2_PACKAGE_XORG7 # xlib-libxtst
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2
|
||||
depends on BR2_USE_MMU # glib2
|
||||
depends on BR2_USE_WCHAR # glib2
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_XLIB_LIBXTST
|
||||
help
|
||||
The At-Spi2 Core package is a part of the GNOME
|
||||
Accessibility Project. It provides a Service Provider
|
||||
Interface for the Assistive Technologies available on the
|
||||
GNOME platform and a library against which applications
|
||||
can be linked.
|
||||
|
||||
https://wiki.gnome.org/Accessibility
|
||||
|
||||
comment "at-spi2-core needs a toolchain w/ wchar, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
comment "at-spi2-core depends on X.org"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_PACKAGE_XORG7
|
||||
3
package/at-spi2-core/at-spi2-core.hash
Normal file
3
package/at-spi2-core/at-spi2-core.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# locally calculated
|
||||
sha256 42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87 at-spi2-core-2.28.0.tar.xz
|
||||
sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING
|
||||
20
package/at-spi2-core/at-spi2-core.mk
Normal file
20
package/at-spi2-core/at-spi2-core.mk
Normal file
@@ -0,0 +1,20 @@
|
||||
################################################################################
|
||||
#
|
||||
# at-spi2-core
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AT_SPI2_CORE_VERSION_MAJOR = 2.28
|
||||
AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0
|
||||
AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz
|
||||
AT_SPI2_CORE_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR)
|
||||
AT_SPI2_CORE_LICENSE = LGPL-2.0+
|
||||
AT_SPI2_CORE_LICENSE_FILES = COPYING
|
||||
AT_SPI2_CORE_INSTALL_STAGING = YES
|
||||
AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon
|
||||
|
||||
AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
|
||||
|
||||
$(eval $(meson-package))
|
||||
Reference in New Issue
Block a user