package/vte: bump to version 0.66.2
- Switch to meson-package and so replace host-intltool dependency by TARGET_NLS_DEPENDENCIES: https://gitlab.gnome.org/GNOME/vte/-/issues/87 - Retrieve upstream hash - Switch license file to LGPL-3.0+:5e14529d42- Drop libxml2 dependency (not needed with meson) - Add uclibc or glibc dependency, upstream doesn't want to support musl: https://gitlab.gnome.org/GNOME/vte/-/issues/72 https://gitlab.gnome.org/GNOME/vte/-/issues/247 - Add optional icu dependency:9e4fbae2ca- Add optional libfribidi dependency:7d3704f1c5- Add optional systemd dependency:81bd158c24- Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine
Arnout Vandecappelle (Essensium/Mind)
parent
570ed7b822
commit
53c0c7dd01
@ -0,0 +1,54 @@
|
||||
From 91123bb5201156e3d3adbe24305488f5eea2c8d7 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@src.gnome.org>
|
||||
Date: Mon, 27 Sep 2021 22:46:47 +0200
|
||||
Subject: [PATCH] build: Fix build with kernel headers from linux < 4.13
|
||||
|
||||
We already support running with a kernel that doesn't support this
|
||||
ioctl, so let's also support building with one. Add the missing
|
||||
ioctl definition to missing.hh.
|
||||
|
||||
Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2514
|
||||
|
||||
[Retrieved from:
|
||||
https://gitlab.gnome.org/GNOME/vte/-/commit/91123bb5201156e3d3adbe24305488f5eea2c8d7]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/missing.hh | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/src/missing.hh b/src/missing.hh
|
||||
index e5a58727..7902e41e 100644
|
||||
--- a/src/missing.hh
|
||||
+++ b/src/missing.hh
|
||||
@@ -23,11 +23,14 @@
|
||||
#include <fcntl.h>
|
||||
|
||||
#ifdef __linux__
|
||||
+
|
||||
+#include <sys/ioctl.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#if defined(__mips__) || defined(__mips64__)
|
||||
#include <asm/sgidefs.h>
|
||||
#endif
|
||||
+
|
||||
#endif
|
||||
|
||||
/* NSIG isn't in POSIX, so if it doesn't exist use this here. See bug #759196 */
|
||||
@@ -128,4 +131,13 @@ char* strchrnul(char const* s,
|
||||
#define CLOSE_RANGE_CLOEXEC (1u << 2)
|
||||
#endif
|
||||
|
||||
+#if !defined(TIOCGPTPEER)
|
||||
+/* See linux commit 54ebbfb1603415d9953c150535850d30609ef077 */
|
||||
+#if defined(__sparc__)
|
||||
+#define TIOCGPTPEER _IOR('t', 137, int)
|
||||
+#else
|
||||
+#define TIOCGPTPEER _IOR('T', 0x41, int)
|
||||
+#endif
|
||||
+#endif /* !TIOCGPTPEER */
|
||||
+
|
||||
#endif /* __linux__ */
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
From e32dba1d5cf884959af5b2c0691db00c263ea048 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@src.gnome.org>
|
||||
Date: Mon, 27 Dec 2021 19:24:46 +0100
|
||||
Subject: [PATCH] build: Fix check for -fstack-protector* compiler support
|
||||
|
||||
Need to use has_link_argument() on some platforms.
|
||||
|
||||
Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2535
|
||||
|
||||
[Retrieved from:
|
||||
https://gitlab.gnome.org/GNOME/vte/-/commit/e32dba1d5cf884959af5b2c0691db00c263ea048]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
meson.build | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 93b7f376..381d5d58 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -461,8 +461,6 @@ compiler_flags_common = [
|
||||
'-fdiagnostics-show-option',
|
||||
'-fno-common',
|
||||
'-fno-semantic-interposition',
|
||||
- '-fstack-protector',
|
||||
- '-fstack-protector-strong',
|
||||
]
|
||||
|
||||
if enable_debug
|
||||
@@ -550,6 +548,10 @@ add_project_arguments(global_cxxflags, language: 'cpp')
|
||||
linker_flags = [
|
||||
['-Wl,-Bsymbolic', false,],
|
||||
['-Wl,-Bsymbolic-functions', get_option('_b_symbolic_functions'),],
|
||||
+
|
||||
+ # See issue vte#2535.
|
||||
+ ['-fstack-protector', false],
|
||||
+ ['-fstack-protector-strong', false],
|
||||
]
|
||||
|
||||
foreach flag: linker_flags
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -7,11 +7,11 @@ config BR2_PACKAGE_VTE
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
|
||||
BR2_PACKAGE_HAS_LIBGL
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_LIBGTK3
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
select BR2_PACKAGE_PCRE2
|
||||
help
|
||||
VTE is a library (libvte) implementing a terminal emulator
|
||||
@ -22,13 +22,14 @@ config BR2_PACKAGE_VTE
|
||||
|
||||
http://github.com/GNOME/vte
|
||||
|
||||
comment "vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8"
|
||||
comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 4.8"
|
||||
depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
|
||||
BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend"
|
||||
depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# Locally calculated
|
||||
sha256 a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3 vte-0.48.3.tar.xz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
# Hash from: http://ftp.gnome.org/pub/gnome/sources/vte/0.66/vte-0.66.2.sha256sum
|
||||
sha256 e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 vte-0.66.2.tar.xz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING.LGPL3
|
||||
|
||||
@ -4,26 +4,47 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
VTE_VERSION = 0.48.3
|
||||
VTE_VERSION_MAJOR = 0.66
|
||||
VTE_VERSION = $(VTE_VERSION_MAJOR).2
|
||||
VTE_SOURCE = vte-$(VTE_VERSION).tar.xz
|
||||
VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/0.48
|
||||
VTE_DEPENDENCIES = host-intltool host-pkgconf libgtk3 libxml2 pcre2
|
||||
VTE_LICENSE = LGPL-2.1+
|
||||
VTE_LICENSE_FILES = COPYING
|
||||
VTE_CONF_OPTS += --disable-vala
|
||||
VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR)
|
||||
VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES)
|
||||
VTE_LICENSE = LGPL-3.0+
|
||||
VTE_LICENSE_FILES = COPYING.LGPL3
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ICU),y)
|
||||
VTE_CONF_OPTS += -Dicu=true
|
||||
VTE_DEPENDENCIES += icu
|
||||
else
|
||||
VTE_CONF_OPTS += -Dicu=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
|
||||
VTE_CONF_OPTS += --enable-introspection
|
||||
VTE_DEPENDENCIES += gobject-introspection
|
||||
VTE_CONF_OPTS += -Dgir=true -Dvapi=true
|
||||
VTE_DEPENDENCIES += host-vala gobject-introspection
|
||||
else
|
||||
VTE_CONF_OPTS += --disable-introspection
|
||||
VTE_CONF_OPTS += -Dgir=false -Dvapi=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
VTE_CONF_OPTS += --with-gnutls
|
||||
VTE_CONF_OPTS += -Dgnutls=true
|
||||
VTE_DEPENDENCIES += gnutls
|
||||
else
|
||||
VTE_CONF_OPTS += --without-gnutls
|
||||
VTE_CONF_OPTS += -Dgnutls=false
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
|
||||
VTE_CONF_OPTS += -Dfribidi=true
|
||||
VTE_DEPENDENCIES += libfribidi
|
||||
else
|
||||
VTE_CONF_OPTS += -Dfribidi=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
VTE_CONF_OPTS += -D_systemd=true
|
||||
VTE_DEPENDENCIES += systemd
|
||||
else
|
||||
VTE_CONF_OPTS += -D_systemd=false
|
||||
endif
|
||||
|
||||
$(eval $(meson-package))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user