nautilus: re-cross

This commit is contained in:
maxice8 2018-08-15 22:56:43 -03:00
parent 767b853b76
commit 3d2eb800fb
No known key found for this signature in database
GPG Key ID: 543B9D4F4299F06B
2 changed files with 140 additions and 6 deletions

View File

@ -0,0 +1,136 @@
Source: maxice8
Upstream: yes, this is adapted from upstream
Reason: allows compilation without using gobject-introspection to generate data
thus avoiding a cross-breaking dependency on gobject-introspection
--- libnautilus-extension/meson.build
+++ libnautilus-extension/meson.build
@@ -73,22 +73,24 @@ libnautilus_extension = shared_library(
install: true
)
-gnome.generate_gir(
- libnautilus_extension,
- extra_args: [
- '-DNAUTILUS_COMPILATION'
- ],
- sources: libnautilus_extension_sources,
- nsversion: '3.0',
- namespace: 'Nautilus',
- includes: [
- 'Gtk-3.0',
- 'Gio-2.0',
- 'GLib-2.0'
- ],
- header: 'nautilus-extension.h',
- install: true
-)
+if get_option('introspection')
+ gnome.generate_gir(
+ libnautilus_extension,
+ extra_args: [
+ '-DNAUTILUS_COMPILATION'
+ ],
+ sources: libnautilus_extension_sources,
+ nsversion: '3.0',
+ namespace: 'Nautilus',
+ includes: [
+ 'Gtk-3.0',
+ 'Gio-2.0',
+ 'GLib-2.0'
+ ],
+ header: 'nautilus-extension.h',
+ install: true
+ )
+endif
nautilus_extension = declare_dependency(
sources: libnautilus_extension_enums[1],
--- meson_options.txt
+++ meson_options.txt
@@ -1,16 +1,74 @@
-option('docs', type: 'boolean', value: false)
-option('profiling', type: 'boolean', value: false)
-option('extensions', type: 'boolean', value: true)
-option('packagekit', type: 'boolean', value: true)
-option('selinux', type: 'boolean', value: false)
-option('tests', type: 'combo', choices: ['none', 'headless', 'all'], value: 'headless')
+##############
+# Extensions #
+##############
option(
- 'profile',
+ 'docs',
+ type: 'boolean',
+ value: false,
+ description: 'Build documentation for extension library',
+)
+option(
+ 'extensions',
+ type: 'boolean',
+ value: true,
+ description: 'Build stock extensions',
+)
+option(
+ 'introspection',
+ type: 'boolean',
+ value: true,
+ description: 'Build GObject introspection data for extension library',
+)
+##################
+# End extensions #
+##################
+
+############
+# Features #
+############
+option(
+ 'packagekit',
+ type: 'boolean',
+ value: true,
+ description: 'Enable finding file type handlers using PackageKit',
+)
+option(
+ 'selinux',
+ type: 'boolean',
+ value: false,
+ description: 'Enable SELinux context support in file properties dialog',
+)
+################
+# End features #
+################
+
+###########
+# Testing #
+###########
+option(
+ 'profiling',
+ type: 'boolean',
+ value: false,
+ description: 'Enable performance profiling',
+)
+option(
+ 'tests',
type: 'combo',
choices: [
- 'default',
- 'stable-flatpak',
- 'development'
+ 'none',
+ 'headless',
+ 'all'
],
- value: 'default'
+ value: 'headless',
+ description: 'Build selected tests',
+)
+###############
+# End testing #
+###############
+
+option(
+ 'profile',
+ type: 'string',
+ value: '',
+ description: 'Build with specified application ID',
)

View File

@ -1,9 +1,10 @@
# Template file for 'nautilus'
pkgname=nautilus
version=3.28.1
revision=1
revision=2
build_style=meson
configure_args="-Denable-selinux=false -Denable-nst-extension=false"
configure_args="-Denable-selinux=false -Denable-nst-extension=false
-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="glib-devel intltool pkg-config
$(vopt_if gir 'gobject-introspection')"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel libexif-devel
@ -13,12 +14,9 @@ short_desc="The GNOME file manager"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="https://wiki.gnome.org/Nautilus"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=9ce878fc9d9f950475c504066ce5f8e98a8cfbf15051724469e865ea85bab0a5
# no meson option to disable gir, gobject-introspection nocross
nocross="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/5628/steps/shell_3/logs/stdio"
build_options="gir"
if [ -z "$CROSS_BUILD" ]; then
build_options_default="gir"