From d4d5c2e1a75b52c8bcdb35644b363eb26e78512b Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 30 Oct 2021 14:35:11 +1100 Subject: [PATCH 1/4] chrome-libxkbcommon: correct meson build options --- .../chrome-depends/chrome-libxkbcommon/package.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk index 3846dabfda..dc908c7c92 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk @@ -9,10 +9,6 @@ PKG_URL="" PKG_DEPENDS_UNPACK+=" libxkbcommon" PKG_BUILD_FLAGS="-sysroot" -PKG_MESON_OPTS_TARGET="${PKG_MESON_OPTS_TARGET} \ - -Denable-static=false \ - -Denable-shared=true" - unpack() { mkdir -p ${PKG_BUILD} tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD} From 6e2fb59d603965ac7990144e7fbcdec4ee2d4189 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 30 Oct 2021 14:40:08 +1100 Subject: [PATCH 2/4] at-spi2-core: correct meson build options --- .../addon-depends/chrome-depends/at-spi2-core/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk index 9d8fc38d4f..1e21886842 100644 --- a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk +++ b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk @@ -11,8 +11,8 @@ PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4} PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst" PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi." -PKG_MESON_OPTS_TARGET="-Denable_docs=false \ - -Denable-introspection=no \ +PKG_MESON_OPTS_TARGET="-Ddocs=false \ + -Dintrospection=no \ -Ddbus_daemon=/usr/bin/dbus-daemon" pre_configure_target() { From 95515831ac96d6690424f960c6fb4f2053ae1223 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 30 Oct 2021 15:09:03 +1100 Subject: [PATCH 3/4] pango: correct meson build options --- packages/addons/addon-depends/chrome-depends/pango/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/pango/package.mk b/packages/addons/addon-depends/chrome-depends/pango/package.mk index 683bdc0048..0648d8bcd1 100644 --- a/packages/addons/addon-depends/chrome-depends/pango/package.mk +++ b/packages/addons/addon-depends/chrome-depends/pango/package.mk @@ -14,5 +14,5 @@ PKG_LONGDESC="The Pango library for layout and rendering of internationalized te PKG_TOOLCHAIN="meson" PKG_BUILD_FLAGS="-sysroot" -PKG_MESON_OPTS_TARGET="-Denable_docs=false \ - -Dgir=false" +PKG_MESON_OPTS_TARGET="-Dgtk_doc=false \ + -Dintrospection=disabled" From 44f22cf4aac001a5a80968d58945806a14a22a56 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 30 Oct 2021 15:29:10 +1100 Subject: [PATCH 4/4] gdk-pixbuf: correct meson build options --- .../addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk index 406e71b500..0ab9015a2d 100644 --- a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk @@ -13,6 +13,6 @@ PKG_DEPENDS_CONFIG="shared-mime-info" PKG_LONGDESC="GdkPixbuf is a a GNOME library for image loading and manipulation." PKG_MESON_OPTS_TARGET="-Ddocs=false \ - -Dgir=false \ + -Dintrospection=disabled \ -Dman=false \ -Drelocatable=false"