From 62f67115b5c46134c34f88f4b1cbdacc19384c0a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Sep 2018 11:19:18 +0100 Subject: gentoo resync : 30.09.2018 --- gnome-base/Manifest.gz | Bin 5685 -> 5687 bytes gnome-base/gdm/Manifest | 2 + gnome-base/gdm/gdm-3.26.2.1-r1.ebuild | 203 +++++++++++++++++++++ gnome-base/gnome-control-center/Manifest | 3 + .../gnome-control-center-3.26.2-r1.ebuild | 157 ++++++++++++++++ gnome-base/gnome-keyring/Manifest | 2 + .../gnome-keyring/gnome-keyring-3.28.2.ebuild | 78 ++++++++ gnome-base/gnome-session/Manifest | 2 + .../gnome-session/gnome-session-3.26.1.ebuild | 126 +++++++++++++ gnome-base/gnome-settings-daemon/Manifest | 5 +- .../gnome-settings-daemon-3.26.2-r1.ebuild | 131 +++++++++++++ gnome-base/gnome-settings-daemon/metadata.xml | 5 +- gnome-base/gnome-shell/Manifest | 6 +- .../files/3.26-optional-bluetooth.patch | 73 ++++++++ .../gnome-shell/gnome-shell-3.26.2-r4.ebuild | 186 +++++++++++++++++++ gnome-base/gnome-shell/metadata.xml | 3 + gnome-base/gvfs/Manifest | 2 +- gnome-base/gvfs/gvfs-1.32.2.ebuild | 2 +- 18 files changed, 980 insertions(+), 6 deletions(-) create mode 100644 gnome-base/gdm/gdm-3.26.2.1-r1.ebuild create mode 100644 gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild create mode 100644 gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild create mode 100644 gnome-base/gnome-session/gnome-session-3.26.1.ebuild create mode 100644 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild create mode 100644 gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch create mode 100644 gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild (limited to 'gnome-base') diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz index a9d9422cbaaf..59e156840205 100644 Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 2284116bda0d..3b2ec1f1b5a7 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -6,6 +6,8 @@ AUX gdm-2.32.0-xinitrc-ssh-agent.patch 842 BLAKE2B 98233eaf06fbe0950aa36bbc8bee2 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5 AUX gdm-3.8.4-logo.patch 805 BLAKE2B 80c323529acfe9287009494060f3e4d588dcf415845d3502840674ac0108cdd721e9af71e2df7cf94bb69fb3526d76e96bd21f31ed002fce460b30fd2afa3a20 SHA512 98dc0b01f4a4cbb87b32ec52450eb21f07bf96dc4d919cf662314c50fe0f2b1a19c90e3d8d2a0de905e8ada41642c0f89aa89dd640ead7e3d732468c9e363fb2 DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552efe8fe044da655037bfd603f1e4ab89a4eb0687f786bf44e9fd1c27e07bc498a769c8f88f0cc22b2dd1c9b1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345 +DIST gdm-3.26.2.1.tar.xz 1119568 BLAKE2B 42ccd3d30a5b22124777792ea3e0bb003771df1d3c5a729d29ff14efe5c6365a82126e6b204301b22dd51e4aaffcef4e018b8fdda45eb52e3b76bd921aca9312 SHA512 4a0009935f2f86803a4dd6cdc01c80c9ee89fb8a71f82ffa6fadb16322e4c7f51d82e0e887c30aa09d1b242c3cc82a1ec0d83463e5d8942719a747f6945cbec9 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 EBUILD gdm-3.24.3-r1.ebuild 5789 BLAKE2B d21c9bfcc1ee3fb9c72323c9197a7f1e10a2d384e69bbe0a6eb58d40d4d8d223269c15503efcdb8869b919843f8e5cc7280a098056f1e3ef44cd3bc7b21a3b87 SHA512 2bd2933dabc1493fce0b08371b11ddd09ba59f354ee60cab47dd8e329366703591f14e9e38c6c552c1f9b414b97439f1910ed96167fb6d1927f1afdb06065c58 +EBUILD gdm-3.26.2.1-r1.ebuild 5811 BLAKE2B 8c4a56ae6338ad8480a7d7db521e481b14d54d84cbf555135641e375d77cb391b270a3fbc4dd2ff668442e798a40c10e1f873740db1d768147b2a2bc5065551f SHA512 da619be5f450cf25349f0b5e8a03a5e3f8892f81ab2f33b827ddfba6b7b67b0fdc7d2e50b72b38e686088b1280e4815974f54613f0c69ddd9603251a08cae835 MISC metadata.xml 477 BLAKE2B 29eb8d343cd5195f35dc73d07c695dd3090f8f8ea436b88c8a8fb7f15beac82aaeb2b83215443851866e7fcec51aa14ff19c30597a74cd9a73b384ee801b16f0 SHA512 4da6d5a4f518596834d4138db716bf58d2b2f28f07fed6379a6f0d8bdecb6b803fb3b24880dfcb93ff5aac03f512bf08af7f9742d01a497dd4fc6d7a74d1a844 diff --git a/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild b/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild new file mode 100644 index 000000000000..c0da4dfdaffe --- /dev/null +++ b/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 pam readme.gentoo-r1 systemd user + +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" +HOMEPAGE="https://wiki.gnome.org/Projects/GDM" + +SRC_URI="${SRC_URI} + branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" + +LICENSE=" + GPL-2+ + branding? ( CC-BY-SA-4.0 ) +" + +SLOT="0" + +IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.36:2[dbus] + >=x11-libs/gtk+-2.91.1:3 + >=gnome-base/dconf-0.20 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + >=media-libs/fontconfig-2.5.0:1.0 + >=media-libs/libcanberra-0.4[gtk3] + sys-apps/dbus + >=sys-apps/accountsservice-0.6.35 + + x11-apps/sessreg + x11-base/xorg-server + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-libs/libxcb + >=x11-misc/xdg-utils-1.0.2-r3 + + virtual/pam + >=sys-apps/systemd-186:0=[pam] + + sys-auth/pambase[systemd] + + audit? ( sys-process/audit ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) +" +# XXX: These deps are from session and desktop files in data/ directory +# fprintd is used via dbus by gdm-fingerprint-extension +# gnome-session-3.6 needed to avoid freezing with orca +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-session-3.6 + >=gnome-base/gnome-shell-3.1.90 + x11-apps/xhost + + accessibility? ( + >=app-accessibility/orca-3.10 + gnome-extra/mousetweaks ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) + + !gnome-extra/fast-user-switch-applet +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/intltool-0.40.0 + dev-util/itstool + virtual/pkgconfig + x11-base/xorg-proto + test? ( >=dev-libs/check-0.9.4 ) +" + +DOC_CONTENTS=" + To make GDM start at boot, run:\n + # systemctl enable gdm.service\n + \n + For passwordless login to unlock your keyring, you need to install + sys-auth/pambase with USE=gnome-keyring and set an empty password + on your keyring. Use app-crypt/seahorse for that.\n + \n + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 + for smartcard support +" + +pkg_setup() { + enewgroup gdm + enewgroup video # Just in case it hasn't been created yet + enewuser gdm -1 -1 /var/lib/gdm gdm,video + + # For compatibility with certain versions of nvidia-drivers, etc., need to + # ensure that gdm user is in the video group + if ! egetent group video | grep -q gdm; then + # FIXME XXX: is this at all portable, ldap-safe, etc.? + # XXX: egetent does not have a 1-argument form, so we can't use it to + # get the list of gdm's groups + local g=$(groups gdm) + elog "Adding user gdm to video group" + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" + fi +} + +src_prepare() { + # ssh-agent handling must be done at xinitrc.d, bug #220603 + eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # Gentoo does not have a fingerprint-auth pam stack + eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" + + # CVE-2018-14424, bug #662782 + eapply "${FILESDIR}/3.24.3-CVE-2018-14424.patch" + eapply "${FILESDIR}/3.24.3-display-object-lifetime-fix.patch" + + # Show logo when branding is enabled + use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch" + + gnome2_src_prepare +} + +src_configure() { + local myconf + # PAM is the only auth scheme supported + # even though configure lists shadow and crypt + # they don't have any corresponding code. + # --with-at-spi-registryd-directory= needs to be passed explicitly because + # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 + # Xevie is obsolete, bug #482304 + # --with-initial-vt=7 conflicts with plymouth, bug #453392 + ! use plymouth && myconf="${myconf} --with-initial-vt=7" + + gnome2_src_configure \ + --enable-gdm-xsession \ + --enable-user-display-server \ + --with-run-dir=/run/gdm \ + --localstatedir="${EPREFIX}"/var \ + --disable-static \ + --with-xdmcp=yes \ + --enable-authentication-scheme=pam \ + --with-default-pam-config=exherbo \ + --with-pam-mod-dir=$(getpam_mod_dir) \ + --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ + --without-xevie \ + --enable-systemd-journal \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + $(use_with audit libaudit) \ + $(use_enable ipv6) \ + $(use_with plymouth) \ + $(use_with selinux) \ + $(use_with tcpd tcp-wrappers) \ + $(use_enable wayland wayland-support) \ + $(use_with xinerama) \ + ${myconf} +} + +src_install() { + gnome2_src_install + + if ! use accessibility ; then + rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die + fi + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}/49-keychain-r1" 49-keychain + newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent + + # gdm user's home directory + keepdir /var/lib/gdm + fowners gdm:gdm /var/lib/gdm + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + systemd_reenable gdm.service + readme.gentoo_print_elog +} diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 87f896f6a09b..64a9f6afb013 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,4 +1,7 @@ DIST gnome-control-center-3.24.4-patchset.tar.xz 8076 BLAKE2B e70086987957b4c33fff6d3b5038ffc260fc47520de4606fa96a0993cee4eea699bb57e8c0a6406e7d5c99adde702351d6462bf0594398f48f6ba4c9bc217417 SHA512 6228bffb71b61a100248f2f3ffc659532e9a067579d0dcf869e58ba9fb5d0b3e745a3bda2a92caa5bc86f8809885268b543f6863262dc6fef52b61e74eaef927 DIST gnome-control-center-3.24.4.tar.xz 7320232 BLAKE2B 29a5860b8cc27f161451ae8c053db1d28e8c5f8714cbccac7674c00689569ac4e51f7deb0a341e0868b1467a095f87d685ea0ec733f69274f02ecaf5badfef6e SHA512 34a59d4d89971054b1f54e7a7e3cbc3c306a3fbe3cc94adf1241ad37076a6179c93f04a95e51e57982eda57187e578005060d711a5d955734d5a138e61b3598a +DIST gnome-control-center-3.26.2-patchset.tar.xz 159088 BLAKE2B 521af115f7d4372ecf645b915e9081607a6699528b2914e73f11856fc9a8ae80406c210ad97b5d84b616d324d0c1539e2155c5e6db4920cbd8355b85f21a8e3b SHA512 90bf9e19b98dcc39fe5af6604876e5d9fe31358a4da602fe518589d9b3a9261fee3b3785f40a889295e3e7b38370173d03350f475be576830efa2ad74718c19e +DIST gnome-control-center-3.26.2.tar.xz 7386516 BLAKE2B 156c24bc2ab60943ade1e255976e29478c9b0e9dbad12921a835ec55f09ad62c71886750a50fa74f2a0afb660cac073c9ff54cef4b72c790b6dd91c7cac8aaa9 SHA512 d3ad9067c7e66a3a6bf5b6c058f3862f6e4b59c0254fd47f0b4a9093f3b7e2d7f1900b510aba8bbdac7c1212a0f6cdd4974c3d04003af63edb72ed3e56f7dbca EBUILD gnome-control-center-3.24.4.ebuild 4846 BLAKE2B 55a347117e272330e5190abe5b1e2a3f2a034a22ed0a746a848f7c1b14c06d1b9b8961b8281916d1775df957514971409b713bfc1743f2f59da7e749bf14d1f8 SHA512 aa8a3f470892b80b4ba03d8b0009b7f81a345e9156fcc718fcfecd0fec823aed61d96d93c85979a52b3b87412ce465bbc9210f363a693093e727c49711f26e77 +EBUILD gnome-control-center-3.26.2-r1.ebuild 4925 BLAKE2B e167a86fae60b6020d3baceddf1f1681099cd81af3ee3261c22fa5dd424fad1686fa1950c8cb9d86fca965b39b1ff54cbc1286efdfc47595e2de58fd0b0ca058 SHA512 c6102eb3ed92f8d3b4e64b0a4d7b7396727f3ee1c130991c8b43c5342832fa9814ab68f99953d06e794a2102aefc5140ed2107ca882216cc66be1ac23eb39008 MISC metadata.xml 592 BLAKE2B b868af571d6fb58f3a7baaa586261025de5be5a928f963f6fde8db3b6549b6dd30c0d73752e296f9ba3b128c96f3a942ed6cecc8acb98d745502483822c9866b SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild new file mode 100644 index 000000000000..ab4f3f3ce0ff --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit bash-completion-r1 gnome2 + +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" +HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" + +LICENSE="GPL-2+" +SLOT="2" +IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login +# g-s-d[policykit] needed for bug #403527 +# kerberos unfortunately means mit-krb5; build fails with heimdal +# udev could be made optional, only conditions gsd-device-panel +# (mouse, keyboards, touchscreen, etc) +# display panel requires colord and gnome-settings-daemon[colord] +# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional) +COMMON_DEPEND=" + >=dev-libs/glib-2.53.0:2[dbus] + >=x11-libs/gdk-pixbuf-2.23.0:2 + >=x11-libs/gtk+-3.22.0:3[X,wayland?] + >=gnome-base/gsettings-desktop-schemas-3.21.4 + >=gnome-base/gnome-desktop-3.21.2:3= + >=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit] + >=x11-misc/colord-0.1.34:0= + + >=dev-libs/libpwquality-1.2.2 + dev-libs/libxml2:2 + gnome-base/libgtop:2= + media-libs/fontconfig + >=sys-apps/accountsservice-0.6.39 + + >=media-libs/libcanberra-0.13[gtk3] + >=media-sound/pulseaudio-2[glib] + >=sys-auth/polkit-0.97 + >=sys-power/upower-0.99:= + + virtual/libgudev + x11-apps/xmodmap + x11-libs/cairo + x11-libs/libX11 + x11-libs/libXxf86misc + >=x11-libs/libXi-1.2 + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) + colord? ( + net-libs/libsoup:2.4 + >=x11-misc/colord-0.1.34:0= + >=x11-libs/colord-gtk-0.1.24 ) + cups? ( + >=net-print/cups-1.7[dbus] + >=net-fs/samba-4.0.0[client] + ) + gnome-online-accounts? ( + >=media-libs/grilo-0.3.0:0.3= + >=net-libs/gnome-online-accounts-3.25.3:= ) + ibus? ( >=app-i18n/ibus-1.5.2 ) + kerberos? ( app-crypt/mit-krb5 ) + networkmanager? ( + >=gnome-extra/nm-applet-1.2.0 + >=net-misc/networkmanager-1.2.0:=[modemmanager] + >=net-misc/modemmanager-0.7.990 ) + v4l? ( + media-libs/clutter-gtk:1.0 + >=media-video/cheese-3.5.91 ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + >=media-libs/clutter-1.11.3:1.0 + media-libs/clutter-gtk:1.0 + >=x11-libs/libXi-1.2 ) +" +# 3.25.4, but this is about +# removed components, so no need to strictly require it (older just +# won't have those daemons loaded by gnome-session) +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-settings-daemon-3.23.2 + >=gnome-base/gsettings-desktop-schemas-0.1.7 + x11-themes/adwaita-icon-theme + sys-apps/dbus[X] + !systemd? ( + sys-auth/consolekit + >=dev-libs/dbus-glib-0.76 + ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + >=dev-util/intltool-0.40.6 + >=sys-devel/gettext-0.10.40 + virtual/pkgconfig + !Gentoo GNOME Desktop - Support color management using - x11-misc/colord + Support color management using x11-misc/colord + Rely on sys-auth/elogind as runtime logind provider + Rely on sys-apps/systemd as runtime logind provider Skip systemd dependency (#480336), enabling this flag will become your setup to be fully unsupported by upstream and downstream Gnome team. Do not diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index e2fca9f451de..7b90ff9e248b 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,8 +1,12 @@ +AUX 3.26-optional-bluetooth.patch 2406 BLAKE2B b747c9d5cdbefbec8c045e24502bcb57b45b14151264cbad31e9ce96ff8320ed140c327e10fb72878da8638af93f63871d523176b18979756937ff5219eb52c6 SHA512 d1f4ce36c705be4669b336f736172f29b4b8f373b146fff4a27bb84cfdde3ec989253b92cb0eaa881e98d7f3267db4954ea9413b75c01c65bcc6e54ce32c14c7 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 DIST gnome-shell-3.22.3.tar.xz 1952576 BLAKE2B 26d974bc45b93342db3d23f9a999734b571c6819c1fdddc20e019e282bcfbdf6d9f40850667756046187e0e3a52a57ba60962cc49b7b4b49909ec5f992e518e6 SHA512 47d67910b321a182d3ecd41f20cd923ec433cc93ab04b0b31351ca0229505ecbf343b1307585e557ee757845dc09b2371b0c2197717ed532b71878c186337ee9 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15 +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 EBUILD gnome-shell-3.22.3.ebuild 6847 BLAKE2B edb25faf602ece895a316042dd62896d84755f17f26f51a217c748b653e3ca729aae959c8a2fb39d51da654ee9f961855f69f43d15ad9777d1b6b0d22c10b212 SHA512 b0cb683473ec3a3dcffb1dd9fee56a6b9ec4dfe6f311a523c3920cbb690a69d5e4e73643bde1c6eb3faf4f4a6bb8337640d42ce92b2b8fd08b26e39666449ad3 EBUILD gnome-shell-3.24.3.ebuild 6605 BLAKE2B 4122c4a9ac2bd12ee622393b0d82910de449ffc854c8e3c20c49e512543bc61821cc0f813a868a2f1732165d19b8767fd37ecbf68834227851264a4375d8386a SHA512 7c025fcdecdc2e77888a20b827448f5abaa3335a84d0c04d88bc77dccade30fcd30693a3c8b0c3e377f197a5a85ce52fa07c8b60e58341b4166f794a54813bc1 -MISC metadata.xml 1097 BLAKE2B 49290d960ee8cb1d86633ef2878e9fb52d2f68b129a30487504c507758c56c9d3c94396604980881b8fa830dae8dcc8e7bbe1a5c40815d90b5e73c2d7f93a374 SHA512 beec5d056c6a03811feb30388622f15ec9cbc4d4c3cadea21ca2bf1fbba65adb2687206b9dce6aee3460e47280809af78e52213d089ad2295897325e5551d921 +EBUILD gnome-shell-3.26.2-r4.ebuild 6583 BLAKE2B be471765a8fc69fd3301470accdbbf78b52bd3bcc64bde4956dbef69d42e9b7d7e0a6d44fabc62b3d72ec555e4e68ca430481898d0a61c2cae6d7c570137ee16 SHA512 5c0a6ae0d442504bd34ea1b217579b6307ed8fc25b8d42268a3d32132c6755066848ed65a4c8f90ea1d3fdb73c01dd0ce87753a56dc2084e00c2e3b36cb74708 +MISC metadata.xml 1279 BLAKE2B 4c69dd1979038f6231f4877e5070b7b833377197e5030c97dff5d8d2e36d2dce1510254b97b4d7b9255a64c556d9795c515aea9b21091de3bde6b8499346df9b SHA512 caa5a580e349cfab441bac8f648866618b76528e5bcc0baa6cbe32853bb56786aa0b7cc309ab6515d6a298b5bcdf45ea0360a26c28e64543afb558479ff219c3 diff --git a/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch new file mode 100644 index 000000000000..9f7e5aea4da3 --- /dev/null +++ b/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch @@ -0,0 +1,73 @@ +From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Mon, 10 Sep 2018 13:17:39 +0200 +Subject: [PATCH] Make bluetooth support optional + +https://bugs.gentoo.org/show_bug.cgi?id=398145 +leio: Fixed enable_bluetooth get_option string +--- + js/misc/meson.build | 2 +- + meson.build | 15 ++++++++++++++- + meson_options.txt | 7 +++++++ + 3 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/js/misc/meson.build b/js/misc/meson.build +index 20489496c..3071f9dfb 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 b82c41398..7d342ff61 100644 +--- a/meson.build ++++ b/meson.build +@@ -91,7 +91,20 @@ startup_dep = dependency('libstartup-notification-1.0', version: startup_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) ++bt_dep = [] ++enable_bluetooth = get_option('enable-bluetooth') ++if enable_bluetooth != 'no' ++ want_bluetooth = enable_bluetooth == 'yes' ++ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: want_bluetooth) ++ have_bluetooth = bt_dep.found() ++ ++ if not have_bluetooth ++ bt_dep = [] ++ endif ++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 18899ffdb..9191f8c0e 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -16,6 +16,13 @@ option('enable-man', + description: 'Generate man pages' + ) + ++option('enable-bluetooth', ++ type: 'combo', ++ choices: ['yes', 'no', 'auto'], ++ value: 'auto', ++ description: 'Enable bluetooth support' ++) ++ + option('enable-networkmanager', + type: 'combo', + choices: ['yes', 'no', 'auto'], +-- +2.18.0 + diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild new file mode 100644 index 000000000000..e8bb212e6a83 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) + +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" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ?? ( elogind systemd )" + +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" + +# libXfixes-5.0 needed for pointer barriers and #include +# FIXME: +# * gstreamer support is currently automagic +COMMON_DEPEND=" + >=dev-libs/libcroco-0.6.8:0.6 + >=gnome-extra/evolution-data-server-3.17.2:= + >=app-crypt/gcr-3.7.5[introspection] + >=gnome-base/gnome-desktop-3.7.90:3=[introspection] + >=dev-libs/glib-2.53.0:2 + >=dev-libs/gobject-introspection-1.49.1:= + >=dev-libs/gjs-1.47.0 + >=x11-libs/gtk+-3.15.0:3[introspection] + nsplugin? ( >=dev-libs/json-glib-0.13.2 ) + >=x11-wm/mutter-3.24.0:0/1[introspection] + >=sys-auth/polkit-0.100[introspection] + >=gnome-base/gsettings-desktop-schemas-3.21.3 + >=x11-libs/startup-notification-0.11 + bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) + >=media-libs/gstreamer-0.11.92:1.0 + networkmanager? ( + >=gnome-extra/nm-applet-0.9.8[introspection] + >=net-misc/networkmanager-0.9.8:=[introspection] + >=app-crypt/libsecret-0.18 + dev-libs/dbus-glib ) + systemd? ( >=sys-apps/systemd-31 ) + elogind? ( >=sys-auth/elogind-237 ) + + >=app-accessibility/at-spi2-atk-2.5.3 + media-libs/libcanberra[gtk3] + x11-libs/gdk-pixbuf:2[introspection] + dev-libs/libxml2:2 + >=net-libs/libsoup-2.40:2.4[introspection] + x11-libs/libX11 + + >=media-sound/pulseaudio-2[glib] + >=dev-libs/atk-2[introspection] + dev-libs/libical:= + >=x11-libs/libXfixes-5.0 + + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + media-libs/mesa +" +# Runtime-only deps are probably incomplete and approximate. +# Introspection deps generated using: +# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq +# Each block: +# 1. Introspection stuff needed via imports.gi.* +# 2. gnome-session needed for shutdown/reboot/inhibitors/etc +# 3. Control shell settings +# 4. logind interface needed for suspending support +# 5. xdg-utils needed for xdg-open, used by extension tool +# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) +# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review +# 8. IBus is needed for nls integration +# 9. Optional telepathy chat integration +# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper +RDEPEND="${COMMON_DEPEND} + >=sys-apps/accountsservice-0.6.14[introspection] + app-accessibility/at-spi2-core:2[introspection] + >=app-accessibility/caribou-0.4.8 + app-misc/geoclue[introspection] + >=dev-libs/libgweather-3.26:2[introspection] + >=sys-power/upower-0.99:=[introspection] + x11-libs/pango[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.4.99[dconf(+),gtk,introspection] ) + telepathy? ( + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.19[introspection] ) +" +# avoid circular dependency, see bug #546134 +PDEPEND=" + >=gnome-base/gdm-3.5[introspection] + >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] + browser-extension? ( gnome-extra/chrome-gnome-shell ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.45.3 + dev-util/glib-utils + >=sys-devel/gettext-0.19.6 + virtual/pkgconfig +" #gtk-doc? ( >=dev-util/gtk-doc-1.17 ) + +PATCHES=( + # Patches from gnome-3-26 branch on top of 3.26.2 + "${WORKDIR}"/patches/ + # Change favorites defaults, bug #479918 + "${FILESDIR}"/${PN}-3.22.0-defaults.patch + # Fix automagic gnome-bluetooth dep, bug #398145 + "${FILESDIR}"/3.26-optional-bluetooth.patch +) + +src_prepare() { + xdg_src_prepare + # We want nsplugins in /usr/$(get_libdir)/nsbrowser/plugins not .../mozilla/plugins + sed -e 's/mozilla/nsbrowser/' -i meson.build || die + # Hack in correct python shebang + sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_use nsplugin enable-browser-plugin) + #$(meson_use gtk-doc enable-documentation) # fails in gtkdoc-scangobj call with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer python-based gtk-doc to work + -Denable-man=true + -Denable-bluetooth=$(usex bluetooth yes no) + -Denable-networkmanager=$(usex networkmanager yes no) + -Denable-systemd=$(usex systemd yes no) # this controls journald integration only as of 3.26.2 (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 + ) + meson_src_configure +} + +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} +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if ! has_version 'media-libs/gst-plugins-good:1.0' || \ + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then + ewarn "To make use of GNOME Shell's built-in screen recording utility," + ewarn "you need to either install media-libs/gst-plugins-good:1.0" + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." + fi + + 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 + + # https://bugs.gentoo.org/show_bug.cgi?id=563084 + if has_version "x11-drivers/nvidia-drivers[-kms]"; then + ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," + ewarn "otherwise Gnome will fail to start" + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml index 72552c21f405..301d00be45ca 100644 --- a/gnome-base/gnome-shell/metadata.xml +++ b/gnome-base/gnome-shell/metadata.xml @@ -15,11 +15,14 @@ Ensure the presence of extensions.gnome.org native connector gnome-extra/chrome-gnome-shell + Use sys-auth/elogind for session tracking + and suspend support. Enable support for enhanced input methods through app-i18n/ibus Skip systemd dependency (#480336), enabling this flag will become your setup to be fully unsupported by upstream and downstream Gnome team. Do not try to enable it unless completely needed + Ensure presence of telepathy chat integration diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 3d6c910d05f0..da62546d2814 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -6,6 +6,6 @@ DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909 DIST gvfs-1.34.2.1-patchset.tar.xz 2608 BLAKE2B 1041815fa35e052219df561325bab4a96e9e36c5b3afac70c6bf16f21fe3d72b70edbc59fb9df4b5b266748f6fdeb7358182bffd0eb61572d86c369a57a49bb9 SHA512 1baafda67997265ae5ad0facbdaf1d274fb400fffa3059aad40a9239b20c1362bcaa58e3a751dc575b46c5e71f94e245e625e2b12c2f178acff7d3b0dbf7c3c7 DIST gvfs-1.34.2.1.tar.xz 1822700 BLAKE2B 2de1e86bf9dfe6567c59c7d1e2032f9e749daef0a1deb27963c0b5122be5925256c02a90dae5371bed9e037137400cca8e3461f415b3bed36de4310757bced62 SHA512 ff8d2ebff220e8432584d13640747d54c78c7350c0b8b9ed8544eb311fb4211897fb8473375b246cc1271df507f5ae2dd4edc6d5fd5d2061792377f3f37ebdb1 EBUILD gvfs-1.32.1-r1.ebuild 3815 BLAKE2B a1408a9ce388b9d895a979635fa9d11757ab4c587d259112248c3043c9fd29fed18b190ad57646c655e1289e90a1ccd23b4f4ab578ffa3ee273510cfa3c9df92 SHA512 cec870f90d034016cb3e1e8a78de11e1394f5a4c949f0396e630146ec89f179c3cc3e5099e48c6ef8f55c50122420a434211ce3403fc8eba2fd2f8a507387ed0 -EBUILD gvfs-1.32.2.ebuild 3795 BLAKE2B 06e83ea11a5c06b0df5817fb4e47fb99a05d9a3e8b430c1fb2adb2e2a1d7e2a4dd39ed1407b1eede6cc21d7f3bfcbd9595936f25a63112a2c6cd9580894abb59 SHA512 003896860c17fb3fabb8f6a47fb2a1dc83d3be9347e33888c1532a010ec2cbfb1fe2b87ae4f6754a8750b0d5c4ce608636833ea3c57f4212a827172eec2e7c0b +EBUILD gvfs-1.32.2.ebuild 3794 BLAKE2B e91e16a13038e1174bf579f67d922c48e337d3c75cc29bed119ab1760452fc66133c7b7fc9881f452107c3765e19211f5e9837d0f71a8dfc8e6e7c45e03f2792 SHA512 d4c35b9ebced48c1479a84009434611f333c67d6015aa7010207e22219b1e33ae2b0456c5ecf1c0903a82a2f94251027f6ed2e3b2e5bab8c3b5c7510e8b0c66c EBUILD gvfs-1.34.2.1-r1.ebuild 3723 BLAKE2B c29d78555d93509db73f3d013a19273ef5a3fc1521658440f89e2a008889a87e91fa9e1e9fa29d29a178f1e8a8e599aa8810879e81c628bf6c391bc5b40c2cf8 SHA512 b242c56d4114118816889eed8f17cee5771f504ad9f6c6b3b99342f328de37184aecc255e4a0eab050fcb0932a148c37aab09e2e35722d7eb444bd7989bde662 MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc diff --git a/gnome-base/gvfs/gvfs-1.32.2.ebuild b/gnome-base/gvfs/gvfs-1.32.2.ebuild index 9dcbdf2ce876..5f337f4a548d 100644 --- a/gnome-base/gvfs/gvfs-1.32.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.32.2.ebuild @@ -23,7 +23,7 @@ REQUIRED_USE=" udisks? ( udev ) systemd? ( !elogind udisks ) " -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" RDEPEND=" app-crypt/gcr:= -- cgit v1.2.3