From ce29170513a2554c0a0a1829f127172bd2c9a335 Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <cogitri@exherbo.org>
Date: Tue, 4 Sep 2018 22:06:38 +0200
Subject: [PATCH] nautilus: update to 3.30.0.

---
 .../nautilus/patches/no-introspection.patch   | 136 ------------------
 srcpkgs/nautilus/template                     |  25 ++--
 2 files changed, 10 insertions(+), 151 deletions(-)
 delete mode 100644 srcpkgs/nautilus/patches/no-introspection.patch

diff --git a/srcpkgs/nautilus/patches/no-introspection.patch b/srcpkgs/nautilus/patches/no-introspection.patch
deleted file mode 100644
index 915b31a6dfe..00000000000
--- a/srcpkgs/nautilus/patches/no-introspection.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-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',
- )
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index ea0974d4ee4..ea66647f74f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,31 +1,26 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.28.1
-revision=2
+version=3.30.0
+revision=1
 build_style=meson
-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
- libgexiv2-devel libnotify-devel tracker-devel"
+configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
+hostmakedepends="glib-devel libxslt pkg-config $(vopt_if gir 'gobject-introspection')"
+makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
+ libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
+ libX11-devel libxml2-devel tracker-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
 short_desc="The GNOME file manager"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="https://wiki.gnome.org/Nautilus"
+maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Nautilus"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9ce878fc9d9f950475c504066ce5f8e98a8cfbf15051724469e865ea85bab0a5
+checksum=267ccac6fa67784fd99de75b7337479758478ec31b34739185693dcd18331045
 
 build_options="gir"
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
-if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
-	CFLAGS="-Wno-error=format-nonliteral"
-fi
-
 libnautilus_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {