summaryrefslogtreecommitdiff
path: root/gnome-base/gnome-shell
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-05-07 11:18:59 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-05-07 11:18:59 +0100
commita2810985afabcc31d3eace5e61d8ea25b852ba17 (patch)
treed254e77a7aeadd875db2dc73532da78094238ffd /gnome-base/gnome-shell
parenteab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (diff)
gentoo resync : 07.05.2019
Diffstat (limited to 'gnome-base/gnome-shell')
-rw-r--r--gnome-base/gnome-shell/Manifest5
-rw-r--r--gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch59
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.30.2-r2.ebuild (renamed from gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild)19
3 files changed, 11 insertions, 72 deletions
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 8eaa1b3c38ab..21bdb0dc6a3a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,6 +1,5 @@
AUX 3.26-optional-bluetooth.patch 2406 BLAKE2B b747c9d5cdbefbec8c045e24502bcb57b45b14151264cbad31e9ce96ff8320ed140c327e10fb72878da8638af93f63871d523176b18979756937ff5219eb52c6 SHA512 d1f4ce36c705be4669b336f736172f29b4b8f373b146fff4a27bb84cfdde3ec989253b92cb0eaa881e98d7f3267db4954ea9413b75c01c65bcc6e54ce32c14c7
AUX 3.28.3-defaults.patch 1385 BLAKE2B d7e0495aadec7fa042086b5219cc34906f9333a446484e63d90932551d09f469e66cc5da43040a2bf955ecdb3d2beca0e1dba435dd7c309bbc78a1b7aba7f43b SHA512 190a9a61b164373e1f2528b96eca0312a7884651ee44212f686e5752430197b2644b67550dc41ed10684cccd0e8a0d870cfdeddf8582d57de637f7dad11d0124
-AUX 3.28.3-optional-bluetooth.patch 1941 BLAKE2B 1985b337fc0e51cbc836814802530f0de4c418e8f47beef6e718fd6a5febb6a8ee877fb962688676235b40f8716431a3fd88e7cfd7b0a6b53928445376460bd6 SHA512 7e565ad411944c7eea542cd91f09583c892f6eb529900f9a07455298b8c1e318a4d726d3db250a36818ccf362c46ee788f5b2062fa0aebb7d7501ab5b597186f
AUX gnome-shell-3.12-bluetooth-flag.patch 1894 BLAKE2B a53360d103faf25aa605cd5c73eeb892ce667f57313fbd90bdcf176151158b1389ba49becd4421d825e5d63d4dcb0a2e99618f3558de87f0afe2b46851a353f0 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80
AUX gnome-shell-3.22.0-defaults.patch 1228 BLAKE2B 9bb49d830c2bbc36123ca8fdddc02d4b750a5ffd174fa653ead26a75dc9478be4b5a39c31a004a3897655aae097c23f511d6bb494b0aede51fea74294be3fcf6 SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5
AUX gnome-shell-3.22.0-gir-build-fix.patch 882 BLAKE2B 62a816accf06abd182d1381326ad2059a59b3ff9579475b160d9c6fa715acfcf0f3d9d3544bc435b13fcdd45cf420b761ea6681718e540a39533f615b7aa0214 SHA512 b534134cc76dce49c78621d9245e9c457f4eefc3ac89dc09f036a178524b0ad3608683f43a0920fdb1d36410aebbfdecd701725217b6239f4549ef4ba82b7213
@@ -8,10 +7,10 @@ DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32
DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143 SHA512 93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
DIST gnome-shell-3.30.2-patchset-r1.tar.xz 41324 BLAKE2B 4d051a327d106e8431c7b75d56932137dd3af2694c313656bf4751a385a86ef43dd635f31902be0426899746c63f1cd1aa782e9c0827f750fe61683512fbd43c SHA512 3761688e86694be00d81eac2bcd8774d8fdff62f44cdcd26c29b9e7513d2db0edc0ba097e0fea474a232496e3f9b8797e6215a040915a0832517235b26cbc265
-DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 61c02e5ae87ab24f30d28865f4444f20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8 SHA512 8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
+DIST gnome-shell-3.30.2-r2-patchset.tar.xz 41852 BLAKE2B f854a42b0ba0be8019487edfc1a0e73d11d406537ffe288d1a5d81e9a512b8fb02e6af466fbe4d0d0e8644aa6f57cad1d381b5e873223749c88d1dccdae72b9e SHA512 c0c935206048c961e70f319b67133dcf0f5253c2283aefd6283db910950f8cd645888f6a6b7bbbfc620a023e0b5ae85394e5f5ce0fb2ff120b18ab7640f9859e
DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877 SHA512 5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6
EBUILD gnome-shell-3.24.3.ebuild 6627 BLAKE2B 11f38494c15a4ea34df2f6f4bf00f1478e3ef53e64a3a3c0cc32fa33de53ecc90d746eb840d75102d955679d4c4526e64633f522ed87ce45bb9d80fe91ef77df SHA512 ddf65e678e087a579fe52c87776f21cd53f3bf7be8e8b2b98830b088a3151c98a108cbcedc93bbce81d8c71ae7c860488244ec671ca5cd663c7a3490581170b3
EBUILD gnome-shell-3.26.2-r4.ebuild 6613 BLAKE2B 03e06ce7c6b60541b4efe93e51a0979ebb47a7b7d1a1f5ea6affb26f4f56dccc027680ef29f150a27df21977aefb7338142d04072655a1fb8a9d28361c7ea824 SHA512 61c03adba290399094ee0b5bd6004e791a6739581eb552d876b4d93ea42e8098897ec7be5031ae4525f9cf0319eb6fa8701e3cbde46027bcd5c35899354a2930
EBUILD gnome-shell-3.30.2-r1.ebuild 6499 BLAKE2B b3d2ff45b435b997208a0d3e5300853222bb5dedb3eecc7ff825bd0c136b16e2ee715f2b5d4de9f720b9ad54e9522a93d04f2fedb0820105e48db31f97f0ae02 SHA512 5bf7736beca8eee514e939cd062b20dc6738f556705267f4b674a4e6b9c3c1ef39829c1956d319148b80afab0c36deb0b8be14f4fd25434bf5cdad2c20f0bc04
-EBUILD gnome-shell-3.30.2.ebuild 6569 BLAKE2B ec2c58fb65eccf251bcb6bb75b9c4a9eb1f0aa9d7e713fa2263dd16882433219e4b3ddcd418f5ef07c651b96f52eb50fbf981514ce99ccf5a54582fef6bcffb9 SHA512 5241067c91205d9194e55892d833a5f27b58ddf0473e318a14deccd6164d99906c984bc70761e212e39605a8eb144792df4e208ab3ff474874a25d45abbfcbad
+EBUILD gnome-shell-3.30.2-r2.ebuild 6497 BLAKE2B 507132ae4c4eed069f1ebe85241ef36325d1a94f14ecd3b80bfe1dd205c38d68115550b8426b2b536310a27650b371eb414accdcd5af09246513f552ecee7e7b SHA512 ce900e385e9a92ae927d4f503ba03d6bdeca556335d8f8e04b4ae347092c04eff6abeffb46e432d3e5d2f2af36675a94e7d2262370cd15aac8ad33dc02684012
MISC metadata.xml 1279 BLAKE2B 4c69dd1979038f6231f4877e5070b7b833377197e5030c97dff5d8d2e36d2dce1510254b97b4d7b9255a64c556d9795c515aea9b21091de3bde6b8499346df9b SHA512 caa5a580e349cfab441bac8f648866618b76528e5bcc0baa6cbe32853bb56786aa0b7cc309ab6515d6a298b5bcdf45ea0360a26c28e64543afb558479ff219c3
diff --git a/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch
deleted file mode 100644
index 3138c6d2b732..000000000000
--- a/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 26dbbd15fabd3c35135105720dc821edccb128fa 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 5a4871762..3c5e02368 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 f38798caf..e1bcd1892 100644
---- a/meson.build
-+++ b/meson.build
-@@ -92,7 +92,12 @@ ibus_dep = dependency('ibus-1.0', version: ibus_req)
- x11_dep = dependency('x11')
- schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_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)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index 65188c7ff..b6d49dfb5 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,9 @@
-+option('bluetooth',
-+ type: 'boolean',
-+ value: true,
-+ description: 'Enable bluetooth support'
-+)
-+
- option('browser_plugin',
- type: 'boolean',
- value: true,
---
-2.17.0
-
diff --git a/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2-r2.ebuild
index b76502772cbc..ad58f90154ca 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.30.2-r2.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
# FIXME:
# * gstreamer support is currently automagic
-COMMON_DEPEND="
+DEPEND="
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-extra/evolution-data-server-3.17.2:=
>=app-crypt/gcr-3.7.5[introspection]
@@ -75,7 +75,7 @@ COMMON_DEPEND="
# 9. Optional telepathy chat integration
# 10. 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)
# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
>=sys-apps/accountsservice-0.6.14[introspection]
app-accessibility/at-spi2-core:2[introspection]
app-misc/geoclue[introspection]
@@ -106,7 +106,7 @@ PDEPEND="
>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
browser-extension? ( gnome-extra/chrome-gnome-shell )
"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
dev-lang/sassc
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.45.3
@@ -117,12 +117,11 @@ DEPEND="${COMMON_DEPEND}
"
PATCHES=(
- # Patches from gnome-3-28 branch on top of 3.30.2
+ # Patches from gnome-3-30 branch on top of 3.30.2
+ # Fix automagic gnome-bluetooth dep, bug #398145
"${WORKDIR}"/patches/
# Change favorites defaults, bug #479918
"${FILESDIR}"/3.28.3-defaults.patch
- # Fix automagic gnome-bluetooth dep, bug #398145
- "${FILESDIR}"/3.28.3-optional-bluetooth.patch
)
src_prepare() {
@@ -150,7 +149,7 @@ src_install() {
meson_src_install
# Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
- pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+ pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs}
}
src_test() {