Removed upstreamed and updated alot of packages
This commit is contained in:
@@ -1,2 +0,0 @@
|
||||
DIST gnome-shell-105051d4a12b7652ece8636a8975bc8bb00399e0.tar.gz 3416483 BLAKE2B 29bf46e721fc54d6bd4a7e880990d499f082bd9becc14d2f98e113a456dc346de1d9268f2c552abeb223a95a53bccc9079114821c74cee3362eac85b15551448 SHA512 9f8018df532ae9d2594033322e32380f0d9ceb65bfe9c4b41c3763b9b8746d62dd10db0cc7e84e50a52de9640b242a49b70e7025e19cf03e1c8ccd1860cce400
|
||||
DIST libgnome-volume-control-7a621180b46421e356b33972e3446775a504139c.tar.gz 46399 BLAKE2B 4971253c3c24d923b64a3bad0b59dde9784bb79faa46720eaf37106fe2d860e46ae12eadc69324af50f7ea1242139d0daf63790720dfcf29a209947081c42f91 SHA512 3b67988c20c0728458a1b74658d07cb1856d149c44a951f0fdeff03da792cd428ac85f1ff6434778c56602374a00f6a040fd215a8bc0d018b033066037a4750f
|
||||
@@ -1,28 +0,0 @@
|
||||
From 1179f970e4b165ac6daf22d0e3b61df4879f3438 Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
||||
Date: Tue, 10 Dec 2013 23:33:51 +0100
|
||||
Subject: [PATCH 1/2] Alter list of default applications
|
||||
|
||||
Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
|
||||
[Updated to include desktop file renames to reverse DNS and 3.36 changes]
|
||||
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
|
||||
---
|
||||
data/org.gnome.shell.gschema.xml.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
|
||||
index cd6a2356d..6200df11c 100644
|
||||
--- a/data/org.gnome.shell.gschema.xml.in
|
||||
+++ b/data/org.gnome.shell.gschema.xml.in
|
||||
@@ -50,7 +50,7 @@
|
||||
</description>
|
||||
</key>
|
||||
<key name="favorite-apps" type="as">
|
||||
- <default>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
|
||||
+ <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
|
||||
<summary>List of desktop file IDs for favorite applications</summary>
|
||||
<description>
|
||||
The applications corresponding to these identifiers
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
|
||||
From: Mart Raudsepp <leio@gentoo.org>
|
||||
Date: Thu, 28 Feb 2019 00:50:19 +0200
|
||||
Subject: [PATCH] build: Make bluetooth support optional
|
||||
|
||||
---
|
||||
js/misc/meson.build | 2 +-
|
||||
meson.build | 7 ++++++-
|
||||
meson_options.txt | 6 ++++++
|
||||
3 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/js/misc/meson.build b/js/misc/meson.build
|
||||
index 582562711..ec9c62645 100644
|
||||
--- a/js/misc/meson.build
|
||||
+++ b/js/misc/meson.build
|
||||
@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
|
||||
jsconf.set('PACKAGE_VERSION', meson.project_version())
|
||||
jsconf.set('GETTEXT_PACKAGE', meson.project_name())
|
||||
jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
|
||||
-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
|
||||
+jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
|
||||
jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
|
||||
jsconf.set10('HAVE_SOUP2', have_soup2)
|
||||
jsconf.set('datadir', datadir)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 8d7478f9b..79d340840 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
|
||||
schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
|
||||
gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req)
|
||||
|
||||
-bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
|
||||
+if get_option('bluetooth')
|
||||
+ bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
|
||||
+ have_bluetooth = true
|
||||
+else
|
||||
+ have_bluetooth = false
|
||||
+endif
|
||||
gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
|
||||
gst_base_dep = dependency('gstreamer-base-1.0', required: false)
|
||||
pipewire_dep = dependency('libpipewire-0.3', required: false)
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index f0f2ecf6c..85fc58ea4 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -1,3 +1,9 @@
|
||||
+option('bluetooth',
|
||||
+ type: 'boolean',
|
||||
+ value: true,
|
||||
+ description: 'Enable bluetooth support'
|
||||
+)
|
||||
+
|
||||
option('extensions_tool',
|
||||
type: 'boolean',
|
||||
value: true,
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,197 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
PYTHON_COMPAT=( python3_{8..11} )
|
||||
|
||||
inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
|
||||
|
||||
COMMIT="105051d4a12b7652ece8636a8975bc8bb00399e0"
|
||||
LVC_COMMIT="7a621180b46421e356b33972e3446775a504139c"
|
||||
|
||||
DESCRIPTION="Provides core UI functions for the GNOME desktop, this is a special version for mobile devices"
|
||||
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell"
|
||||
SRC_URI="
|
||||
https://gitlab.gnome.org/verdre/gnome-shell/-/archive/${COMMIT}/gnome-shell-${COMMIT}.tar.gz
|
||||
https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${LVC_COMMIT}/libgnome-volume-control-${LVC_COMMIT}.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2+"
|
||||
SLOT="0"
|
||||
IUSE="elogind gtk-doc +ibus +networkmanager systemd test +mobile"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
?? ( elogind systemd )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
KEYWORDS="~arm ~arm64"
|
||||
|
||||
# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
|
||||
DEPEND="
|
||||
>=gnome-extra/evolution-data-server-3.33.1:=
|
||||
>=app-crypt/gcr-3.90.0:4=[introspection]
|
||||
>=dev-libs/glib-2.68:2
|
||||
>=dev-libs/gobject-introspection-1.49.1:=
|
||||
>=dev-libs/gjs-1.73.1[cairo]
|
||||
>=x11-libs/gtk+-3.15.0:3[introspection]
|
||||
>=x11-wm/mutter-43.0:0/11[introspection,test?]
|
||||
>=sys-auth/polkit-0.120_p20220509[introspection]
|
||||
>=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
|
||||
>=x11-libs/startup-notification-0.11
|
||||
>=app-i18n/ibus-1.5.19
|
||||
>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
|
||||
networkmanager? (
|
||||
>=net-misc/networkmanager-1.10.4[introspection]
|
||||
net-libs/libnma[introspection]
|
||||
>=app-crypt/libsecret-0.18
|
||||
dev-libs/dbus-glib
|
||||
)
|
||||
systemd? (
|
||||
>=sys-apps/systemd-242:=
|
||||
>=gnome-base/gnome-desktop-3.34.2:3=[systemd]
|
||||
)
|
||||
elogind? ( >=sys-auth/elogind-237 )
|
||||
|
||||
app-arch/gnome-autoar
|
||||
dev-libs/json-glib
|
||||
|
||||
>=app-accessibility/at-spi2-atk-2.5.3:2
|
||||
x11-libs/gdk-pixbuf:2[introspection]
|
||||
dev-libs/libxml2:2
|
||||
x11-libs/libX11
|
||||
|
||||
>=media-libs/libpulse-2[glib]
|
||||
>=dev-libs/atk-2[introspection]
|
||||
dev-libs/libical:=
|
||||
>=x11-libs/libXfixes-5.0
|
||||
|
||||
gui-libs/gtk:4[introspection]
|
||||
dev-lang/sassc
|
||||
|
||||
${PYTHON_DEPS}
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
')
|
||||
media-libs/mesa[X(+)]
|
||||
"
|
||||
# Runtime-only deps are probably incomplete and approximate.
|
||||
# Introspection deps generated from inspection of the output of:
|
||||
# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
|
||||
# or
|
||||
# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
|
||||
# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
|
||||
# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
|
||||
# Each block:
|
||||
# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
|
||||
# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
|
||||
# 3. Control shell settings
|
||||
# 4. xdg-utils needed for xdg-open, used by extension tool
|
||||
# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
|
||||
# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
|
||||
# 7. IBus is needed for nls integration
|
||||
# 8. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
|
||||
# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
|
||||
# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
|
||||
RDEPEND="${DEPEND}
|
||||
>=sys-apps/accountsservice-0.6.14[introspection]
|
||||
app-accessibility/at-spi2-core:2[introspection]
|
||||
app-misc/geoclue[introspection]
|
||||
media-libs/graphene[introspection]
|
||||
x11-libs/pango[introspection]
|
||||
net-libs/libsoup:3.0[introspection]
|
||||
>=sys-power/upower-0.99:=[introspection]
|
||||
gnome-base/librsvg:2[introspection]
|
||||
|
||||
>=gnome-base/gnome-session-2.91.91
|
||||
>=gnome-base/gnome-settings-daemon-3.8.3
|
||||
|
||||
x11-misc/xdg-utils
|
||||
|
||||
>=x11-themes/adwaita-icon-theme-3.26
|
||||
|
||||
networkmanager? (
|
||||
net-misc/mobile-broadband-provider-info
|
||||
sys-libs/timezone-data
|
||||
)
|
||||
ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
|
||||
media-fonts/cantarell
|
||||
|
||||
sys-apps/xdg-desktop-portal-gnome
|
||||
"
|
||||
# avoid circular dependency, see bug #546134
|
||||
PDEPEND="
|
||||
>=gnome-base/gdm-3.5[introspection(+)]
|
||||
>=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
|
||||
"
|
||||
BDEPEND="
|
||||
dev-libs/libxslt
|
||||
>=dev-util/gdbus-codegen-2.45.3
|
||||
dev-util/glib-utils
|
||||
gtk-doc? ( >=dev-util/gtk-doc-1.17
|
||||
app-text/docbook-xml-dtd:4.5 )
|
||||
>=sys-devel/gettext-0.19.8
|
||||
virtual/pkgconfig
|
||||
test? ( x11-wm/mutter[test] )
|
||||
"
|
||||
# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
|
||||
# dev-lang/sassc
|
||||
# app-text/asciidoc
|
||||
|
||||
PATCHES=(
|
||||
# Change favorites defaults, bug #479918
|
||||
"${FILESDIR}"/40.0-defaults.patch
|
||||
)
|
||||
|
||||
S="${WORKDIR}/gnome-shell-${COMMIT}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
rm -r "${S}"/subprojects/gvc || die
|
||||
mv "${WORKDIR}"/libgnome-volume-control-"${LVC_COMMIT}" "${S}"/subprojects/gvc || die
|
||||
|
||||
xdg_environment_reset
|
||||
# Hack in correct python shebang
|
||||
sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-Dextensions_tool=true
|
||||
-Dextensions_app=true
|
||||
$(meson_use gtk-doc gtk_doc)
|
||||
-Dman=true
|
||||
$(meson_use test tests)
|
||||
$(meson_use networkmanager)
|
||||
$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
|
||||
# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
|
||||
# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
|
||||
-Dsoup2=false
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
|
||||
virtx meson_src_test
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
gnome2_schemas_update
|
||||
|
||||
if ! has_version "media-libs/mesa[llvm]"; then
|
||||
elog "llvmpipe is used as fallback when no 3D acceleration"
|
||||
elog "is available. You will need to enable llvm USE for"
|
||||
elog "media-libs/mesa if you do not have hardware 3D setup."
|
||||
fi
|
||||
|
||||
optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
|
||||
optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
|
||||
optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
|
||||
optfeature "Weather support" dev-libs/libgweather:4[introspection]
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
|
||||
DIST nautilus-43.0.tar.xz 3165200 BLAKE2B 460df75af37c1c038bbbc9442d061a45ef3fbf09b2af016cd8340674c6eddf59b37a92011cf6e46d84168c859d4cd543d95fe140b322a00e2866bfdf5421a909 SHA512 c880125c2339be02852470e45cd4d589470e0df7723acc44b80df35c18cb1375c5f85cb46c7e53efbab1b51eedb4fd51ffa455773d4913d44c59070dafa22b49
|
||||
@@ -1,42 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
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
|
||||
@@ -1,30 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
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',
|
||||
@@ -1,115 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
|
||||
|
||||
DESCRIPTION="Default file manager for the GNOME desktop"
|
||||
HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
|
||||
|
||||
LICENSE="GPL-3+ LGPL-2.1+"
|
||||
SLOT="0"
|
||||
IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
|
||||
|
||||
KEYWORDS="~amd64 ~arm64"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/glib-2.72.0:2
|
||||
>=media-libs/gexiv2-0.14.0
|
||||
>=x11-libs/gdk-pixbuf-2.30.0:2
|
||||
gstreamer? ( media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0 )
|
||||
>=app-arch/gnome-autoar-0.4.0
|
||||
>=gnome-base/gnome-desktop-43:4=
|
||||
>=gnome-base/gsettings-desktop-schemas-42
|
||||
>=gui-libs/gtk-4.7.2:4[X,introspection?]
|
||||
>=gui-libs/libadwaita-1.2:1
|
||||
>=dev-libs/libportal-0.5:=[gtk]
|
||||
>=x11-libs/pango-1.28.3
|
||||
selinux? ( >=sys-libs/libselinux-2.0 )
|
||||
>=app-misc/tracker-3.0:3
|
||||
>=dev-libs/libxml2-2.7.8:2
|
||||
>=net-libs/libcloudproviders-0.3.1
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
>=app-misc/tracker-miners-3.0:3=
|
||||
" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
|
||||
BDEPEND="
|
||||
>=dev-util/gdbus-codegen-2.51.2
|
||||
dev-util/glib-utils
|
||||
gtk-doc? (
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
dev-util/gi-docgen
|
||||
)
|
||||
>=sys-devel/gettext-0.19.8
|
||||
virtual/pkgconfig
|
||||
"
|
||||
PDEPEND="
|
||||
gnome? ( x11-themes/adwaita-icon-theme )
|
||||
previewer? ( >=gnome-extra/sushi-0.1.9 )
|
||||
sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
|
||||
>=gnome-base/gvfs-1.14[gtk(+)]
|
||||
" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/43.0-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
|
||||
"${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
|
||||
"${FILESDIR}"/43.0-fix-clang-build.patch # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/996
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
xdg_environment_reset
|
||||
|
||||
if use previewer; then
|
||||
DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
|
||||
To activate the previewer, select a file and press space; to
|
||||
close the previewer, press space again."
|
||||
fi
|
||||
|
||||
# Disable test-nautilus-search-engine-tracker; bug #831170
|
||||
sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
$(meson_use gtk-doc docs)
|
||||
-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
|
||||
$(meson_use gstreamer) # gstreamer audio-video-properties extension
|
||||
$(meson_use introspection)
|
||||
-Dpackagekit=false
|
||||
$(meson_use selinux)
|
||||
-Dprofiling=false
|
||||
-Dtests=$(usex test all none)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
use previewer && readme.gentoo_create_doc
|
||||
meson_src_install
|
||||
}
|
||||
|
||||
src_test() {
|
||||
gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
|
||||
# TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
|
||||
virtx meson_src_test
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
gnome2_schemas_update
|
||||
|
||||
if use previewer; then
|
||||
readme.gentoo_print_elog
|
||||
else
|
||||
elog "To preview media files, emerge nautilus with USE=previewer"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
}
|
||||
Reference in New Issue
Block a user