This commit is contained in:
2022-10-04 00:13:59 +02:00
parent f6ee5dabfe
commit 950e84accd
7 changed files with 329 additions and 0 deletions

View File

@@ -0,0 +1,42 @@
From a62478c8e55bc6b1cd685f0c8c2094e1ed244c69 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Mon, 11 Mar 2019 20:52:53 +0200
Subject: [PATCH] build: Always install man page
It's already generated and shouldn't be thrown in the same pot as
full gtk-doc generation. It should be either a separate `man` option,
or just always installed.
---
docs/meson.build | 4 +++-
meson.build | 4 +---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/meson.build b/docs/meson.build
index b039cb631..2b1800be6 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,3 +1,5 @@
install_man('nautilus.1')
-subdir('reference')
+if get_option('docs')
+ subdir('reference')
+endif
diff --git a/meson.build b/meson.build
index 996360a62..50479f5f0 100644
--- a/meson.build
+++ b/meson.build
@@ -222,9 +222,7 @@ subdirs = [
# Conditional building #
########################
-if get_option('docs')
- subdirs += 'docs'
-endif
+subdirs += 'docs'
if get_option('tests') != 'none'
subdirs += 'test'
endif
--
2.17.0

View File

@@ -0,0 +1,57 @@
From 918ffe8e1be66f7451452431385095b4cc7e6801 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Thu, 19 Sep 2019 22:26:08 +0300
Subject: [PATCH] build: Optional gstreamer
---
extensions/meson.build | 4 +++-
meson.build | 2 ++
meson_options.txt | 6 ++++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/extensions/meson.build b/extensions/meson.build
index 46c7b0393..bcce4fbfe 100644
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -1,3 +1,5 @@
subdir('image-properties')
-subdir('audio-video-properties')
+if get_option('gstreamer')
+ subdir('audio-video-properties')
+endif
subdir('sendto')
diff --git a/meson.build b/meson.build
index e8b044490..10cf06fd6 100644
--- a/meson.build
+++ b/meson.build
@@ -99,8 +99,10 @@ libm = cc.find_library('m')
if get_option('extensions')
gexiv = dependency('gexiv2', version: '>= 0.14.0')
+ if get_option('gstreamer')
gst_tag_dep = dependency('gstreamer-tag-1.0')
gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
+ endif
endif
gio = dependency('gio-2.0', version: glib_ver)
gio_unix = dependency('gio-unix-2.0', version: glib_ver)
diff --git a/meson_options.txt b/meson_options.txt
index 6e781c4ef..9ad8d8196 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,6 +13,12 @@ option(
value: true,
description: 'Build stock extensions',
)
+option(
+ 'gstreamer',
+ type: 'boolean',
+ value: true,
+ description: 'Build audio-video properties extension (requires "extensions")',
+)
option(
'introspection',
type: 'boolean',
--
2.34.1

View File

@@ -0,0 +1,41 @@
From a62478c8e55bc6b1cd685f0c8c2094e1ed244c69 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Mon, 11 Mar 2019 20:52:53 +0200
Subject: [PATCH] build: Always install man page
It's already generated and shouldn't be thrown in the same pot as
full gtk-doc generation. It should be either a separate `man` option,
or just always installed.
---
docs/meson.build | 4 +++-
meson.build | 4 +---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/meson.build b/docs/meson.build
index b039cb631..2b1800be6 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,4 +1,5 @@
install_man('nautilus.1')
install_man('nautilus-autorun-software.1')
-
-subdir('reference')
+if get_option('docs')
+ subdir('reference')
+endif
diff --git a/meson.build b/meson.build
index 996360a62..50479f5f0 100644
--- a/meson.build
+++ b/meson.build
@@ -205,9 +205,8 @@ subdirs = [
# Conditional building #
########################
-if gi_docgen.found()
- subdirs += 'docs'
-endif
+subdirs += 'docs'
+
if get_option('tests') != 'none'
subdirs += 'test'
endif

View File

@@ -0,0 +1,30 @@
From 68b050ac0f60b1f02767276643cba8eb701f9884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
<leohdz172@protonmail.com>
Date: Fri, 30 Sep 2022 17:35:50 -0500
Subject: [PATCH] fix conflicting types for nautilus_file_get{u,g}id
when building with clang
---
src/nautilus-file.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nautilus-file.h b/src/nautilus-file.h
index 9b0613e98..57cca177f 100644
--- a/src/nautilus-file.h
+++ b/src/nautilus-file.h
@@ -244,9 +244,9 @@ gboolean nautilus_file_can_get_owner (Nautilu
gboolean nautilus_file_can_set_owner (NautilusFile *file);
gboolean nautilus_file_can_get_group (NautilusFile *file);
gboolean nautilus_file_can_set_group (NautilusFile *file);
-uid_t nautilus_file_get_uid (NautilusFile *file);
+const uid_t nautilus_file_get_uid (NautilusFile *file);
char * nautilus_file_get_owner_name (NautilusFile *file);
-gid_t nautilus_file_get_gid (NautilusFile *file);
+const gid_t nautilus_file_get_gid (NautilusFile *file);
char * nautilus_file_get_group_name (NautilusFile *file);
GList * nautilus_get_user_names (void);
GList * nautilus_get_all_group_names (void);
--
GitLab

View File

@@ -0,0 +1,42 @@
diff --git a/extensions/meson.build b/extensions/meson.build
index a10349c..5494275 100644
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -1,2 +1,4 @@
subdir('image-properties')
-subdir('audio-video-properties')
+if get_option('gstreamer')
+ subdir('audio-video-properties')
+endif
diff --git a/meson.build b/meson.build
index 00f01f6..bdbd33a 100644
--- a/meson.build
+++ b/meson.build
@@ -102,8 +102,10 @@ libm = cc.find_library('m')
if get_option('extensions')
gexiv = dependency('gexiv2', version: '>= 0.14.0')
gdkpixbuf = dependency('gdk-pixbuf-2.0', version: '>= 2.30.0')
+ if get_option('gstreamer')
gst_tag_dep = dependency('gstreamer-tag-1.0')
gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
+ endif
endif
gio = dependency('gio-2.0', version: glib_ver)
gio_unix = dependency('gio-unix-2.0', version: glib_ver)
diff --git a/meson_options.txt b/meson_options.txt
index fce5f16..1fa8f89 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,6 +13,12 @@ option(
value: true,
description: 'Build stock extensions',
)
+option(
+ 'gstreamer',
+ type: 'boolean',
+ value: true,
+ description: 'Build audio-video properties extension (requires "extensions")',
+)
option(
'introspection',
type: 'boolean',