gnome-desktop: update to 3.32.0.

This commit is contained in:
Rasmus Thomsen 2019-03-12 11:08:45 +01:00 committed by maxice8
parent 26dfc68665
commit bb89c523c6
2 changed files with 55 additions and 8 deletions

View file

@ -0,0 +1,47 @@
diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
index c365b44..33af6f4 100644
--- libgnome-desktop/meson.build
+++ libgnome-desktop/meson.build
@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
link_with: libgnome_desktop
)
-gnome.generate_gir(libgnome_desktop,
- sources: introspection_sources + libgnome_desktop_headers,
- export_packages: 'gnome-desktop-3.0',
- namespace: 'GnomeDesktop',
- nsversion: '3.0',
- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
- extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
- identifier_prefix: 'Gnome',
- symbol_prefix: 'gnome',
- install: true
-)
+if get_option('introspection')
+ gnome.generate_gir(libgnome_desktop,
+ sources: introspection_sources + libgnome_desktop_headers,
+ export_packages: 'gnome-desktop-3.0',
+ namespace: 'GnomeDesktop',
+ nsversion: '3.0',
+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+ extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
+ identifier_prefix: 'Gnome',
+ symbol_prefix: 'gnome',
+ install: true
+ )
+endif
desktop_pc = pkg.generate(
libraries: libgnome_desktop,
diff --git a/meson_options.txt b/meson_options.txt
index e3402a1..1dbaf5d 100644
--- meson_options.txt
+++ meson_options.txt
@@ -28,3 +28,7 @@ option('gtk_doc',
option('installed_tests',
type: 'boolean', value: false, description: 'Enable installed tests'
)
+
+option('introspection',
+ type: 'boolean', value: false, description: 'Build GIR data'
+)

View file

@ -1,21 +1,22 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
version=3.30.2.1
version=3.32.0
revision=1
build_style=gnu-configure
build_style=meson
build_helper="gir"
configure_args="--with-gnome-distributor=VoidLinux"
hostmakedepends="gnome-doc-utils intltool itstool pkg-config"
configure_args="-Dgnome-distributor=VoidLinux -Dudev=enabled
-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="itstool pkg-config glib-devel"
makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
libxkbfile-devel libXrandr-devel"
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
checksum=1b803ac6dbd844ff3fb0ad03ba0cbe22207e10363dafee43c1720eeaae2b491f
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=a6393dc5fc29fc0652ac84c73b3da205d0b0168128c4cf6d27797a08f3d07b54
build_options="gir"
case "$XBPS_TARGET_MACHINE" in
@ -34,7 +35,6 @@ gnome-desktop-devel_package() {
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
}
}