Commit c1d6e9ca authored by gavin_darkglider's avatar gavin_darkglider
Browse files

Update some packages to match versions in gentoo portage tree.

parent 9b596efe
DIST gnome-shell-42.1.tar.xz 1928924 BLAKE2B c8a1aed79a93d713a52ef0161ff9f06c39f7fb9a762086c78505d220e1e8ec43d7a0e376421f912dc91b33da8fd9394c6a233bb2d9d8b361d63ea2ad0406cee6 SHA512 3d27fdbcf5359f631a71b0fa6495fa50e2b43bb2b3c5c0efd740d9a6a88128ae54fe0ba11ea88990ba10ee2fc9f55211d0a21e60beca250bd197535d944d07ed
DIST gnome-shell-42.2.tar.xz 1928948 BLAKE2B e263acfc9e6929accfb46b65b91b1173cfa4c778405c0852e93b83d78e1bf3a85e3b5c49b73445f604c0fdecb48f294931ab2403806661013bcef3a71b99f911 SHA512 dd77195772e23d8260e55a2db1103fa6dee8945ad168478c293e43e9971698aa191e17f7f5ef46cf46eeaae5051c34f0eb5df134690f7dc5ca98d6ca747e4eb0
From 1ef0033f8148466256b403c9d8c79b9fed1dd343 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Thu, 28 Feb 2019 00:50:19 +0200
Subject: [PATCH 2/2] 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 2702c3dbc..7a6c831b9 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.set('datadir', datadir)
jsconf.set('libexecdir', libexecdir)
diff --git a/meson.build b/meson.build
index 14b75c1c9..8b1c7a380 100644
--- a/meson.build
+++ b/meson.build
@@ -94,7 +94,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-1.0', version: bt_req, required: false)
+if get_option('bluetooth')
+ bt_dep = dependency('gnome-bluetooth-1.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 ef76b73c3..41cc0ff9d 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.26.2
https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
https://bugs.gentoo.org/831921
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 23 Dec 2021 17:18:16 +0100
Subject: [PATCH] build: Drop incorrect positional arg
Unlike other targets that take a name, i18n.merge_file() does not.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
---
data/meson.build | 2 +-
src/calendar-server/meson.build | 2 +-
subprojects/extensions-app/data/meson.build | 2 +-
subprojects/extensions-app/data/metainfo/meson.build | 2 +-
subprojects/extensions-tool/src/templates/meson.build | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index f924fdf806..76ae45c93a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
foreach desktop_file : desktop_files
- i18n.merge_file('desktop',
+ i18n.merge_file(
input: configure_file(
input: desktop_file + '.in.in',
output: desktop_file + '.in',
diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
index 7363282a59..8b4ef411c8 100644
--- a/src/calendar-server/meson.build
+++ b/src/calendar-server/meson.build
@@ -27,7 +27,7 @@ configure_file(
install_dir: servicedir
)
-i18n.merge_file('evolution-calendar.desktop',
+i18n.merge_file(
input: 'evolution-calendar.desktop.in',
output: 'evolution-calendar.desktop',
po_dir: po_dir,
diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
index d7e7d4001c..4b601e8bd1 100644
--- a/subprojects/extensions-app/data/meson.build
+++ b/subprojects/extensions-app/data/meson.build
@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
desktopconf.set('app_id', app_id)
desktopconf.set('prgname', prgname)
-i18n.merge_file('desktop',
+i18n.merge_file(
input: configure_file(
input: base_id + '.desktop.in.in',
output: desktop_file + '.in',
diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
index c4962c0576..a19bfa80a4 100644
--- a/subprojects/extensions-app/data/metainfo/meson.build
+++ b/subprojects/extensions-app/data/metainfo/meson.build
@@ -1,5 +1,5 @@
metainfo = app_id + '.metainfo.xml'
-i18n.merge_file(metainfo,
+i18n.merge_file(
input: base_id + '.metainfo.xml.in',
output: metainfo,
po_dir: po_dir,
diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build
index 670e2bf448..d693bfaddb 100644
--- a/subprojects/extensions-tool/src/templates/meson.build
+++ b/subprojects/extensions-tool/src/templates/meson.build
@@ -4,7 +4,7 @@ template_metas = [
]
template_deps = []
foreach template : template_metas
- template_deps += i18n.merge_file(template,
+ template_deps += i18n.merge_file(
input: template + '.in',
output: template,
po_dir: po_dir,
--
GitLab
From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Sun, 31 Oct 2021 17:24:58 -0300
Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0
libgnome-bluetooth will start to offer a 2.0 library version
depending on GTK4. Given that GNOME Shell already depends on
GTK3, it cannot use this next version of gnome-bluetooth. And
since GJS will automatically try and use the latest version
available of any library, Shell must specify it wants 1.0
explicitly.
Add a required GnomeBluetooth version number when importing it
for the status indicator.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2015>
---
js/ui/environment.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/js/ui/environment.js b/js/ui/environment.js
index ef53e6022..e906fa6c6 100644
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -6,6 +6,7 @@ const Config = imports.misc.config;
imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
imports.gi.versions.Gio = '2.0';
imports.gi.versions.GdkPixbuf = '2.0';
+imports.gi.versions.GnomeBluetooth = '1.0';
imports.gi.versions.Gtk = '3.0';
imports.gi.versions.Soup = '3.0';
imports.gi.versions.TelepathyGLib = '0.12';
--
2.34.1
From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Thu, 11 Nov 2021 16:20:39 -0300
Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0
Pretty much the exact same case of 9ce6756235.
libgnome-desktop saw a major version bump, and we have to
stick with 3.0 for a while.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2030>
---
js/ui/environment.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/js/ui/environment.js b/js/ui/environment.js
index e906fa6c6..cb254e319 100644
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
imports.gi.versions.Gio = '2.0';
imports.gi.versions.GdkPixbuf = '2.0';
imports.gi.versions.GnomeBluetooth = '1.0';
+imports.gi.versions.GnomeDesktop = '3.0';
imports.gi.versions.Gtk = '3.0';
imports.gi.versions.Soup = '3.0';
imports.gi.versions.TelepathyGLib = '0.12';
--
2.34.1
From f07a40d5eeb1daf6e2d118c548c8314c721d558c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 5 Jan 2022 02:42:49 +0100
Subject: [PATCH] environment: Require libgweather 3.0
GWeather did a major version bump on its main branch, so it is
now possible that multiple versions are installed in parallel,
and we should explicitly pick the one we are using.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2083>
---
js/ui/environment.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/js/ui/environment.js b/js/ui/environment.js
index cb254e319..ad2b8e4f2 100644
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -9,6 +9,7 @@ imports.gi.versions.GdkPixbuf = '2.0';
imports.gi.versions.GnomeBluetooth = '1.0';
imports.gi.versions.GnomeDesktop = '3.0';
imports.gi.versions.Gtk = '3.0';
+imports.gi.versions.GWeather = '3.0';
imports.gi.versions.Soup = '3.0';
imports.gi.versions.TelepathyGLib = '0.12';
imports.gi.versions.TelepathyLogger = '0.2';
--
2.34.1
https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
https://bugs.gentoo.org/844919
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 17 May 2022 15:36:43 +0200
Subject: [PATCH] build: Do not redefine polkit autocleanup
PolkitAgent recently added autocleanup functions itself, so check
for their existence at configure time and only define our own when
they don't exist upstream.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2296>
--- a/config.h.meson
+++ b/config.h.meson
@@ -33,3 +33,6 @@
/* Define if fdwalk is available in libc */
#mesondefine HAVE_FDWALK
+
+/* Define if polkit defines autocleanup functions */
+#mesondefine HAVE_POLKIT_AUTOCLEANUP
--- a/meson.build
+++ b/meson.build
@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
cc.has_function('fdwalk')
)
+polkit_has_autocleanup = cc.compiles(
+ '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
+ #include <polkitagent/polkitagent.h>
+ void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
+ dependencies: polkit_dep)
+cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
+
buildtype = get_option('buildtype')
if buildtype != 'plain'
all_warnings = [
--- a/src/shell-polkit-authentication-agent.h
+++ b/src/shell-polkit-authentication-agent.h
@@ -14,8 +14,10 @@
G_BEGIN_DECLS
+#ifndef HAVE_POLKIT_AUTOCLEANUP
/* Polkit doesn't have g_autoptr support, thus we have to manually set the autoptr function here */
G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
+#endif
#define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type())
GitLab
......@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_COMPAT=( python3_{8..11} )
inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
......@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test -pipewire"
IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test pipewire"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
RESTRICT="!test? ( test )"
......@@ -37,7 +37,8 @@ DEPEND="
bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
>=media-libs/gstreamer-0.11.92:1.0
media-libs/gst-plugins-base:1.0
pipewire? ( >=media-video/pipewire-0.3.0:= )
pipewire? (
>=media-video/pipewire-0.3.0:= )
networkmanager? (
>=net-misc/networkmanager-1.10.4:=[introspection]
net-libs/libnma[introspection]
......@@ -140,9 +141,6 @@ PATCHES=(
"${FILESDIR}"/42.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
# Upstream backport, bug #844919
"${FILESDIR}"/42.1-polkit-g_autoptr.patch
)
src_prepare() {
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
<longdescription>
GNOME Shell provides core user interface functions for the GNOME 3
desktop, like switching to windows and launching applications.
GNOME Shell takes advantage of the capabilities of modern graphics
hardware and introduces innovative user interface concepts to
provide a visually attractive and easy to use experience.
</longdescription>
<use>
<flag name="browser-extension">Ensure the presence of extensions.gnome.org
native connector <pkg>gnome-extra/chrome-gnome-shell</pkg></flag>
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking
and suspend support.</flag>
<flag name="ibus">Enable support for enhanced input methods through
<pkg>app-i18n/ibus</pkg></flag>
<flag name="telepathy">Ensure presence of telepathy chat integration</flag>
</use>
</pkgmetadata>
DIST iio-sensor-proxy-3.3.tar.gz 64225 SHA256 3f761f3603b3c5b76125f96a48d4001c24f368b6021ba1e06414cac6a5d17c44 SHA512 f5c5e60e888be54ace4f0f2bb941fccce21b122c0755050f91aebe8dfa9e2c126e6de57dd80873ea7148fc2dfc087b23823f29d73a223c68d531502d06438ee3 WHIRLPOOL 27c0190d4771a8de0e1654919195183c959ccdfad95a6f75f5ef0ae27f40340e02b19842fb17c9bfc74d2badceb4816d0d3b39867b7c66620dc52b316278312a
DIST iio-sensor-proxy-3.0.tar.gz 43588 BLAKE2B fc944cc8df3b413b5549be5cbb5c9d47b7b803bb4da1cbb318350599b9ac3b0f7a4228cc6c9ce3e05f1c994c04f29ca674be1e0f5f2d893882eb838f8e1fb3b3 SHA512 d1d25fe8220a05d25a3fd74fe8550176df86f0907e2a184df74e40ecee0578178f42d84fe42474b0b79b6e8603de3410fe1dd2ac5621cb2bea4b41fbea5f273b
DIST iio-sensor-proxy-3.3.tar.gz 64225 BLAKE2B 25608bd615dcd2c027ed157eed3030064bfb517250dee0fc7cb18625930508bfe0871a496457fe3d04821a803c2e5500d319a978f8279d766f6a8230d365513a SHA512 f5c5e60e888be54ace4f0f2bb941fccce21b122c0755050f91aebe8dfa9e2c126e6de57dd80873ea7148fc2dfc087b23823f29d73a223c68d531502d06438ee3
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools meson udev xdg
DESCRIPTION="IIO sensors to D-Bus proxy"
HOMEPAGE="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
SRC_URI="https://gitlab.freedesktop.org/hadess/${PN}/-/archive/${PV}/${P}.tar.gz"
KEYWORDS="*"
LICENSE="GPL-3"
SLOT="0"
IUSE="systemd"
RDEPEND="
dev-libs/glib
dev-libs/libgudev
sys-apps/dbus
systemd? ( >=sys-apps/systemd-233:0 )
virtual/udev
"
DEPEND="
${RDEPEND}
dev-util/gtk-doc
dev-util/gtk-doc-am
virtual/pkgconfig
"
src_prepare() {
# use systemd || eapply "${FILESDIR}"/${PN}_nosystemd.patch
default
}
src_install() {
meson_src_install
# OpenRC init file
if ! use systemd ; then
newinitd "${FILESDIR}/${PN}.openrc" ${PN}
fi
}
pkg_postinst() {
xdg_pkg_postinst
elog
elog "enable iio-sensor-proxy service:"
elog
elog "[openrc] # rc-update add iio-sensor-proxy"
elog "[systemd] # systemctl enable iio-sensor-proxy"
elog
elog "Reboot computer."
}
pkg_postrm() {
xdg_pkg_postrm
}
DIST libdrm-2.4.110.tar.xz 436372 BLAKE2B 0d5f8bfe47bdcc96ef7dbe3ecf2da0b21262bae4396fa1e73c0f728d970d041a9925082c4526bc71e00f110c2eb0ba94313d9a7c27a2d4676073fdbc3708c628 SHA512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3
DIST libdrm-2.4.111.tar.xz 447388 BLAKE2B bd1fe6a1af3dbdd542ea9d3b887121d917c11ef9c3c0074bbe5d18ffd15050e2df63c744aa5e559e7f8a1f1e9561d3b2ba8b9a45ad72d7c1e6393b7eae99cf54 SHA512 17e92e9e4ded8031ac222764bed7e9ff430a1a377f5e435f6b62b4a7f45cb4c4b769b3b79fbcba11512c1ac973abf8cdcca8e0b9659ae095e915d3d5efcf5516
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
PYTHON_COMPAT=( python3_{8..10} )
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
fi
inherit ${GIT_ECLASS} python-any-r1 flag-o-matic meson-multilib
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS} valgrind"
RESTRICT="test" # see bug #236845
LICENSE="MIT"
SLOT="0"
RDEPEND="
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind )"
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
PATCHES=( "${FILESDIR}"/libdrm.patch )
python_check_deps() {
has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
}
multilib_src_configure() {
local emesonargs=(
# Udev is only used by tests now.
-Dudev=false
-Dcairo-tests=false
$(meson_use video_cards_amdgpu amdgpu)
$(meson_use video_cards_exynos exynos)
$(meson_use video_cards_freedreno freedreno)
$(meson_use video_cards_intel intel)
$(meson_use video_cards_nouveau nouveau)
$(meson_use video_cards_omap omap)
$(meson_use video_cards_radeon radeon)
$(meson_use video_cards_tegra tegra)
$(meson_use video_cards_vc4 vc4)
$(meson_use video_cards_vivante etnaviv)
$(meson_use video_cards_vmware vmwgfx)
# valgrind installs its .pc file to the pkgconfig for the primary arch
-Dvalgrind=$(usex valgrind auto false)
)
meson_src_configure
}
multilib_src_install() {
meson_src_install
if use video_cards_tegra; then
rm ${D}/usr/lib64/libdrm.so.2
fi
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment