diff options
Diffstat (limited to 'gnome-base')
56 files changed, 68 insertions, 2165 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz Binary files differindex fe56d3b8e511..281905232c3f 100644 --- a/gnome-base/Manifest.gz +++ b/gnome-base/Manifest.gz diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest index c2483b9f0e3b..54ab72632059 100644 --- a/gnome-base/dconf-editor/Manifest +++ b/gnome-base/dconf-editor/Manifest @@ -1,5 +1,3 @@ -DIST dconf-editor-3.30.2.tar.xz 447060 BLAKE2B 4cd8ab7200afaa402d6915a94be12b32a58fdf11ed77d4b833e3734b94de99bf7182d3564d1e0b42935d4364b2c973c296d773de402942af8e66f4ccbe6026be SHA512 c9fe4393e9c75ad19c56670a50199493a32ed55f3135ada599aef5efb4582320a23648da1906ce1a1b64918987fd3684f00bfc749a21a6fd2806066d760418c8 DIST dconf-editor-3.34.2.tar.xz 560308 BLAKE2B 9172a4dd77765d067228c6652b004bd6811c71a83bb4191a71ef70181a5e0aa1c3bca6d655c76eb032793eb5c39364ece23337fa86d1a6e31e59391a3554933e SHA512 6c2d89d2d62a768b669ca49e0298bddf4f4151358f0fc0314431c7f926df2323ac3b61540f2a3c95c7b5a88e4e2f08dae4d00f601506c9610a0edee4b00ba499 -EBUILD dconf-editor-3.30.2.ebuild 886 BLAKE2B ee774ea1520e6b9609c9a3b522202a31eacbf7111338bdd602b323269128d086de0f8aede730644f8bb084641a42bf8b9ba395daa1345860bac81c802d54c02d SHA512 df719bc9d729170c77a15d5a717820eb041927960a0a1c5373003b60da9001cef36b74443ba3ffb07732588f4528f87bf6d80673ad4d442dd2c9656fc127a509 EBUILD dconf-editor-3.34.2.ebuild 817 BLAKE2B 098901e2cfe74c2ac41d84b3e33c476bb14c7f79df824b05caa1b7499892ec0a012f2389001909501a5ad7621c75dc554b2fd32f7006f5f94c21a74597586663 SHA512 6dcc2a9aa8bbd35e309c1ae5ddc3fc747a92937b8b2a3539c6eb2e6ee5a2daaee79d42a12bf766c9990dbe5333a227ff331d3a01282082b0222ec183871f2744 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/dconf-editor/dconf-editor-3.30.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.30.2.ebuild deleted file mode 100644 index ed7bd641c7b7..000000000000 --- a/gnome-base/dconf-editor/dconf-editor-3.30.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VALA_MIN_API_VERSION="0.40" -VALA_MAX_API_VERSION="0.42" - -inherit gnome.org gnome2-utils meson vala xdg - -DESCRIPTION="Graphical tool for editing the dconf configuration database" -HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor" - -LICENSE="GPL-3+" -SLOT="0" - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-linux" - -RDEPEND=" - >=gnome-base/dconf-0.26.1 - >=dev-libs/glib-2.55.1:2 - >=x11-libs/gtk+-3.22.27:3 -" -DEPEND="${RDEPEND} - $(vala_depend) - dev-libs/libxml2:2 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_prepare() { - vala_src_prepare - xdg_src_prepare -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_icon_cache_update - gnome2_schemas_update -} diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest index c51031926b60..0edc0ebfe7b6 100644 --- a/gnome-base/dconf/Manifest +++ b/gnome-base/dconf/Manifest @@ -2,10 +2,7 @@ AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b05 AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a08f4977c856a94321b616e5135b3618477a44812a7429148018c915d716f35c6296e3c72c247970adedc9331af7bfdc6 SHA512 a4b9a1c6b6f16a4f5ea7a250d0a2949c1906813cefc985706575865abc03dc715f6d283887b081bc906a7a439fff0ef4fac57b3de3a4ea40ba2dc19e51db4664 DIST dconf-0.26.1.tar.xz 218516 BLAKE2B ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da -DIST dconf-0.30.1.tar.xz 104376 BLAKE2B c5a90c092b6e028dafbc9aee2f29f622dc4a696e815266355de4a056fe507b0cca9eaa9b10753501ee44f74ee57d0095fd55aafc7205ffea1f0321ed705dbe0b SHA512 f7d136aec7cb75b64c7d9446d520f4c4af368e6d22346b7bb8ad66c08afaa03a72aacd44016dae7690e37b7d0deb9a16187445db176427a12a8b3cd3885c9e03 DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0 EBUILD dconf-0.26.1.ebuild 1476 BLAKE2B 2cc966193509f00c2ef23dcb6712f60c0c7894c91aaff397b2d067123c7f7be4ea8a27121bb1578c6a111fe7206406722158538c9458944f41790e462fb77d3c SHA512 f5bb74a43f300ac4b0c1042d67d44f2414fbc9621ab1c753ce68804c0d6ce2b42afe830fcde32d4b683ab05f06723050704bde6c54cac58e54f2b786a3445e2b -EBUILD dconf-0.30.1.ebuild 1906 BLAKE2B 4a9e6b53080395b0449bce434beb1b8b2efd61a1bd4cdefe6ff8a380288451d3cc60a87eb3591c465b25ee70a2416c2b486b041894a52e7d1fa98bb05dfdf5c9 SHA512 4d0372ba27f1e088b17973fe00f042a57f1dc07989f15216c79a7884ad5ca8239d7b8b67d73d3ff32aac953ad492cc540e01fd169a8d6c18aeb7369d845fa1b8 -EBUILD dconf-0.32.0-r1.ebuild 2204 BLAKE2B 027128c7dee3ce99a765f57e792e7c290ac965be8675b3aa41ba2e9f2f33812a24298808b88440081a6f343be95c037cedda9c679846913cd3f679b127436f9b SHA512 d1073cefd7de8def9618dd7c15794e8e77a82a52746260cfbaef68a8f46b065c10ca7143b0473774ef1271a7a951afcd35902fab1a20fd11d92f4907d050ccb1 -EBUILD dconf-0.32.0-r2.ebuild 2194 BLAKE2B 98733409e9df5f8dc82352603de66d0c63a40d779d80042adbfd8bfe4d12247843a4a2fdfbd2b08c878e31a18aeb1326ba3a62b0c095be09b71d3c26fb081505 SHA512 7b522e025d8c97a9f329668017b4cf341f934f7a68f2356e614f642929dcc0b948d6996aff5c97d7d8ef78719013c7afb65934a4db4badaf85ab805ef54d1754 +EBUILD dconf-0.32.0-r2.ebuild 2193 BLAKE2B a3fb1c375960e8e57520dcc26f16eec1dd99d90eb471a9fd7875235c15de8de5fbd5b322f36ad5cad78acc12c08499c3bdcef60b3095b01be79397b9d0bfd6e3 SHA512 a04489e696e524fe5c62941f4a0278b79dbe1a72a249b1b37f539391a02fe0e810df5daefe7cc3e440c317ba32b850093efdbc7abcfce470dffe08427fafff78 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/dconf/dconf-0.30.1.ebuild b/gnome-base/dconf/dconf-0.30.1.ebuild deleted file mode 100644 index e52bab8ebd0a..000000000000 --- a/gnome-base/dconf/dconf-0.30.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit bash-completion-r1 gnome.org gnome2-utils meson vala virtualx xdg - -DESCRIPTION="Simple low-level configuration system" -HOMEPAGE="https://wiki.gnome.org/Projects/dconf" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" -IUSE="gtk-doc" - -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - sys-apps/dbus -" -DEPEND="${RDEPEND} - $(vala_depend) - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/gdbus-codegen - gtk-doc? ( >=dev-util/gtk-doc-1.15 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - <dev-util/meson-0.52 -" # problem with meson-0.52+ https://gitlab.gnome.org/GNOME/dconf/issues/59 - -PATCHES=( - "${FILESDIR}"/${PV}-bash-completion-dir.patch -) - -src_prepare() { - xdg_src_prepare - vala_src_prepare -} - -src_configure() { - local emesonargs=( - -Dbash_completion_dir="$(get_bashcompdir)" - -Dman=true - $(meson_use gtk-doc gtk_doc) - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -src_install() { - meson_src_install - - # GSettings backend may be one of: memory, gconf, dconf - # Only dconf is really considered functional by upstream - # must have it enabled over gconf if both are installed - echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf - echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf - doenvd 51dconf -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_giomodule_cache_update - - # Kill existing dconf-service processes as recommended by upstream due to - # possible changes in the dconf private dbus API. - # dconf-service will be dbus-activated on next use. - pids=$(pgrep -x dconf-service) - if [[ $? == 0 ]]; then - ebegin "Stopping dconf-service; it will automatically restart on demand" - kill ${pids} - eend $? - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_giomodule_cache_update -} diff --git a/gnome-base/dconf/dconf-0.32.0-r1.ebuild b/gnome-base/dconf/dconf-0.32.0-r1.ebuild deleted file mode 100644 index f4c1fa46b5c9..000000000000 --- a/gnome-base/dconf/dconf-0.32.0-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg - -DESCRIPTION="Simple low-level configuration system" -HOMEPAGE="https://wiki.gnome.org/Projects/dconf" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" -IUSE="gtk-doc" -RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass - -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - sys-apps/dbus -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/gdbus-codegen - gtk-doc? ( >=dev-util/gtk-doc-1.15 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - <dev-util/meson-0.52 -" # problem with meson-0.52+ https://gitlab.gnome.org/GNOME/dconf/issues/59 - -PATCHES=( - "${FILESDIR}"/0.30.1-bash-completion-dir.patch - "${FILESDIR}"/${PV}-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep -) - -src_configure() { - local emesonargs=( - -Dbash_completion_dir="$(get_bashcompdir)" - -Dman=true - $(meson_use gtk-doc gtk_doc) - -Dvapi=true - ) - meson_src_configure -} - -src_install() { - meson_src_install - - # GSettings backend may be one of: memory, gconf, dconf - # Only dconf is really considered functional by upstream - # must have it enabled over gconf if both are installed - # This snippet can't be removed until gconf package is - # ensured to not install a /etc/env.d/50gconf and then - # still consider the CONFIG_PROTECT_MASK bit. - echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf - echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf - doenvd 51dconf -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_giomodule_cache_update - - # Kill existing dconf-service processes as recommended by upstream due to - # possible changes in the dconf private dbus API. - # dconf-service will be dbus-activated on next use. - pids=$(pgrep -x dconf-service) - if [[ $? == 0 ]]; then - ebegin "Stopping dconf-service; it will automatically restart on demand" - kill ${pids} - eend $? - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_giomodule_cache_update -} diff --git a/gnome-base/dconf/dconf-0.32.0-r2.ebuild b/gnome-base/dconf/dconf-0.32.0-r2.ebuild index a036e7103d2a..8aec7858a179 100644 --- a/gnome-base/dconf/dconf-0.32.0-r2.ebuild +++ b/gnome-base/dconf/dconf-0.32.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" IUSE="gtk-doc" RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 97596fa36e26..cbe0c67b40e2 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,4 +1,3 @@ -AUX 3.30.3-pam-drop-legacy-arg.patch 1123 BLAKE2B ada164a258734709da57dd7b3c098a7475100edb0fd56ebb815c7dffbddb314d208646bdf6bca6e4465fdf0dc4dd995384f28b88dabf538cd9945d7490cdfae9 SHA512 f71e94e5a20183bb246b42ce090c958595c18cef264418af82fd564afc98de1d8b0a051a236ed1a6d5719027ddcf67b3a0dd1800f26dcb257403575961ed32d9 AUX 49-keychain-r1 193 BLAKE2B e4653256b9a0a23be84286d25278d2addf464cc541d43f57a33ed0390b562d03acf7f9d8510ad1b09d4a3736d2bb2a323f5fcc473014b6f351abb5bee71a419b SHA512 32a6d72de9b6b7bfbac0a563fc8710576419e6d989fe48da294b92b197722059ee0e46672d5df2833cd1a7dacf5ae4ebc31b12b605416fd25a0924c35e505d21 AUX 50-ssh-agent-r1 255 BLAKE2B d197daa7db7da3fc667e5bd561d2edf46b484365130a2d72259c4a2f316ec3af957599cd2c755f7e517ff32ed59e068d1dbcd47da6961534668786403590ff20 SHA512 85c8eca948646508ecc52a30a15b94c626196037ab65b4d797df472df34c714aacf800261902febda5b7bc051bff29efc9fff474a0c029838881b7f8704b13ba AUX default.pa 328 BLAKE2B 558dbedcb5a0f31e0bdc01ce21deaeacb4740dee998f8b2f947361745ea6680acf8662e426adf1d3f777af714c2fb7cf5ec74b2807187c37e2d8d896e863fa0d SHA512 4f0e9c38ae0c17b8f4ee6e37b87259676c4ff4e62fd315989c9e20012a8070c5b5571f835379639f76f157530495928cdc79265473478b1d9fe6d8ad0d64785d @@ -7,9 +6,7 @@ AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5 AUX gdm-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b -DIST gdm-3.30.3.tar.xz 1261224 BLAKE2B 338f946a24d2a7e4b3cf34ac6accff01f8e7ce5032ee4ce79a96b1a755693e09788c6225e45de9a91ae4afea595a0562511104a467e561ec179c3ad61810468f SHA512 17aed5bf7d27b07553703873cda28a711d6135497d36e4c241bcf1ab3552b31007cc241dab394dccf8a4f1daccf7d55ba39edf91f4b22bdea5c2aa1ea17404b8 DIST gdm-3.32.0.tar.xz 1262344 BLAKE2B bbc580f788fe2ce8783f044eb8109ce0086b1bb078bafaeb6efd833689848ef6570bb0fd0e6e260a388e7c1a6d3cdccb36264a640151e9b6e5d81ca9c35f3be3 SHA512 88016d0f800030a561e0360c63fdcb8499a605126f99a5a9f89606e086d7a934afc091843b2acd9091c1c643e7468ee31ae9a5b6264ae38064618ad577ef7ac0 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 -EBUILD gdm-3.30.3-r3.ebuild 7812 BLAKE2B 46666b52d11813d2e4bdf2b9a28962318736c207c17f41c9c6e7174aeeb7a4693889af01d36f208d09273a1993db577a758a73a6de479fff83a41258c0bec3ce SHA512 093db9dbe9ee56b833e33d7dcae61cebf9a351bef555d450ad67ec77166c9dc3d3b7d13d05127679f402644efa46ff0c802bbc236681b5bff34ac8c48dc4862d EBUILD gdm-3.32.0.ebuild 7698 BLAKE2B b765057dca3b0f0d883ff0fc14f5367cf6f19e2f9dadcc4bb3beae99b34293173cefd9f53e38ea421910085b57e01e63e3bdab9656d7b69876d00504a77c8917 SHA512 a41b16c81cefbc62b2afa5e6971c90872472bce3187352efb5fd1f3a01cda074ba2abc763a68f0fee47c85160d7ceb2c89e58037f561b72b61bf7586f688886c MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d diff --git a/gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch b/gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch deleted file mode 100644 index 8d82a284bf50..000000000000 --- a/gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a26ed5502622c22daa175861fa9d651a32131cf5 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -Date: Sat, 16 Feb 2019 08:47:45 +0100 -Subject: [PATCH 1/2] pam-exherbo: drop legacy pam_systemd argument - -kill-session-processes=1 is long gone - -Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -(cherry picked from commit 13e6666b1e1000d757ac5621a83105110f55e3e3) ---- - data/pam-exherbo/gdm-launch-environment.pam | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/pam-exherbo/gdm-launch-environment.pam b/data/pam-exherbo/gdm-launch-environment.pam -index 8c13b3bc..51a8e003 100644 ---- a/data/pam-exherbo/gdm-launch-environment.pam -+++ b/data/pam-exherbo/gdm-launch-environment.pam -@@ -8,7 +8,7 @@ auth required pam_permit.so - - password required pam_deny.so - ---session optional pam_systemd.so kill-session-processes=1 -+-session optional pam_systemd.so - session optional pam_keyinit.so force revoke - session required pam_succeed_if.so audit quiet_success user = gdm - session required pam_permit.so --- -2.17.0 - diff --git a/gnome-base/gdm/gdm-3.30.3-r3.ebuild b/gnome-base/gdm/gdm-3.30.3-r3.ebuild deleted file mode 100644 index 2f4a5cbe291b..000000000000 --- a/gnome-base/gdm/gdm-3.30.3-r3.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit eutils gnome2 pam readme.gentoo-r1 systemd udev 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 bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama" -RESTRICT="!test? ( test )" -REQUIRED_USE="^^ ( elogind systemd )" - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~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.44:2 - dev-libs/libgudev - >=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-base/xorg-server - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libxcb - >=x11-misc/xdg-utils-1.0.2-r3 - - sys-libs/pam - elogind? ( >=sys-auth/elogind-239.3[pam] ) - systemd? ( >=sys-apps/systemd-186:0=[pam] ) - - sys-auth/pambase[elogind?,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/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto - test? ( >=dev-libs/check-0.9.4 ) - app-text/yelp-tools -" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup) - -DOC_CONTENTS=" - To make GDM start at boot with systemd, run:\n - # systemctl enable gdm.service\n - \n - To make GDM start at boot with OpenRC, edit /etc/conf.d to have - DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n - # rc-update add xdm - \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" - - # Drop legacy argument to pam_systemd.so, included in 3.32 - eapply "${FILESDIR}/${PV}-pam-drop-legacy-arg.patch" - # Support pam_elogind.so in gdm-launch-environment.pam - eapply "${FILESDIR}/pam-elogind.patch" - - # Wait 10 seconds for a DRM master with systemd. Workaround for gdm not waiting for CanGraphical=yes property on the seat. Bug #613222 - eapply "${FILESDIR}/gdm-CanGraphical-wait.patch" # needs eautoreconf - - # Show logo when branding is enabled - use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch" - - gnome2_src_prepare -} - -src_configure() { - # 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 - # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which - # saves on memory. However this means if we don't start on VT1, gdm doesn't start up - # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1, - # so lets try always having it in VT1 and see if that is an issue for people before - # hacking up workarounds for the initial start case. - # ! use plymouth && myconf="${myconf} --with-initial-vt=7" - local myconf=( - --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-udevdir=$(get_udevdir) - --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec - --without-xevie - $(use_enable systemd 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) - ) - - if use elogind; then - myconf+=( - --with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility - SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null` - SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null` - ) - fi - - gnome2_src_configure "${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 - - if ! use bluetooth-sound ; then - # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10 - # bug #679526 - insinto /var/lib/gdm/.config/pulse - doins "${FILESDIR}"/default.pa - fi - - # 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 - local d ret - - # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm - ret=0 - ebegin "Fixing "${EROOT}"var/lib/gdm ownership" - chown --no-dereference gdm:gdm "${EROOT}var/lib/gdm" || ret=1 - for d in "${EROOT}var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do - [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1 - done - eend ${ret} - - systemd_reenable gdm.service - readme.gentoo_print_elog -} diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest index 24cc2c921a1e..b3cd9d5283a4 100644 --- a/gnome-base/gnome-core-libs/Manifest +++ b/gnome-base/gnome-core-libs/Manifest @@ -1,3 +1,2 @@ -EBUILD gnome-core-libs-3.30.2.ebuild 1153 BLAKE2B 33d95d463dd035be5025a64f4cad3760b29fed14d53af7b1ce02ed4e272f4542ec7522bd0df9deec24a0ab1b0a67da270578f336b3fdd246cb53198118d4152a SHA512 cf220028cf5c89287955faa0d06d4e6592d31ef3824d85a3c3d262c2a056bd537d674ea3a260643a9d5eaf87deaa6438d0d5448d29f6cf27a4dfce6ab59ef7f2 EBUILD gnome-core-libs-3.32.2.ebuild 1164 BLAKE2B d5e1183c0833343da129516cf03526e106799a6c3635fd6f380b119c76ee6257c7aa22a58f2747e5ef4ec1289dbc72f95b4b6d47b15a0bb1a0139e519c1f3d8a SHA512 4c6b60fef6903517ee674ea1353473a433651235d0ccb91a194e5d7f0737298149ff13d18f0c97cfb78556a334bdbb96eea02220a504b3ac6e877765d034beaa MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.30.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.30.2.ebuild deleted file mode 100644 index 6385e4054654..000000000000 --- a/gnome-base/gnome-core-libs/gnome-core-libs-3.30.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Sub-meta package for the core libraries of GNOME 3" -HOMEPAGE="https://www.gnome.org/" -LICENSE="metapackage" -SLOT="3.0" -IUSE="cups python" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" - -# Note to developers: -# This is a wrapper for the core libraries used by GNOME 3 -RDEPEND=" - >=dev-libs/glib-2.58.1:2 - >=x11-libs/gdk-pixbuf-2.38.0:2 - >=x11-libs/pango-1.42.4 - >=x11-libs/gtk+-3.24.1:3[cups?] - >=dev-libs/atk-2.30.0 - >=gnome-base/librsvg-2.40.20 - >=gnome-base/gnome-desktop-${PV}:3 - >=x11-libs/startup-notification-0.12 - - >=gnome-base/gvfs-1.38.1 - >=gnome-base/dconf-0.30.1 - - >=media-libs/gstreamer-1.14.4:1.0 - >=media-libs/gst-plugins-base-1.14.4:1.0 - >=media-libs/gst-plugins-good-1.14.4:1.0 - - python? ( >=dev-python/pygobject-3.30.1:3 ) -" -DEPEND="" - -# >=x11-libs/libwnck-3.24.1:3 - not used by core packages anymore -# librsvg kept back on non-rust version; should move on at some point for non-exotic arches. - -S="${WORKDIR}" diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest index fc5a5a338d89..b54186d4ac36 100644 --- a/gnome-base/gnome-desktop/Manifest +++ b/gnome-base/gnome-desktop/Manifest @@ -3,11 +3,8 @@ AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c026 AUX gnome-desktop-2.32.1-gold.patch 493 BLAKE2B 4a7e5a1d834bb2a8f753e279a96875a34e25126a4a51167a37bcc2d749e1c28694bc53ee32ffe5490e20f6dc1a4f82e9201b5d9753928119be2ff2f3e19ba53b SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e55c08269813dcc5f6acd863c2f845b75efb1879c36539c7690e9812ed034a4756da6b04bd271ecd9f3f07e22831edd6c7e81734 SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263 DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 -DIST gnome-desktop-3.30.2.3-patchset.tar.xz 3568 BLAKE2B 20d13d7e396d7cddcfb6f761815df7ce6a2d910be5e9588eac519ade536848cfc09d1aca0e4478f97177b8ee26f8049da21542d502b427973991b47c7097bbe3 SHA512 8b9eab01e79e3d67dec51ed07a086f04df1890e638a0c1696742cf5e3b6a42dccbd514fc3cfd3610791c4905346847af83e813845ad14e0b57b790fedd0ae8e0 -DIST gnome-desktop-3.30.2.3.tar.xz 1164500 BLAKE2B e78256bc3319ea9794b4666c82eb466a0c884fd43c3c776fd08aaf789905893ff93acec35a1fb6903c0049b3a169afe5b43a71ac1e93e8c63c013682c3316fa8 SHA512 36303de8fa70e65c40aeb7862156fa404b965d1724171ec5bb0a00cb1049efbfba79cdcff76278f53e4e27199f1ef9dcb574b0f465b0f4e04bb46c50d516ad0f DIST gnome-desktop-3.32.2-patchset.tar.xz 7404 BLAKE2B ecc821d3338957d0a123d625607d727019d9500915a76ff6d10d3000e1fc1e51fc7c0382374752582aef641d005cd73d39148466b08c53dc1ce9872e73a21215 SHA512 0471f0a6d9213ea60e867bd4f381575f6a94fa0fde57cc1a360e2d4ef98c11f2f973d3d95347db8f24aacb2249ba84ffc4e35e05bb595d9d3b6debe561ed88da DIST gnome-desktop-3.32.2.tar.xz 709128 BLAKE2B f0335d1ad583f0b000c47826cd4b6eb24624862b22b00e9d42759ed1cfcf3dba6f091dd85504c9c8da8b9789bf78cf53d284942ba6e2d3c630db028b4a0a69c6 SHA512 7dfa5c3e4b77637cc40e6244eb8ce8cb314cf92d865b64e36c5dffa8a699e91c81bd359f0a89a725c064eafec965d2b9d119aa05f1de103cd836a4bff9119a99 EBUILD gnome-desktop-2.32.1-r2.ebuild 2280 BLAKE2B afbcfbea1a172b979f0a75d8001f73d54209d1a3fc65068839c111176de2dccb22ab354409a6137e350033c8b40a496dc8a5759c3b29d9993ae83e5b4c0988b2 SHA512 1e22d82e37a229e0ce46c6104338e8d82cac2faa1315ac5ea8a0926a15a469cf02211b5a3be22b962d29cdb177212eeeb765b70f0af42fb2678cfa3ad17e5497 -EBUILD gnome-desktop-3.30.2.3.ebuild 1994 BLAKE2B e09092e0d3cf0da0eff86def5ba4ebcc44f5cc6184166cc7b2b697a059fdb9b9a3692a21439966db1a20b35c7bb0cd695d7c50b0d3bb3a6089c7de6c39441871 SHA512 454cb2ede06237150b80f289657bb1d85fe0e99e8d3e660915d68d8753eabf39ac3032d42a191a366c830039557b74430db88fb66f4e2771f4d82a2ce0d82cd3 EBUILD gnome-desktop-3.32.2.ebuild 2261 BLAKE2B 5c6b7386f6c18eb1b84da612019de9130dc2bc1e6f3bfbd74a210638f8a681bea72166c5076d6b02b36d39da58f9829e46980a9042cd90b6ff6dfc06224eac48 SHA512 9b2dd6a07c468d6402976a70da0605f2694f73f65b904605783027d2ce21bef6f417554f080f3a954a0915260837e584273a1baf3c68c70b924ab4d97807cd2d MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.30.2.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.30.2.3.ebuild deleted file mode 100644 index 64e40e19554b..000000000000 --- a/gnome-base/gnome-desktop/gnome-desktop-3.30.2.3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -inherit gnome2 virtualx - -DESCRIPTION="Library with common API for various GNOME modules" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" -SLOT="3/17" # subslot = libgnome-desktop-3 soname version -IUSE="debug +introspection seccomp udev" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" - -# cairo[X] needed for gnome-bg -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.53.0:2 - >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] - >=x11-libs/gtk+-3.3.6:3[X,introspection?] - x11-libs/cairo:=[X] - x11-libs/libX11 - x11-misc/xkeyboard-config - >=gnome-base/gsettings-desktop-schemas-3.27.0 - introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) - seccomp? ( sys-libs/libseccomp ) - udev? ( - sys-apps/hwids - virtual/libudev:= ) -" -RDEPEND="${COMMON_DEPEND} - !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] - seccomp? ( sys-apps/bubblewrap ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - >=dev-util/gtk-doc-am-1.14 - dev-util/itstool - >=sys-devel/gettext-0.19.8 - x11-base/xorg-proto - virtual/pkgconfig - media-libs/fontconfig - app-text/yelp-tools - sys-devel/autoconf-archive -" # yelp-tools and autoconf-archive for eautoreconf -# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto - -PATCHES=( - "${WORKDIR}"/patches/ # Requires eautoreconf. https://gitlab.gnome.org/Community/gentoo/gnome-desktop/compare/3.30.2.3...gentoo-3.30.2.3 -) - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --with-gnome-distributor=Gentoo \ - --enable-desktop-docs \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable debug debug-tools) \ - $(use_enable introspection) \ - $(use_enable udev) -} - -src_test() { - virtx emake check -} diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest index 80e926335ad9..a393a84d8244 100644 --- a/gnome-base/gnome-extra-apps/Manifest +++ b/gnome-base/gnome-extra-apps/Manifest @@ -1,3 +1,2 @@ -EBUILD gnome-extra-apps-3.30.2.ebuild 2473 BLAKE2B 90a3c87bd618580b0aa7063e072ff353fdd58952a0586efbe272f6e6aee48dbd46d6acf0f99b7c181ec266e2265162a2f87f482509f6f81368b462f592e0d3c0 SHA512 5e0563253a44e8d906bf1ba2ca919a211e3ab7f4dd4e503aad92925e5c829e9a752079e2084033857e570c24f054424ba6be55f0cbea6cf032fdbf5c14b9c626 EBUILD gnome-extra-apps-3.32.2.ebuild 2487 BLAKE2B a8feb735675c94dd442b7a241e48d246f5f4f955e53fd092ac5f5df93ab8fac004ffbbb695a2c6dc833b8926628de9523888a974b6acfae0002c2f73d28c47ce SHA512 b4f3168d5a54cd4bbfb858a742d1ec818e0fac127a64acfb771db05f20b5f75c32b4301a47012e1a3b7533d061afc6060d6f828bdbfcdfacec105dc7805be59e MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.30.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.30.2.ebuild deleted file mode 100644 index 6c78e1ebc640..000000000000 --- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.30.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Sub-meta package for the applications of GNOME 3" -HOMEPAGE="https://www.gnome.org/" -LICENSE="metapackage" -SLOT="3.0" -IUSE="+games share +shotwell +tracker" - -KEYWORDS="amd64 ~arm64 x86" - -# Note to developers: -# This is a wrapper for the extra apps integrated with GNOME 3 -# Keep pkg order within a USE flag as upstream releng versions file -# TODO: Should we keep these here: gnome-dictionary, gucharmap, sound-juicer, vinagre, vino; replace gucharmap with gnome-characters? -# gnome-documents removed for now, as it didn't find a good place upstream and is getting dropped from default sets for distros for 3.30 (and for 3.26 it required newer tracker than we had at the time) -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV} - - >=sys-apps/baobab-3.30.0 - >=media-video/cheese-3.30.0 - >=www-client/epiphany-${PV} - >=app-arch/file-roller-3.30.1 - >=gnome-extra/gnome-calculator-3.30.1 - >=gnome-extra/gnome-calendar-3.30.0 - >=gnome-extra/gnome-characters-3.30.0 - >=sys-apps/gnome-disk-utility-${PV} - >=media-gfx/gnome-font-viewer-3.30.0 - >=media-gfx/gnome-screenshot-3.30.0 - >=gnome-extra/gnome-system-monitor-3.30.0 - >=gnome-extra/gnome-weather-3.26.0 - >=gnome-extra/gucharmap-11.0.3:2.90 - >=gnome-extra/sushi-3.30.0 - >=media-sound/sound-juicer-3.24.0 - >=net-misc/vino-3.22.0 - - >=gnome-base/dconf-editor-${PV} - >=app-dicts/gnome-dictionary-3.26.1 - >=mail-client/evolution-${PV} - >=gnome-extra/gnome-tweaks-${PV} - >=gnome-extra/nautilus-sendto-3.8.6 - >=net-misc/vinagre-3.22.0 - - games? ( - >=games-puzzle/five-or-more-3.30.0 - >=games-board/four-in-a-row-3.28.0 - >=games-board/gnome-chess-3.30.1 - >=games-puzzle/gnome-klotski-3.22.3 - >=games-board/gnome-mahjongg-3.22.0 - >=games-board/gnome-mines-3.30.1.1 - >=games-arcade/gnome-nibbles-3.24.1 - >=games-arcade/gnome-robots-3.22.3 - >=games-puzzle/gnome-sudoku-3.30.0 - >=games-puzzle/gnome-taquin-3.30.0 - >=games-puzzle/gnome-tetravex-3.22.0 - >=games-puzzle/hitori-3.22.4 - >=games-board/iagno-3.30.0 - >=games-puzzle/lightsoff-3.30.0 - >=games-puzzle/quadrapassel-3.22.0 - >=games-puzzle/swell-foop-3.30.0 - >=games-board/tali-3.22.0 - ) - share? ( >=gnome-extra/gnome-user-share-3.28.0 ) - shotwell? ( >=media-gfx/shotwell-0.30.1 ) - tracker? ( - >=app-misc/tracker-2.1.5 - >=app-misc/tracker-miners-2.1.5 - >=media-gfx/gnome-photos-3.30.1 - >=media-sound/gnome-music-3.30.2 ) -" -DEPEND="" -S=${WORKDIR} diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest index 610d1c695a2e..ee5adc71ea1f 100644 --- a/gnome-base/gnome-keyring/Manifest +++ b/gnome-base/gnome-keyring/Manifest @@ -2,8 +2,6 @@ AUX 3.31.91-fix-musl.patch 779 BLAKE2B 72dc9001d17dcec1a2612a19e0edb358398a36dc3 AUX 3.31.91-race-fix1.patch 1503 BLAKE2B cd90c630835f5e5c85ec6fc432ea10cc17aeec6bf7edbd42a6fecccc2426c4ee54135394f71d8ac8cfcd84062a465baf91dd85c29decd4e9db5c8bf39a719d8d SHA512 64ba00999370283d33f998ee6ed5f26cfaa685ea53a169a3bb0a1a28fe7229331ab388ef86fa3322deb3e454d850bb82c390686fad51cd69dc5005deac8dfb9a AUX 3.31.91-race-fix2.patch 3510 BLAKE2B 706a88941bb9beb46209e45cbfbf72e4f8b7a5fb0abaffe55b213dd7d86584d03c50bf317fd5e266e540a9fcf454c44468ab4c03808e15702a301ba9388083e0 SHA512 8e90901cfae13793972eb4be903995ff11bde6d78a0c72db4ecde0dcf76b44496d398cd14c60f689d7720d0356abd85b4ccc523a5b57cede3e97cba394d223d8 AUX 3.31.91-ssh-tests-fix.patch 3854 BLAKE2B 2cf3f6fc133960f0b4e7d07b0358a3075dd8289b1960164f613ec6aef4d6807302a7424fd770b2f399add63a1d1a32539264ee8625f271f00f557c17c09626fb SHA512 29b50f3530c29b158d65dadfdbac8a45fdf06e22b0f6e8de0596aca78e4e410ca99cadf0aeb7a6b23b6d7c1df1e40ae179fe380c5a3a9d89f7425a222d1ca444 -DIST gnome-keyring-3.28.2.tar.xz 1322108 BLAKE2B 416697befb7670c3b854ff8d70626d495f5ba77691a062f854360e25a76766f5023e998b86114d36965023a5efefc2eb0ab1dca9aa03d73351eafebaa4920784 SHA512 a51bc9d6bc9203b86febe99bdbf893d3ba0eeaad976ece2bd49efc3869bd1d15f440a01999ce969f845f8336538de22e9f1161da990d707cbadb99d5cc3549bc DIST gnome-keyring-3.31.91.tar.xz 1365052 BLAKE2B fed6ac7bb5a509e268180d047cd5df1564d5a90672f5240fa98773f43d9ca7eb63c598d81c4a9de8e988ee5886679bceeb4be1c43acce876680aeb3df4385856 SHA512 c66ad13fd84764f01e75de2d6142ecb42954d6111f86738c27e7b5b94e702be2af5af7f83ba4e4b9aae58cfa04f3973e272c8177179d1f8a54f63c037aea0210 -EBUILD gnome-keyring-3.28.2.ebuild 2157 BLAKE2B 23843287da57241b3db0e5d127d6c594664118e0f87c0708dfa5d8f35feeb6f9e6f1f142fd26b5bf044250a3c983dba6f15eda1b7a0943e65bd6f8b71476b589 SHA512 c7c6f0346fdaefb1d2a5589d03309e1f20b5d7456cf3d51533e5727c10dba530ef50973a381a67bc5e89caf5d7b3c775f9e1914d41dd7d2fcf5ed2981cac71e5 -EBUILD gnome-keyring-3.31.91-r1.ebuild 2387 BLAKE2B 44a5a953771315409988721d70df3a8250eb21490afa517a303fad45a40db7a439d2378dfedaafdce1aeabfef62edef6da8b027552e295c7adf9d4fc3e51523e SHA512 61de8aa04adddbd0275c249915a88e20ac5d2a164b8dfc60a6cf5b14e14a72e2fd5353c5f38d997684366a6a18e6a5fd8e6c4149cea859b532e6674da4c9d903 +EBUILD gnome-keyring-3.31.91-r1.ebuild 2385 BLAKE2B 6686182c5d3b779fa50ef4d45a8314ee352027e536a5b7ed1e87f596ed1f71bde10016a1be5cd90cafdf6cf5e450dd2010d40a40dc885a292811398b0225678b SHA512 6a2c6af17556cc42ff250d881db33a4ab3097a8568404296cbb062cb4815d08f7920ef89e32f6aa3e9406acde81ffb901da546be7dbffadfc023e22622224b39 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild deleted file mode 100644 index 42e5bc533053..000000000000 --- a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit fcaps gnome2 pam python-any-r1 virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+caps pam selinux +ssh-agent test" -RESTRICT="!test? ( test )" -KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 -RDEPEND=" - >=app-crypt/gcr-3.27.90:=[gtk] - >=dev-libs/glib-2.44:2 - app-misc/ca-certificates - >=dev-libs/libgcrypt-1.2.2:0= - caps? ( sys-libs/libcap-ng ) - pam? ( sys-libs/pam ) - selinux? ( sec-policy/selinux-gnome ) - >=app-crypt/gnupg-2.0.28:= - ssh-agent? ( net-misc/openssh ) -" -DEPEND="${RDEPEND} - >=app-eselect/eselect-pinentry-0.5 - app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( ${PYTHON_DEPS} ) -" -PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512 - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # Disable stupid CFLAGS with debug enabled - sed -e 's/CFLAGS="$CFLAGS -g"//' \ - -e 's/CFLAGS="$CFLAGS -O0"//' \ - -i configure.ac configure || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_with caps libcap-ng) \ - $(use_enable pam) \ - $(use_with pam pam-dir $(getpam_mod_dir)) \ - $(use_enable selinux) \ - $(use_enable ssh-agent) \ - --enable-doc -} - -src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die - GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check -} - -pkg_postinst() { - # cap_ipc_lock only needed if building --with-libcap-ng - # Never install as suid root, this breaks dbus activation, see bug #513870 - use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon - gnome2_pkg_postinst - - if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then - ewarn "Please select pinentry-gnome3 as default pinentry provider:" - ewarn " # eselect pinentry set pinentry-gnome3" - fi -} diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild index 5b4c89f63339..270020127d01 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2+" SLOT="0" IUSE="+caps pam selinux +ssh-agent test" RESTRICT="!test? ( test )" -KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 RDEPEND=" diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest index e61454049da9..e942b3919892 100644 --- a/gnome-base/gnome-menus/Manifest +++ b/gnome-base/gnome-menus/Manifest @@ -2,5 +2,7 @@ AUX gnome-menus-3.13.3-multiple-desktop.patch 5094 BLAKE2B 8f70982804f8c8778e0e0 AUX gnome-menus-3.13.3-multiple-desktop2.patch 781 BLAKE2B 2da46999a7943a61b0032c77e863b201f9a46598dc5da385b5529afa62d3f826373d315132cd1580ef1e63f264e7cc61ca51757ae2bd509e409b4408f3e9cae9 SHA512 e48c3a35fae90e35bffc1a36713d3b5122de7edb5369a4e34b04c49030a0c33937ad24099814e3003c887d5a0369b9cc927445f965ec2a2cfa9ac55858404f4d AUX gnome-menus-3.8.0-ignore_kde_standalone.patch 1665 BLAKE2B 97e21c328c44620d7cacfd302907d846d0d58c86c4e2709231f94318bde97825f59f85616c47d475ec5c1fec969a8d46301532deeb03ab910df2f9cec5692a5e SHA512 db461006883594de834fff029b3aa769afa6955bc94062865d8c71ec224fdd64867693763c3ecb98921c98c7410bacf18dc2110b5322e1956c877e7fcf61bef0 DIST gnome-menus-3.13.3.tar.xz 404664 BLAKE2B 7772c817317b4af86e740aeea3095f51ff210f73e53160ca2359d45a017236c82fe787956c04a9e0001e2511671438d4955f0bf7947cdfa8649d78fe931d6d79 SHA512 d631eb17ddc1b33227d0e5862a9344a8605ee1e9ebc1f12ce4ac98895adaf8a82ef2a49415d99bc194a02f30f30c3d6d49759f280fbc246c9e482711fd5021d2 +DIST gnome-menus-3.32.0.tar.xz 499680 BLAKE2B ee43c2be29f6d3f5eaf5369c3b3809fc2728564321853a6dd23df1d81138868f9be2f57d0bcd0eb69a509e224f77dc357a8c71afe569bfb1bbdb13ce3b80636f SHA512 8a429e092b1e4a1a794473d7cae611684321e797792e1063911ddcbb496140033838b348bc209b4c0566a13233cfa1144cae7a188a483abf34c5af6feb44a884 EBUILD gnome-menus-3.13.3-r1.ebuild 1396 BLAKE2B 6e7076bf844a4f47bddd2f2c2cc969f1abffdf120ac87d7efee1302f6e02434c639ecbe7276a47e4cad237b3dc070159a8382eaa277f986fdd0759b04157fb0e SHA512 bd9cbb8790b6d560a96228277af9927cf27910a61d741bc01d504935fae9d9acec43ab03e8147c8a3eecc6a02360be73aec7a707b230bbe3d90d9dbf145e5b59 +EBUILD gnome-menus-3.32.0.ebuild 921 BLAKE2B 7bd6fd9a1397875b749f025161ae03ae1cd9b3b4e9d04117b98c9b30556cec5ba57d6a23c26cb1380272be38ee59b3bb0abe5a58274a01c3c8256151e8c41473 SHA512 7de91c7ffba99579bb96c0b9cd3fbf179ff6e628538a402721254aa7a8fe792abbe4463445c4826e4e4fc4e845bd13b2c88ffdc9bb8394384db182be55d56105 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild new file mode 100644 index 000000000000..c9f8efffcd41 --- /dev/null +++ b/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit gnome2 + +DESCRIPTION="Library and layout configuration for the Desktop Menu fd.o specification" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + +IUSE="+introspection test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.29.15:2 + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) +" +DEPEND="${RDEPEND} + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig + test? ( dev-libs/gjs ) +" + +DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README" + +src_configure() { + # Do NOT compile with --disable-debug/--enable-debug=no + # It disables api usage checks + gnome2_src_configure \ + $(use_enable introspection) \ + --disable-static +} diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index 3da5e32e297e..a45320abfec9 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -4,8 +4,6 @@ AUX 3.30.1-elogind-support.patch 2436 BLAKE2B 4813db45ddf9a8ea50a6a7288df50c9402 AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 AUX defaults.list-r4 18853 BLAKE2B abf7b422bf6e0e7dc04e26416d54018f3fb04ff6b4bfe8aed122e3b918cf840e5b8df8bb68c5ebb5ffed9d95b530581e10c03f7b4454ffe23fd8993253ce2898 SHA512 1d282ab6a139f6e0f0309263ca736dc2eeca0490f25a740583a24cd4f84a21531aaa0bd916d0809844e928029a434acdb3922305ce1253241ff62938c13c4eae -DIST gnome-session-3.30.1.tar.xz 485996 BLAKE2B 6882aa9f6004dc6da5070a484d92450bd1e8f61885492edf11260d9834fcae700f113a8ddeb1d905171432400ad9e94fba99ed6eaa49f08efd2d0ec2dffd9c5a SHA512 b6bc98da0245cdefa7e462b1f4e2c9198ee0da1f15a426d377331f79aec2f637bef27b093780c77f7ffbe7eb62c6829acdbd9f9e25cac5a4f6ed0da6ab96359a DIST gnome-session-3.32.0.tar.xz 485916 BLAKE2B f9c36fbc56adb5c18b674be31ebfc0236f4a0e125d82fb1ddf8277d599eada2b57bbb06d9e538dc3b101d942472628fe80e10f57be1cbf326ff7acc24cd445f2 SHA512 53d5f84ba8ddbac5cfe0e4e3115c76008a3571779cad62a5fe064a409a507497a9ab93a46d6ba7ee4238ac0efb2f2c1379647855ac8058a945350c88400daf34 -EBUILD gnome-session-3.30.1-r1.ebuild 3903 BLAKE2B 41c30a4bd1d3705d51374c61cd495e1d93b95f253e0ed59fc1af012b79a35fc63de99ae7a3cf587d38aa8e11e74503294e149df4b33183012d92105ebabc7c13 SHA512 1e39c11680eff0b127f7cfdc56132dfa5fcf8c00125cf65c83ea11060f7b0311e891b260bb246df2c93c665697ed0fc3fc5b8c991f699387d9291805f0d08eb6 EBUILD gnome-session-3.32.0.ebuild 3875 BLAKE2B b354a2541dbcd4d888688f0a32273e897e3aa76e0285a40b91c26b741388ed857078c66bdb85fa6bc2c964d846f02db4810545a0987a2ec1714cc49beb964d25 SHA512 70a125ca433deb7af966136c792cec3e0b72bb18a9138fcf5867d41a1a42ba6881803495e22ae9674c8a2769f73496be4232faa32a2c3bf983ae98608427ec2b MISC metadata.xml 440 BLAKE2B 83fb0d37323db0c6105b3c231b6ecb7c4344bcd40577f23581af437fb4c4c330a77d2b8b19c9c69a5b586fd4638e55a9153014c32214547bf2437da7c3a161e6 SHA512 93f57253eccec50c77ad84960af623482bb34ad7d1f00463b29ccb54c3f034b95aa1a489acbf5075aa97e37e9303c2973e126cb201c15b2785416d882810378b diff --git a/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild deleted file mode 100644 index c1b21a8f6eba..000000000000 --- a/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="Gnome session manager" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="consolekit doc elogind systemd" -# There is a null backend available, thus ?? not ^^ -# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback -REQUIRED_USE="?? ( elogind systemd )" - -COMMON_DEPEND=" - >=dev-libs/glib-2.46.0:2 - >=x11-libs/gtk+-3.18.0:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=gnome-base/gnome-desktop-3.18:3= - >=dev-libs/json-glib-0.10 - media-libs/mesa[egl,gles2,X(+)] - media-libs/libepoxy - x11-libs/libXcomposite - - systemd? ( >=sys-apps/systemd-183:0= ) - elogind? ( >=sys-auth/elogind-239.4 ) - consolekit? ( >=dev-libs/dbus-glib-0.76 ) -" - -# Pure-runtime deps from the session files should *NOT* be added here -# Otherwise, things like gdm pull in gnome-shell. -# gnome-settings-daemon is assumed to be >=3.27.90, but this is about -# removed components, so no need to strictly require it (older just -# won't have those daemons loaded by gnome-session). -# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and -# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* -# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). -# sys-apps/dbus[X] is needed for session management. -# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas. -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-settings-daemon-3.23.2 - >=gnome-base/gsettings-desktop-schemas-0.1.7 - sys-apps/dbus[X] - consolekit? ( sys-auth/consolekit ) - - x11-misc/xdg-user-dirs - x11-misc/xdg-user-dirs-gtk -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - dev-util/gdbus-codegen - >=sys-devel/gettext-0.19.8 - x11-libs/xtrans - virtual/pkgconfig - doc? ( app-text/xmlto - app-text/docbook-xml-dtd:4.1.2 ) -" - -PATCHES=( - "${FILESDIR}"/${PV}-elogind-support.patch -) - -src_prepare() { - xdg_src_prepare - # Install USE=doc in $PF if enabled - sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die -} - -src_configure() { - local emesonargs=( - -Ddeprecation_flags=false - $(meson_use elogind) - -Dsession_selector=true # gnome-custom-session - $(meson_use systemd) - $(meson_use systemd systemd_journal) - $(meson_use consolekit) - $(meson_use doc docbook) - -Dman=true - ) - meson_src_configure -} - -src_install() { - meson_src_install - - dodir /etc/X11/Sessions - exeinto /etc/X11/Sessions - doexe "${FILESDIR}/Gnome" - - insinto /usr/share/applications - newins "${FILESDIR}/defaults.list-r4" gnome-mimeapps.list - - dodir /etc/X11/xinit/xinitrc.d/ - exeinto /etc/X11/xinit/xinitrc.d/ - newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome - - # This should be done here as discussed in bug #270852 - newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome - - # Set XCURSOR_THEME from current dconf setting instead of installing - # default cursor symlink globally and affecting other DEs (bug #543488) - # https://bugzilla.gnome.org/show_bug.cgi?id=711703 - newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then - ewarn "If you use a custom .xinitrc for your X session," - ewarn "make sure that the commands in the xinitrc.d scripts are run." - fi - - if ! use systemd && ! use elogind && ! use consolekit; then - ewarn "You are building without systemd, elogind and/or consolekit support." - ewarn "gnome-session won't be able to correctly track and manage your session." - fi -} - -pkg_postrm() { - xdg_pkg_postinst - gnome2_schemas_update -} diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 68a3f6fc549f..fc82ecebf7ce 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,8 +1,5 @@ AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b -DIST gnome-settings-daemon-3.30.2-patchset.tar.xz 20132 BLAKE2B b8f2573e806ee5aedcc1476de3550cdc39933c869d64c9d13e463cdf27fa7695e69e57612738fa5438988eda78ae998808508c94fbf841ec037eb1f103921458 SHA512 7318029f4145379b05f7a95686917b4ea7623fd0059559930072350db12170d6083d75c170578516bcede5282da677013086c343abe779b9d1696bd882b7e34d -DIST gnome-settings-daemon-3.30.2.tar.xz 1376776 BLAKE2B a7cf276c5a802b7d9a6f738048b5bc34d97f79723c6f4cfb4f29ac3ed0f43e307cbdd6793e8d8115f51981ee576737d75c58531dcd5d0779d9f3670b68523a60 SHA512 517cb6bab3da10d5d47ab9c9690da3fa23e64d023d01b7cc101441f6b65639f3b6c8d0a0d19da80b22924b3dbe6430b2573fb861060f02fda248b24f00be5d84 DIST gnome-settings-daemon-3.32.1-patchset.tar.xz 9840 BLAKE2B 0b0249b6335fc64c111cfd4c221b408460105bd544527ca29a32b2ceb82d39c1ca8c9813916cde9afdac1cf146c1286ed937dadb07eb0263b5ab3ada2a95e0aa SHA512 175f4d0200b88b696b73fc7e7b10065b3e6f046e48955408cc438499fdc6464483420b4801dbb77b5ae819cb52a131e2594a628b9731eaa167b802b5b2cbe855 DIST gnome-settings-daemon-3.32.1.tar.xz 1372968 BLAKE2B ba0596d9f2019f2ecff32b70c03d962dd7966c282d1fb0ea94c38fc895b7ef788d9dd179a037b74a319ca520811e985465578a725bf14d1eff92846f188445ea SHA512 8d6aca1041cbd50d7dda67dc711269a51c4a5148d55dc63969f47c21bf309126f5d5cb13c1e6fa9e6498fbb30dc70fa7a049fead7d32c6a20d550da0ce8828c3 -EBUILD gnome-settings-daemon-3.30.2-r1.ebuild 3876 BLAKE2B 527a6232fba4202c429853ba33b429e8cfd0a5820c0ae8082c11bdfcf73a7e0c6890cf9f7073ba73a7833a2832b48ce7fb5f1c2286fd5f4aaec7f5eae68b7dba SHA512 0f3a41c824b3f20d504ca52f439a243d902ed5f2d64ff4df2ae000defb95da152f598b1787063348674f5b1f00115fffe081485b185852b322d6cd4d94425774 -EBUILD gnome-settings-daemon-3.32.1.ebuild 3838 BLAKE2B fcd33f88b6e0552e105c65f893090433a8e846ae0ea1591b35d37d3c5857f13e10c40a474235532f50b9403af2fc74cbdcb9c9135e8778a55b4a9e0fa0c23dc3 SHA512 7648a1d933d88f5fa051829ffcafd40604402488b49201322bd7fa1ee47e082f05c2ccf56c7d3d662da8df7be67f6b369d9929f94eaf3ddfb72d4f21e141fc78 +EBUILD gnome-settings-daemon-3.32.1.ebuild 3834 BLAKE2B ac651b86c70636b0e182ec7d611e89e3f7e264ebac267f9027b3e14ca1781318cc584177b7b21ae8028f9198837974ba78ca25ef3202f834032af089646508a0 SHA512 620470bff1ddfa0360d7e7111e69583c32fa6e3d28ed7cfc5306d2aed99cf6fc7bb5be8da57a2d248878413e2a25dd7af6d6294ac028392105bb1c574c4a7e70 MISC metadata.xml 454 BLAKE2B 271588e1f1a6a9799ba121f1da6f69ea1b5ba4c006f11c3a997833eac097143ba19bfe445759f17b7269414892af5efeb04eaaa752c0c330e1238c66004f30ed SHA512 ada9cf6a61a63bd96807bd1c4840a19ed2e59b7889d54af7796ec07af6b8250ce03953d907545c92aa75c59d2bee3ecb4120c571f1830a5c2b06e4ebf7005eee diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild deleted file mode 100644 index 5f6e5cc909c0..000000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{3_5,3_6,3_7} ) - -inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+colord +cups debug elogind input_devices_wacom networkmanager smartcard systemd test +udev wayland" -REQUIRED_USE=" - ^^ ( elogind systemd ) - input_devices_wacom? ( udev ) - wayland? ( udev ) -" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" - -# >=polkit-0.114 for ITS translation rules of .policy files -COMMON_DEPEND=" - >=sci-geosciences/geocode-glib-3.10 - >=dev-libs/glib-2.53.0:2 - >=gnome-base/gnome-desktop-3.11.1:3= - >=gnome-base/gsettings-desktop-schemas-3.27.90 - >=x11-libs/gtk+-3.15.3:3[X,wayland?] - >=dev-libs/libgweather-3.9.5:2= - colord? ( - >=x11-misc/colord-1.0.2:= - >=media-libs/lcms-2.2:2 ) - media-libs/libcanberra[gtk3] - >=app-misc/geoclue-2.3.1:2.0 - >=x11-libs/libnotify-0.7.3 - >=media-sound/pulseaudio-2[glib] - >=sys-auth/polkit-0.114 - >=sys-power/upower-0.99:= - x11-libs/libX11 - x11-libs/libXtst - udev? ( dev-libs/libgudev:= ) - wayland? ( dev-libs/wayland ) - input_devices_wacom? ( >=dev-libs/libwacom-0.7 - >=x11-libs/pango-1.20.0 - x11-libs/gdk-pixbuf:2 ) - smartcard? ( >=dev-libs/nss-3.11.2 ) - cups? ( >=net-print/cups-1.4[dbus] ) - networkmanager? ( >=net-misc/networkmanager-1.0 ) - media-libs/alsa-lib - x11-libs/libXi - x11-libs/libXext - media-libs/fontconfig -" -# logind needed for power and session management, bug #464944 -# gnome-session-3.27.90 and gdm-3.27.9 adapt to A11yKeyboard component removal (moved to shell dealing with it) -RDEPEND="${COMMON_DEPEND} - gnome-base/dconf - elogind? ( sys-auth/elogind ) - systemd? ( sys-apps/systemd ) - !<gnome-base/gnome-session-3.27.90 - !<gnome-base/gdm-3.27.90 -" -# rfkill requires linux/rfkill.h, thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead -DEPEND="${COMMON_DEPEND} - sys-kernel/linux-headers - dev-util/glib-utils - dev-util/gdbus-codegen - x11-base/xorg-proto - ${PYTHON_DEPS} - test? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') - gnome-base/gnome-session ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.30+ (incompatible build system python needs until then as well) -#RESTRICT="!test? ( test )" - -PATCHES=( - # Translation updates from gnome-3-30 branch - # Allow disabling udev and networkmanager on Linux - # Make colord and wacom optional - "${WORKDIR}"/patches/ -) - -python_check_deps() { - if use test; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && - has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_configure() { - local emesonargs=( - #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss? - -Dudev_dir="$(get_udevdir)" - -Dalsa=true - $(meson_use udev gudev) - $(meson_use colord) - $(meson_use cups) - $(meson_use networkmanager network_manager) - -Drfkill=true - $(meson_use smartcard) - $(meson_use input_devices_wacom wacom) - $(meson_use wayland) - -Dexperimental_suspend_then_hibernate=false - ) - meson_src_configure -} - -src_install() { - meson_src_install - # Don't auto-suspend by default on AC power - insinto /usr/share/glib-2.0/schemas - doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild index 254b5af0fcf5..5abdbc2182d8 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index eb1a6668ee44..16e68ce8b0c4 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -4,11 +4,8 @@ AUX 3.32-optional-bluetooth.patch 1935 BLAKE2B b1f21039e4567a82c83d3a8886703e009 AUX gnome-shell-3.22.0-defaults.patch 1228 BLAKE2B 9bb49d830c2bbc36123ca8fdddc02d4b750a5ffd174fa653ead26a75dc9478be4b5a39c31a004a3897655aae097c23f511d6bb494b0aede51fea74294be3fcf6 SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5 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-r2-patchset.tar.xz 41852 BLAKE2B f854a42b0ba0be8019487edfc1a0e73d11d406537ffe288d1a5d81e9a512b8fb02e6af466fbe4d0d0e8644aa6f57cad1d381b5e873223749c88d1dccdae72b9e SHA512 c0c935206048c961e70f319b67133dcf0f5253c2283aefd6283db910950f8cd645888f6a6b7bbbfc620a023e0b5ae85394e5f5ce0fb2ff120b18ab7640f9859e -DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877 SHA512 5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6 DIST gnome-shell-3.32.2-patchset.tar.xz 23540 BLAKE2B 363989a630faa7538ccbf9765a1ccc5995fb4584b00a603ef11e48fee970a6d9791ed1fa92e2344e56cd8c282c9a22779cb8e50e7ec6637e0efda1ccc36579a4 SHA512 e854ba9fd864101009528d94cb310be10495db225380c353b76cd61b082a88f1f89035a0708cd386d1738001cf9949b4a8b8b8d7b1d2675068e01fecb35738c7 DIST gnome-shell-3.32.2.tar.xz 1454372 BLAKE2B 9da7e17d4e47e187fa2285c6cf942cc8dc955e388179d2ad1fe8036c2908e217fc47d8b1515fc3cf6973e2083de8c350b55912782b9adbcf1b6cc37c7a3a9ae2 SHA512 7d8b25aa75149f096033a8b44d7f6f8d17ddadfcd8f5bb1915652423fe9d9db14902e674508f16fe5c6e7cbe956cde8349ec779c24c46f32b0a346755876bc46 -EBUILD gnome-shell-3.26.2-r4.ebuild 6619 BLAKE2B 7cc3d4d3c2d17e346ad23ec782d767807412f239a8967b37774b778e02598a933cb53ef44482877683109bb561369db5db461dc76acab9d3913b6296eee3ec3f SHA512 af24928be65b87b78b1442ef7f26551f7ed163388ea27edf35046e4e73ab454440af692d9c1bcb2a37e5366000d1988173225d68af3c19f0721255bdba2a2cfa -EBUILD gnome-shell-3.30.2-r2.ebuild 6508 BLAKE2B 13e62512e73230a914f333b73cfb3be82f0672b49c1b72c8ff37ec9f82299c30bc84ad5c63722062a15e80412588b31f9090253986f14b7d909a365f11005196 SHA512 f7f4c841e65f5ebcb57774f2d2e511d6bbd16d15fd5562c3fa934ea9cba749330ebaf3c2dcdbab0347614e10c823ffe5416aab041eafcaf3cb2685c92bf71fe6 -EBUILD gnome-shell-3.32.2.ebuild 6358 BLAKE2B b18c6f41fd9f24abe0f7b27761d2929a167e3b376c52b4544c013c58290aa6c085bf8918eadc84f1603644301dcf85c3640c5a8e536071085b6cfed3fcc444f4 SHA512 79a0b5fe1446fb519cee9197a500a5e9d044265f9d7e748e83aed67e6c8465494de3fe0a0c19b197f30992b6bf8125e12f88a134722ab40615294319993d5852 +EBUILD gnome-shell-3.26.2-r4.ebuild 6615 BLAKE2B 46daaf2defe582fb95636af23a87cce49f1415385c5d4a8763cad759ceb052cd9b171fa54caf491155aca0eda4554abe485c1da0ac8d6e6b405f63eb203bfabe SHA512 932a9c8f2cb35ea674df7c7950a45537370de34c26cf75bbb88288c3d6d41761392ffce9c7c710b4d9dd11ed340017c31f8538886f75538d9e51a99f83a324da +EBUILD gnome-shell-3.32.2.ebuild 6356 BLAKE2B e34cf7b9e3364f7f5ee0ee3268f9b3ad8d7ea3bf8863ff019474abe3c480b0350bf5455066bccb0826d989ce230b4a958982ebf573018bc4fd8dba386545fc6d SHA512 6b46492d2ca5ac18e4fe334fb7b9341fe09634638109215e6f3e64bb3875fc63a7b10315a6797205afbeffcf550224dc9579ba5bfebe218e412c9acf246d4f74 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06 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 index f91c4c2c4a3b..601a0789119c 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) +PYTHON_COMPAT=( python3_6 ) inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg diff --git a/gnome-base/gnome-shell/gnome-shell-3.30.2-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2-r2.ebuild deleted file mode 100644 index 703ffb03c579..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-3.30.2-r2.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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/${PF}-patchset.tar.xz" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager nsplugin systemd telepathy" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( elogind systemd )" - -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> -# FIXME: -# * gstreamer support is currently automagic -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.57.2:2 - >=dev-libs/gobject-introspection-1.49.1:= - >=dev-libs/gjs-1.54.0 - >=x11-libs/gtk+-3.15.0:3[introspection] - nsplugin? ( >=dev-libs/json-glib-0.13.2 ) - >=x11-wm/mutter-3.30.1:0/3[introspection] - >=sys-auth/polkit-0.100[introspection] - >=gnome-base/gsettings-desktop-schemas-3.27.90 - >=x11-libs/startup-notification-0.11 - >=app-i18n/ibus-1.5.2 - bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) - >=media-libs/gstreamer-0.11.92:1.0 - networkmanager? ( - >=net-misc/networkmanager-1.10.4:=[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 - 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[X(+)] -" -# 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. 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="${DEPEND} - >=sys-apps/accountsservice-0.6.14[introspection] - app-accessibility/at-spi2-core:2[introspection] - 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] ) - media-fonts/cantarell -" -# 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 ) -" -BDEPEND=" - dev-lang/sassc - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.45.3 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.17 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # 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 -) - -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 bluetooth) - $(meson_use nsplugin browser_plugin) - $(meson_use gtk-doc gtk_doc) - -Dman=true - $(meson_use networkmanager) - $(meson_use systemd) # 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 - # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)? - 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/gnome-shell-3.32.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild index af8b5d90b813..cc2d09d474c4 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest index ffd0f2bc00d7..a318df7ba7a4 100644 --- a/gnome-base/gnome/Manifest +++ b/gnome-base/gnome/Manifest @@ -1,3 +1,2 @@ -EBUILD gnome-3.30.2.ebuild 1394 BLAKE2B 984b4036cba5dd30db49df29c7813645a5b5db95bd1bc9ded13233adbd25b9a785d2d48f8c2998407c27e878556840eadd643435d9cc845a800c2d2be3876709 SHA512 c45a6f211f76dbb97c4956322ece238a4a375ceffb05df9292f293cf5dad4402324b724d8ce01bff63ea7d236ce53a6050753f4bce14e5dabc88d1ff91a69cd3 EBUILD gnome-3.32.2.ebuild 1402 BLAKE2B d2075e97c2e340536238d68362b2182b1cfd8a3c88dfae8640531a283e54e5b9ee9c1b3c2c1cc64965fc0511acc2626f43f884a4e18faab1b9af0b2e8a5304ff SHA512 a2901d72cda5f0ec73ca7879423d04bef5c7dec200702316f6a167b010a3110a0fc53a60b7b3af6ec5f06f2e46800c4c54b69649635c034d10b770e7e88d8d5f MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a diff --git a/gnome-base/gnome/gnome-3.30.2.ebuild b/gnome-base/gnome/gnome-3.30.2.ebuild deleted file mode 100644 index 5a3737a1d020..000000000000 --- a/gnome-base/gnome/gnome-3.30.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Meta package for GNOME 3, merge this package to install" -HOMEPAGE="https://www.gnome.org/" - -LICENSE="metapackage" -SLOT="2.0" # Cannot be installed at the same time as gnome-2 - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" - -IUSE="accessibility +bluetooth +classic cups +extras" - -S=${WORKDIR} - -# TODO: check accessibility completeness -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV}[cups?] - >=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?] - - >=gnome-base/gdm-3.30.1 - - >=x11-wm/mutter-${PV} - >=gnome-base/gnome-shell-${PV}[bluetooth?] - >=media-fonts/cantarell-0.111 - - >=x11-themes/gnome-backgrounds-3.30.0 - x11-themes/sound-theme-freedesktop - - accessibility? ( - >=app-accessibility/at-spi2-atk-2.30.0 - >=app-accessibility/at-spi2-core-2.30.0 - >=app-accessibility/orca-3.30.1 - >=gnome-extra/mousetweaks-3.12.0 ) - classic? ( >=gnome-extra/gnome-shell-extensions-3.30.1 ) - extras? ( >=gnome-base/gnome-extra-apps-${PV} ) -" - -DEPEND="" - -PDEPEND=">=gnome-base/gvfs-1.38.1[udisks]" - -pkg_postinst() { - # Remember people where to find our project information - elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" - elog "for information about the project and documentation." -} diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest index 5e6f352c8475..1434c074f744 100644 --- a/gnome-base/gsettings-desktop-schemas/Manifest +++ b/gnome-base/gsettings-desktop-schemas/Manifest @@ -1,8 +1,6 @@ AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833 -DIST gsettings-desktop-schemas-3.28.1.tar.xz 652416 BLAKE2B a9ddf44153a83fa188f873e6bca29499e1abc7dea310c6eda3193233e363607781c93bca64a9ddf2f31137e22e54e23b0f139e90ef99c181aac9a976409b6c94 SHA512 2bf3260e976943e9d1e51feda62ef1e432870a6d9b34881afbdf99ddbe4954e5dd679697e152e793a0b38492dbbc4891018f7aa8cd4e703d05a8647cc5a56785 DIST gsettings-desktop-schemas-3.32.0.tar.xz 628888 BLAKE2B 7d675597d861ee8ee8258f037d06d6f728e9705c7e121508a811bbad000b1ef10a7e2ef23066cec01c34865648f4f0a204716306643db1a4cbd505801ce939c1 SHA512 cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc EBUILD gsettings-desktop-schemas-3.24.1.ebuild 751 BLAKE2B 4dd144290423aa5a7f058c4385c79dd1efe9bdd606facf101c4c2984dcbca39bc3bc7004beae2258d5abc92dc854133d9ec49ea54976b424e17213875674bb07 SHA512 e44ce2486801708c826ed30bf5204263d0415b71814391d0ad8ed3391cb24e24189c52576fc386ba3dfda602303d4a0479e4d0802fa8d519ae2bf017495d56e4 -EBUILD gsettings-desktop-schemas-3.28.1.ebuild 752 BLAKE2B aeeace0a6ec1a6d14d262d3904d294bfadffa5bad429d2be7c9da9b4265a3df0b7061ca945aa5681659ec1cbe7262e35e71c61bdf735e7010df61376613710a4 SHA512 a889be4a1d9a703d12f73814aba2d621750657348528c4b42deb373a7b2f10af16ef6df0a28353d6c667ab0cf8ed686d58679df7df309940f49f256994a7c42b -EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1021 BLAKE2B 60b5ae3f22bc9b44a4979706096f548b6f8c7d3682540d6d8d857f8a3896f561666f7cbc735a2f8dfcb774335d7afaa65c9f8be37a8f3ded399f1f0cf6c834f8 SHA512 16a1491207bd6b38eddf04bbcd2e28bd66329a93ca16989dbf8e5b21772e4f1f85f442826a7d7e3ad93180675c8bed81025ae57cce61e8f309eb8f81150ac43e +EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1018 BLAKE2B 767a9fdee3a3372d6194b37489d02a94b3c5d9433d2f874601b5a16c5f397de96efbae7b928fa08e9665f24516df229e253f3ba061b62be20a0d699438ed4629 SHA512 eed30caf99d333cc42bd90db9b6bfaade1c21ce1b8c63d9d470bb33a370df0d6c266e9888b14116f6ef61c5ca69d58e0bcb7793fce4a7a6dbcdc4bd22a680f2e MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild deleted file mode 100644 index 51692079e8d5..000000000000 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Collection of GSettings schemas for GNOME desktop" -HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas" - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="+introspection" -KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.31:2 - introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) - !<gnome-base/gdm-3.8 -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure $(use_enable introspection) -} diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild index 2d1062d2c2cf..bf9d60db8fe4 100644 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild +++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas" LICENSE="LGPL-2.1+" SLOT="0" IUSE="+introspection" -KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" DEPEND="!<gnome-base/gdm-3.8" RDEPEND="${DEPEND}" diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index a7bdae0353fd..03a7499048eb 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,11 +1,4 @@ -AUX 1.38.3-gvfsdaemon-rpath.patch 1075 BLAKE2B ccb99b16418e8d08bbbb4fe211b69b388d3995c0d28d8d33f1ceffaf5ef4384cefd19e7337dfbd95c31a7406f873448c9ea3343d5afa787b2df9050d204cb61f SHA512 18794d7081a6d4e6cbd7994a5ff683ecab4df677d5b37419144cdb39d800569d620b76fc931b849a7d05421effc66bf76b193a28f9ca8d653867784ad666b13a AUX 1.40.2-gvfsdaemon-rpath.patch 1076 BLAKE2B eb268a3500c06aaefa0365b525d530a94c1332c393ebce3047b42ec250b7ac59d6a0c7a573ffc0616617a32e1163ad424042389af055a84803b3830ec5ad8e36 SHA512 b3c1e33e87e033efc3c23524494857858f70ef7b76b88a13bf595006cd1b1f8fdcca875cf8ebe8cba7ce536fe92fed460a957a9136f5b56b393420124fd3e013 -AUX gvfs-1.30.2-sysmacros.patch 525 BLAKE2B 27337a06b02aea544e98b5726ac5a1ae29c8632150c373ce85f0f601c368e0f1430217ee729de5494e15162a05423c738e0756431a46c87b62ac647615b6273d SHA512 9b06683ed3b8ceea1b330e86308c396581ab4c85aa22199ce92acad915bb28f0fed8997558c08b18cb9c5f1bab45e46a1365831acaf1c194e7134e185849dba2 -DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa83913cf1f5ac80c485abc6a10bd77667e7fad29a09eb160af39212da31c00ccccbc3e47b4ed79780e254ff78d4b7130 SHA512 d7a17a33b737d8ac679e259055b57f63ef18f783dd7887c726502f8c05cb9339addd8728ee180ed15dc7d067ff45cc1888bc42a8ca45f9734717cfcde53f3e45 -DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457 -DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958816d1a07d1689b8d477538c11ce26ef5caba1ff8ed16f1188ff5e59d92ce807f4adbf7d9749fe59da6a0e2dc SHA512 4497d04942881e7e7fe6541fc5951bcc03c89305dc975ed1cd0368acf382ac66a532f3b7c781c4dec5662bf71dd6346a93378096c0cbec5f6331d75c85b96175 DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c -EBUILD gvfs-1.32.2.ebuild 3796 BLAKE2B 74cc69a5d735f3c28d565727020bf56bec85734d3a0c22ba7b84fd6e3c422e971cd477c685e3bfa02fe31bb181a0df9eee3bb37ab4127c6c32d7abb626069175 SHA512 c1b5d293de4333a27af132c203904ba878d7e74ec07713eea56ebba822a4b9f4deb8d62ddc5ff7cef800efa11f67c11fc51800c5364fde170fbe39c7fb9ba242 -EBUILD gvfs-1.38.3.ebuild 3781 BLAKE2B 66fae9248f9a6af8d83f47cdce6d032869720d7e07b71e62c532744864793bf00f6097b99eb32bd5fe5d5ea8fd60c8c6414057310fcacf2ed7c93f14b91f98b7 SHA512 4b39e655d21457b515a707c32ffb20f36d403f86fc1869a0eaabbfb7f7ace501af97f3a8016284dc88a81f0fee5bf7235183bc155e7806497f2379637b870975 -EBUILD gvfs-1.40.2.ebuild 3815 BLAKE2B f82ff072ee8722bd68fa9ccf21d689c421098252ca1a98a01408b1e68d8c85ea0aba6c3b580c2fc208f6e0715ef75ec54ad7d715a97ebf21cf875532c19a6acf SHA512 c96827626528e6e0717fc00e77da3dd1677138e9c9384ae114beff629a90658b8f9abb51bb4b6d4a43d404b57c52288bf282cf0e214e51b86cd4a00f98184474 +EBUILD gvfs-1.40.2.ebuild 3814 BLAKE2B 21fec4dbd80147f4464bb7e7c96b37e77188242aabbe2aec60bddeaea2ccc7c74087ea0f037a14f00c9fcdd8248cec680bf4e4922762eeeedaa1c513cdd38d81 SHA512 91e35d8243b8178ae68c13a7f63714f28f25bed5b675c5fe0e1d012841c60f002bc9e9d446ba7e26d40c24c0751f9b3623bf445531ce668192b96b18128845e9 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7 diff --git a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch deleted file mode 100644 index f3fe513d06e1..000000000000 --- a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 57010ebb148b9b14e40140c7a8ce133a72128cf6 Mon Sep 17 00:00:00 2001 -From: Robby Workman <rworkman@slackware.com> -Date: Thu, 18 Jul 2019 03:38:41 -0500 -Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so - -On Slackware development branch with gvfs-1.40.2, I just noticed this: - # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found" - libgvfscommon.so => not found - -After some backtracking, it seems that this first occurred in the -switchover from autotools to meson in the 1.36.x --> 1.38.x bump. - -Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and -assistance with troubleshooting this. - -Signed-off-by: Robby Workman <rworkman@slackware.com> ---- - daemon/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/daemon/meson.build b/daemon/meson.build -index 7f2608bd..0006f35e 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library( - dependencies: deps, - c_args: cflags, - install: true, -+ install_rpath: gvfs_rpath, - install_dir: gvfs_pkglibdir - ) - --- -2.20.1 - diff --git a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch b/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch deleted file mode 100644 index b2d2a91f5a76..000000000000 --- a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=776532 -https://bugs.gentoo.org/580234 - ---- a/metadata/meta-daemon.c -+++ b/metadata/meta-daemon.c -@@ -27,6 +27,7 @@ - #include <glib/gstdio.h> - #include <locale.h> - #include <stdlib.h> -+#include <sys/sysmacros.h> - #include "metatree.h" - #include "gvfsdaemonprotocol.h" - #include "metadata-dbus.h" ---- a/metadata/metatree.c -+++ b/metadata/metatree.c -@@ -1,4 +1,5 @@ - #include "config.h" -+#include <sys/sysmacros.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/mman.h> diff --git a/gnome-base/gvfs/gvfs-1.32.2.ebuild b/gnome-base/gvfs/gvfs-1.32.2.ebuild deleted file mode 100644 index 627cbbe441e5..000000000000 --- a/gnome-base/gvfs/gvfs-1.32.2.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit gnome2 systemd - -DESCRIPTION="Virtual filesystem implementation for gio" -HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" -REQUIRED_USE=" - cdda? ( udev ) - elogind? ( !systemd udisks ) - google? ( gnome-online-accounts ) - mtp? ( udev ) - udisks? ( udev ) - systemd? ( !elogind udisks ) -" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=" - app-crypt/gcr:= - >=dev-libs/glib-2.51:2 - dev-libs/libxml2:2 - net-misc/openssh - afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) - archive? ( app-arch/libarchive:= ) - bluray? ( media-libs/libbluray:= ) - elogind? ( >=sys-auth/elogind-229:0= ) - fuse? ( >=sys-fs/fuse-2.8.0:0 ) - gnome-keyring? ( app-crypt/libsecret ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) - google? ( - >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] - >=net-libs/gnome-online-accounts-3.17.1:= ) - gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) - gtk? ( >=x11-libs/gtk+-3.0:3 ) - http? ( >=net-libs/libsoup-2.42:2.4 ) - ios? ( - >=app-pda/libimobiledevice-1.2:= - >=app-pda/libplist-1:= ) - mtp? ( - >=dev-libs/libusb-1.0.21 - >=media-libs/libmtp-1.1.12 ) - nfs? ( >=net-fs/libnfs-1.9.8 ) - policykit? ( - sys-auth/polkit - sys-libs/libcap ) - samba? ( >=net-fs/samba-4[client] ) - systemd? ( >=sys-apps/systemd-206:0= ) - udev? ( - cdda? ( dev-libs/libcdio-paranoia ) - >=dev-libs/libgudev-147:= - virtual/libudev:= ) - udisks? ( >=sys-fs/udisks-1.97:2 ) - zeroconf? ( >=net-dns/avahi-0.6[dbus] ) -" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=sys-devel/gettext-0.19.4 - virtual/pkgconfig - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - test? ( - >=dev-python/twisted-16 - || ( - net-analyzer/netcat - net-analyzer/netcat6 ) ) - !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) -" -# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043 -# test dependencies needed per https://bugzilla.gnome.org/700162 - -# Tests with multiple failures, this is being handled upstream at: -# https://bugzilla.gnome.org/700162 -RESTRICT="test" - -PATCHES=( - "${WORKDIR}"/patches/ #599482, 641522, gnome-3-24 backports - "${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234 -) - -src_prepare() { - if ! use udev; then - sed -e 's/gvfsd-burn/ /' \ - -e 's/burn.mount.in/ /' \ - -e 's/burn.mount/ /' \ - -i daemon/Makefile.am || die - fi - - gnome2_src_prepare -} - -src_configure() { - # --enable-documentation installs man pages - # --disable-obexftp, upstream bug #729945 - gnome2_src_configure \ - --disable-gdu \ - --enable-documentation \ - --enable-gcr \ - --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - $(use_enable afp) \ - $(use_enable archive) \ - $(use_enable bluray) \ - $(use_enable cdda) \ - $(use_enable elogind libelogind) \ - $(use_enable fuse) \ - $(use_enable gnome-keyring keyring) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable google) \ - $(use_enable gphoto2) \ - $(use_enable gtk) \ - $(use_enable http) \ - $(use_enable ios afc) \ - $(use_enable mtp libmtp) \ - $(use_enable mtp libusb) \ - $(use_enable nfs) \ - $(use_enable policykit admin) \ - $(use_enable samba) \ - $(use_enable systemd libsystemd-login) \ - $(use_enable udev gudev) \ - $(use_enable udev) \ - $(use_enable udisks udisks2) \ - $(use_enable zeroconf avahi) -} diff --git a/gnome-base/gvfs/gvfs-1.38.3.ebuild b/gnome-base/gvfs/gvfs-1.38.3.ebuild deleted file mode 100644 index 5cd798af7346..000000000000 --- a/gnome-base/gvfs/gvfs-1.38.3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="Virtual filesystem implementation for GIO" -HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" - -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" -RESTRICT="!test? ( test )" -# elogind/systemd only relevant to udisks (in v1.38.1) -REQUIRED_USE=" - ?? ( elogind systemd ) - cdda? ( udev ) - google? ( gnome-online-accounts ) - gphoto2? ( udev ) - mtp? ( udev ) - udisks? ( udev ) -" -KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.57.2:2 - afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) - sys-apps/dbus - app-crypt/gcr:= - policykit? ( - >=sys-auth/polkit-0.114 - sys-libs/libcap ) - http? ( - dev-libs/libxml2:2 - >=net-libs/libsoup-2.42.0:2.4 ) - zeroconf? ( >=net-dns/avahi-0.6[dbus] ) - udev? ( >=dev-libs/libgudev-147:= ) - fuse? ( >=sys-fs/fuse-2.8.0:0 ) - udisks? ( >=sys-fs/udisks-1.97:2 ) - systemd? ( >=sys-apps/systemd-206:0= ) - elogind? ( >=sys-auth/elogind-229:0= ) - ios? ( - >=app-pda/libimobiledevice-1.2:= - >=app-pda/libplist-1:= ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) - gnome-keyring? ( app-crypt/libsecret ) - bluray? ( media-libs/libbluray:= ) - mtp? ( - >=dev-libs/libusb-1.0.21 - >=media-libs/libmtp-1.1.15 ) - samba? ( >=net-fs/samba-4[client] ) - archive? ( app-arch/libarchive:= ) - cdda? ( - dev-libs/libcdio:0= - >=dev-libs/libcdio-paranoia-0.78.2 ) - google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] ) - gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) - nfs? ( >=net-fs/libnfs-1.9.8 ) - net-misc/openssh -" -DEPEND="${RDEPEND} - dev-util/glib-utils - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.2 - dev-libs/libxslt - >=sys-devel/gettext-0.19.4 - virtual/pkgconfig - dev-util/gdbus-codegen -" - -PATCHES=( - # from gnome-3-30 branch, fixes RPATH of libgvfsdaemon.so - "${FILESDIR}"/${PV}-gvfsdaemon-rpath.patch -) - -src_configure() { - local enable_logind="false" - if use systemd || use elogind; then - enable_logind="true" - fi - - local enable_gcrypt="false" - if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes - enable_gcrypt="true" - fi - - local enable_libusb="false" - if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes - enable_libusb="true" - fi - - local emesonargs=( - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - $(meson_use policykit admin) - $(meson_use ios afc) - $(meson_use afp) - $(meson_use archive) - $(meson_use cdda) - $(meson_use zeroconf dnssd) - $(meson_use gnome-online-accounts goa) - $(meson_use google) - $(meson_use gphoto2) - $(meson_use http) - $(meson_use mtp) - $(meson_use nfs) - -Dsftp=true - $(meson_use samba smb) - $(meson_use udisks udisks2) - $(meson_use bluray) - $(meson_use fuse) - -Dgcr=true - -Dgcrypt=${enable_gcrypt} - $(meson_use udev gudev) - $(meson_use gnome-keyring keyring) - -Dlogind=${enable_logind} - -Dlibusb=${enable_libusb} - -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1 - -Dinstalled_tests=false - -Dman=true - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - gnome2_giomodule_cache_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update - gnome2_giomodule_cache_update -} diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild index e86efb195624..dceebc1716b3 100644 --- a/gnome-base/gvfs/gvfs-1.40.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ REQUIRED_USE=" mtp? ( udev ) udisks? ( udev ) " -KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" RDEPEND=" >=dev-libs/glib-2.57.2:2 diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest index aaaa8e8a259e..6398edb9c9e6 100644 --- a/gnome-base/libglade/Manifest +++ b/gnome-base/libglade/Manifest @@ -3,5 +3,5 @@ AUX libglade-2.6.3-fix_tests-page_size.patch 369 BLAKE2B 0994633712e71d4d1919dbf AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab049a13621e404b7e3e9a7ee265bac6850eae20db0957064726fe9b4a8f9403ec60398585dec2c7762c65daef824eb8f444b295a SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8 DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735 -EBUILD libglade-2.6.4-r2.ebuild 2866 BLAKE2B 812bce708b13475cadae88d4ecfae780e1a681f0a250344800416352fbee59077d3b1b9c55c1ca07f6a32b17b1ea062e24aac40b5f0cfa46dbd8c0c8bc42cb61 SHA512 7d4ba49d5d5e3bf3e694225c2afdd1818729bb7636e176ea81f583108293f6baba6d11d89b5d041f60cb7f3a8b527716f37a83aa74429b13c77bd11f5f362e41 +EBUILD libglade-2.6.4-r2.ebuild 2861 BLAKE2B 04a7a9fb572134d39117699031b283ac71d3dec9db794c5fa75d3087aa2028a1d920525ecfde7b9ed8239581e4462e2323fef34ca7a22744a7e3441c34bc806f SHA512 7bf33b9a2a6e0e2aab747dd13b7a6b753dd9330e937104b4bf2384252506223be89eed78721ce6bb1dedc3246eea7a49d70907ff64321859ff31e96cc3e26a88 MISC metadata.xml 336 BLAKE2B c8f534b3eb5adf1f4e4b71a95b4dd7ecb6ddcf954d617eaf960a08d6ee43818c948c9ed72cbe252159a4185feaddef8a294e41277416618237a271ec84e90e5e SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3 diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild index fd0c16d5fdd6..77faf7d88c2d 100644 --- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild +++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -7,7 +7,7 @@ GCONF_DEBUG="no" GNOME_TARBALL_SUFFIX="bz2" GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 pypy ) +PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='xml(+)' inherit autotools eutils gnome2 multilib-minimal python-single-r1 virtualx diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest index b61541bc5505..743c97ca1b03 100644 --- a/gnome-base/libgtop/Manifest +++ b/gnome-base/libgtop/Manifest @@ -1,5 +1,3 @@ -DIST libgtop-2.36.0.tar.xz 727072 BLAKE2B 46f24573bde0bcfeb2210ea08446f6e6590fadc5697745178133ce5f3aec2e464cbce8446d2dbddb9f05d4a16eb7daf110c4554778a28573116b2b59edcf556f SHA512 2768c628fa3e872a940246042b2c78ad4618612ecb2cf2b95fb70343a4f1a01bb558d0ce9e5b3468f395349f338ca33d460e1d91f2c123ad39243cd0ff20d5e5 DIST libgtop-2.38.0.tar.xz 729700 BLAKE2B 2296741d6c6bd1c9eb17be10e480dabd732e956826c859c176cbc6f8f03259a3b2f2f04d6c55d1c562b082f7e880bb4b7a3f07a66d7f24660085387dce078879 SHA512 96586b7f12a2b63c5ec7f69c51b6e28361a7458f24f20270fc589213bfae43ae99d1e39efb6101d189741bba084c887554f745131e99d8ed90b7db6d53c36e1d -EBUILD libgtop-2.36.0.ebuild 760 BLAKE2B 51f5c9fd3cd106a65734731bdb27f66566e46134badd16f5bdb3c6458f22123b4a14ada6efffd21261bf385988461362878d19948272fcdf59088dc85719faab SHA512 c16fc5faee41847c01d4cc1f6a0c381f2e7a6a3a78c54a97edd23881decafd66be478e6ad247c146be91a524f5de193e52093cc284033a29850fa345a7bda143 -EBUILD libgtop-2.38.0.ebuild 758 BLAKE2B 3efd133c35a29436231ddc15560c8708dd162bfb53f0b4abb7f35af686ac54759e1a863f413484ebec3332e8304eaa0ef341882b3242a27c79665d49a5f238c3 SHA512 7b96cd6f20c6c2b6f346902c4ecdf79a83db76af9f3de7225fd9de3b1b4bf86c2da96b94226f8bbfe242806d7f261f832be24d59a83592915cb64016c2bd704b +EBUILD libgtop-2.38.0.ebuild 757 BLAKE2B f4e46123db0e807ffc412d53bbfa967be0cfdcc60a14806349917ce243bb45d847dba2a1db259a6bb083b1299db61f8470dc9b1271dcb4559576b1eec3a43633 SHA512 98bcdb9528c6fe8b3a2601d6fc6f0a8cfe535fd95f0c3b4cdaa306fe94be3c431d6a5b0fd941de1dc856cf8899bc4dea80a69fbdfe11ef15c811f318fd26cd69 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/libgtop/libgtop-2.36.0.ebuild b/gnome-base/libgtop/libgtop-2.36.0.ebuild deleted file mode 100644 index a961f6e069aa..000000000000 --- a/gnome-base/libgtop/libgtop-2.36.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic gnome2 - -DESCRIPTION="A library that provides top functionality to applications" -HOMEPAGE="https://git.gnome.org/browse/libgtop" - -LICENSE="GPL-2+" -SLOT="2/10" # libgtop soname version -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86" -IUSE="+introspection" - -RDEPEND=" - >=dev-libs/glib-2.26:2 - introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.4 - >=sys-devel/gettext-0.19.4 - virtual/pkgconfig -" - -src_configure() { - # Add explicit stdc, bug #628256 - append-cflags "-std=c99" - - gnome2_src_configure \ - --disable-static \ - $(use_enable introspection) -} diff --git a/gnome-base/libgtop/libgtop-2.38.0.ebuild b/gnome-base/libgtop/libgtop-2.38.0.ebuild index e76ac8261411..ce6ad98ed708 100644 --- a/gnome-base/libgtop/libgtop-2.38.0.ebuild +++ b/gnome-base/libgtop/libgtop-2.38.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop" LICENSE="GPL-2+" SLOT="2/11" # libgtop soname version -KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86" IUSE="+introspection" RDEPEND=" diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index 6682f16d00f5..d321b629d526 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -1,7 +1,4 @@ AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0 -AUX librsvg-2.40.2-vala-out-of-source.patch 1066 BLAKE2B 43bb0dfdc90f3fe3084e23ee5d275d92e41a60f7f5c3763180c91232f4543fe93b036ff22a455247b15d09f514bd8a9a4145ac1aec09b444cb9fc5414410c4b9 SHA512 6a8e8035183a965c7359c6258cde5a842c2eda662a9ccebbe27ea27eb978591255664a837124e65f25e2653980c354c6c4b9ae11427cc27fe46ccfcdcde8102f -DIST librsvg-2.40.18.tar.xz 574384 BLAKE2B 964997ef3bd5f8bdcab43e67f22d12458683c0eeee2fa81e7a6199f6a31c7ac11c599327a6a66118000f63549ea735a042c71429635f6dc9bf073f12eab067b6 SHA512 faf503d0d881801ce129715e7ae979ee1675bd32beac9170b1889c94aac64caf486968bc86f3480463b84e94f28c1d805551ffdcb7068ecadd0688146e0fb182 DIST librsvg-2.40.20.tar.xz 1796376 BLAKE2B ec8e7308a0255aa22038262d69019e810bb78b92e3de62662b53ab375110c8186e565e1eb7f5825c61c6d10bed1876ff3f7a06d1073e9676a3d2bb5dfb6b791e SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f -EBUILD librsvg-2.40.18.ebuild 2664 BLAKE2B db423b9dbd58b0795fae4c77e4fa261da20ecb0e36fb990457370806b7ed29546c70fe68c181e1980ea143f24e2372bcdc4224c934f3bf618a37b2ca153636cc SHA512 0f53e104b4eba5a31153d749d41366554ef900a14f86d213781b788fbc7d970a3c64f70225533133d87615b9424c6e246db8611ec59458833cae7389cece9cbe -EBUILD librsvg-2.40.20.ebuild 2669 BLAKE2B e184e19b698f81d05e09159673a56164cf8c39554134544791a5df9e2f4f3507195b390422fdc2351fcfa1c1fefe5d54e3af7e6fda237b0d2a140a03e733a8c2 SHA512 afb7c63a0f7f4c097a67b5dc0c1a0271b26557c321ba9ffc9e9c694b87bbfd775901ef815792cb99f976d609b09a297711fa00d0162e46ebdd71a080615a8f0b +EBUILD librsvg-2.40.20.ebuild 2668 BLAKE2B 258c5ddfeb87442d5548ad6156672277847f5760618867f8ed5faa0b4b850272d92619037dc1c2e37c6e36d5635663230f4282cd67790b4a6e248b7422ecc814 SHA512 44298d635d3927e3757fc07bb78092483cfe5b96d08506679d25282f9f306cc94b8751cab349a6379f15ad6f45d58e4a899f54b4b8f66a9d8b415538516833ac MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4 diff --git a/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch b/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch deleted file mode 100644 index bda090572a8d..000000000000 --- a/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bf4da5524d50e1068f851bcbe50c8f8ae1948d73 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 18 Jun 2014 09:44:51 +0200 -Subject: [PATCH] build: Fix building .vapi out-of-source. - -Rsvg-2.0-custom.vala file resides in $(srcdir), and therefore full path -needs to be given to vapigen. Otherwise, the build fails when build is -performed out-of-source. ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index e881100..dc6b0c9 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -257,7 +257,7 @@ VAPIGEN_VAPIS = librsvg-$(RSVG_API_VERSION).vapi - - librsvg_@RSVG_API_VERSION_U@_vapi_DEPS = gio-2.0 cairo - librsvg_@RSVG_API_VERSION_U@_vapi_METADATADIRS = $(srcdir) --librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir Rsvg-$(RSVG_API_VERSION)-custom.vala -+librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir $(srcdir)/Rsvg-$(RSVG_API_VERSION)-custom.vala - - vapidir = $(datadir)/vala/vapi - vapi_DATA = $(VAPIGEN_VAPIS) --- -2.0.0 - diff --git a/gnome-base/librsvg/librsvg-2.40.18.ebuild b/gnome-base/librsvg/librsvg-2.40.18.ebuild deleted file mode 100644 index 8d60a0d105d0..000000000000 --- a/gnome-base/librsvg/librsvg-2.40.18.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit autotools eutils gnome2 multilib-minimal vala - -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" -HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -IUSE="+introspection tools vala" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] - >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) - tools? ( >=x11-libs/gtk+-3.10.0:3 ) -" -DEPEND="${RDEPEND} - dev-libs/gobject-introspection-common - dev-libs/vala-common - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.13 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - vala? ( $(vala_depend) ) -" -# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=653323 - eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=731826 - eapply "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch" - - eautoreconf - - use vala && vala_src_prepare - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=() - - # -Bsymbolic is not supported by the Darwin toolchain - if [[ ${CHOST} == *-darwin* ]]; then - myconf+=( --disable-Bsymbolic ) - fi - - # --disable-tools even when USE=tools; the tools/ subdirectory is useful - # only for librsvg developers - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-static \ - --disable-tools \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_with tools gtk3) \ - $(multilib_native_use_enable vala) \ - --enable-pixbuf-loader \ - "${myconf[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/doc/html doc/html || die - fi -} - -multilib_src_compile() { - # causes segfault if set, see bug #411765 - unset __GL_NO_DSO_FINALIZER - gnome2_src_compile -} - -multilib_src_install() { - gnome2_src_install -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - multilib_foreach_abi gnome2_pkg_postinst -} - -pkg_postrm() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - multilib_foreach_abi gnome2_pkg_postrm -} diff --git a/gnome-base/librsvg/librsvg-2.40.20.ebuild b/gnome-base/librsvg/librsvg-2.40.20.ebuild index 258ad748ba0a..4c596c4cd131 100644 --- a/gnome-base/librsvg/librsvg-2.40.20.ebuild +++ b/gnome-base/librsvg/librsvg-2.40.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg" LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+introspection tools +vala" REQUIRED_USE="vala? ( introspection )" diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 895278f83457..f7ba8ff73c76 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,11 +1,5 @@ -AUX 3.30.5-CVE-2019-11461.patch 1099 BLAKE2B 8f906c2076f7f2c630bcc5a56f76ec18814932055eebea12b41335d3770403efa34f8350bd9bb2fbabeec36ed7249f5363d689d6ea8a9e1e1babebe19c36e6af SHA512 91c927814ae3763a634d26ccb357276b570bc57f176969e43b7e99dcb9f720bfec43003295e5058c43b512c94af2e4afc7b960e1b10009e1b0d365440e3eb37f AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459 -AUX 3.30.5-seccomp-sparc32.patch 675 BLAKE2B e8d9d9c4299cd700ea02656bf66f1ddec1801901161f026f78b88cc393793392c0e0af97a8de47a851545b5cd6305160233b952c1a0ba86ccc1d1f7dadf1dea0 SHA512 fe91a78d17a9142b8964d6d52778b32ac0b88e85dc0b1b05b838a1d90396f7c73927f9dce63ebe8585f8d1cdf94ebdc6a123b58196dc1248ce5aa6dce5d73990 -AUX 3.30.5-thumbnailer-updates.patch 3978 BLAKE2B 0c7c7147d5bf947617f32d6f1ec1949941f5f9cf77dd351ddeb3c41871e247eac10855b3075f81f4d3dfe0f692f76e25590d5db5d4823ec4d264b6a65ee3177e SHA512 2a14f9256c3ff5d2744038ede78fafdd27b033ee6576885faab35aff77b60c69035e3aa1400c183f9f0497b0bbb8890e3be6dfae5fa3a77df180601c185939d7 -AUX 3.30.5-thumbnailer-updates2.patch 1841 BLAKE2B 261cabfc7ee8334bbf00b469a601ba61f2ff78f3a4ed6fb860b7854c4198963769df5673cb5cdf2753fbfeeb540aa31f7fd29deda0431075747860068b468dff SHA512 44011606a10bb6d8f45cbc2b20b802ea347d930c44959de33bc0f395dd050e01884ec1b6a85b899b1b30aa6fde07fff8d6ff4dcb4d1a7fe86d27a9721668e8ab AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a -DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf DIST nautilus-3.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392 -EBUILD nautilus-3.30.5-r1.ebuild 2812 BLAKE2B 3f0057267cfea02f9c6d8db52363a24efc52836f932130c23ec64363899ece863590655aa87ffe323667033987c7999a1eac5cef897696688245e078f755c9f1 SHA512 481cde050147e497327d95d0cf1793653cf79b25b4ed74a9452e62e368330aa42f62e3056e16db54fba8bf681befef1dc1b7c61a38b6e43db3c914761c126361 EBUILD nautilus-3.32.3.ebuild 3065 BLAKE2B 3ddac42a49839e562e6b6f19a7f2c89a3cb3b89f63dde602eb8ea77eb246d8195544d7d3ac9237292b2274dcc5ec09736ad631a8b4a427369efb30c78c43c498 SHA512 21cf025cd1c3be04bbf2c4875926c160d8ca99e54d15fab41bab9d6f59ae8162ed2a19ed3230dea7afae19443e1ae29b6c9baabe28f16bbf0c234325617ee987 MISC metadata.xml 652 BLAKE2B e4161f58861954981a6837a9b6c7f6dd0b76dc84378ce2d9caea1375973d490751ce966753829b7b972a6c75d04519820f4cde8b6d4edc3b9a9abb7477c68a90 SHA512 a1906e74bd47437d2226ffb977f3f3d8c981a32f8d54d0f9e0156932b001b6e205b0e5b78ed5badb0b89c1ed1ff107f67e026bf5c4b088cfe95e2b69de8c6981 diff --git a/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch b/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch deleted file mode 100644 index 6c2d061123fa..000000000000 --- a/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 83949ed5800ec99953f5ee8d2bf8b90a69daa850 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@igalia.com> -Date: Sat, 13 Apr 2019 13:57:36 -0500 -Subject: [PATCH] thumbnailer: fix incomplete TIOCSTI filtering - -Fixes #112 - -See also: https://github.com/flatpak/flatpak/issues/2782 ---- - libgnome-desktop/gnome-desktop-thumbnail-script.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -leio: Adjusted to apply to nautilus copy - -diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c -index 9468b51c..3b3d1ea9 100644 ---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -343,7 +343,7 @@ setup_seccomp (GPtrArray *argv_array, - {SCMP_SYS (clone), &SCMP_A0 (SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER)}, - - /* Don't allow faking input to the controlling tty (CVE-2017-5226) */ -- {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_EQ, (int)TIOCSTI)}, -+ {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_MASKED_EQ, 0xFFFFFFFFu, (int)TIOCSTI)}, - }; - - struct --- -2.20.1 - diff --git a/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch b/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch deleted file mode 100644 index f67695b7f1d0..000000000000 --- a/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3b0fd7dd26fa5af0b310650b2974d800ace80802 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Fri, 15 Feb 2019 21:34:34 +0200 -Subject: [PATCH 2/2] meson.build: Add 32-bit sparc to seccomp unsupported list - -32-bit sparc doesn't support seccomp either. - -(cherry picked from commit 44b49e6ca02add9592abac03a8578b9eea1a5088) ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 50479f5f0..91915b31a 100644 ---- a/meson.build -+++ b/meson.build -@@ -72,6 +72,7 @@ unsupported_cpus = [ - 'parisc', - 'parisc64', - 'sh4', -+ 'sparc', - 'sparc64', - ] - system_supports_seccomp = host_system == 'linux' --- -2.17.0 - diff --git a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch deleted file mode 100644 index 84d0bfc1d5af..000000000000 --- a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 2e36d4bacc3cffebe62161adc375bb9ec64099f5 Mon Sep 17 00:00:00 2001 -From: Timothy OBrien <obrien.timothy.a@gmail.com> -Date: Fri, 18 Jan 2019 19:42:46 +1100 -Subject: [PATCH 1/2] gnome-desktop: update to latest version of upstream - thumbnail code - -The thumbnail code in gnome-desktop had recent bug fixes that needed to be carried across to the Nautilus implementation. Issues for the three related upstream fixes can be found at: https://gitlab.gnome.org/GNOME/gnome-desktop/issues/4 | https://gitlab.gnome.org/GNOME/gnome-desktop/issues/89 | https://gitlab.gnome.org/GNOME/gnome-desktop/issues/87 - -This patch includes the latest thumbnail code from the gnome-desktop repository to include the fixes. - -Fixes #836 - -(cherry picked from commit e88b2dc8783833c4263ad5d84567a67dbc7bc6de) ---- - .../gnome-desktop-thumbnail-script.c | 54 +++++++++++++++++-- - src/gnome-desktop/gnome-desktop-thumbnail.c | 4 +- - 2 files changed, 52 insertions(+), 6 deletions(-) - -diff --git a/src/gnome-desktop/gnome-desktop-thumbnail-script.c b/src/gnome-desktop/gnome-desktop-thumbnail-script.c -index 14e2fed3a..525766388 100644 ---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -506,22 +506,68 @@ setup_seccomp (GPtrArray *argv_array, - #endif - - #ifdef HAVE_BWRAP -+static gboolean -+path_is_usrmerged (const char *dir) -+{ -+ /* does /dir point to /usr/dir? */ -+ g_autofree char *target = NULL; -+ GStatBuf stat_buf_src, stat_buf_target; -+ -+ if (g_stat (dir, &stat_buf_src) < 0) -+ return FALSE; -+ -+ target = g_strdup_printf ("/usr/%s", dir); -+ -+ if (g_stat (target, &stat_buf_target) < 0) -+ return FALSE; -+ -+ return (stat_buf_src.st_dev == stat_buf_target.st_dev) && -+ (stat_buf_src.st_ino == stat_buf_target.st_ino); -+} -+ - static gboolean - add_bwrap (GPtrArray *array, - ScriptExec *script) - { -+ const char * const usrmerged_dirs[] = { "bin", "lib64", "lib", "sbin" }; -+ int i; -+ - g_return_val_if_fail (script->outdir != NULL, FALSE); - g_return_val_if_fail (script->s_infile != NULL, FALSE); - - add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/lib", "/lib", -- "--ro-bind", "/lib64", "/lib64", -+ "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", -+ NULL); -+ -+ /* These directories might be symlinks into /usr/... */ -+ for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++) -+ { -+ g_autofree char *absolute_dir = g_strdup_printf ("/%s", usrmerged_dirs[i]); -+ -+ if (!g_file_test (absolute_dir, G_FILE_TEST_EXISTS)) -+ continue; -+ -+ if (path_is_usrmerged (absolute_dir)) -+ { -+ g_autofree char *symlink_target = g_strdup_printf ("/usr/%s", absolute_dir); -+ -+ add_args (array, -+ "--symlink", symlink_target, absolute_dir, -+ NULL); -+ } -+ else -+ { -+ add_args (array, -+ "--ro-bind", absolute_dir, absolute_dir, -+ NULL); -+ } -+ } -+ -+ add_args (array, - "--proc", "/proc", - "--dev", "/dev", -- "--symlink", "usr/bin", "/bin", -- "--symlink", "usr/sbin", "/sbin", - "--chdir", "/", - "--setenv", "GIO_USE_VFS", "local", - "--unshare-all", -diff --git a/src/gnome-desktop/gnome-desktop-thumbnail.c b/src/gnome-desktop/gnome-desktop-thumbnail.c -index b31bad58d..f48fd461a 100644 ---- a/src/gnome-desktop/gnome-desktop-thumbnail.c -+++ b/src/gnome-desktop/gnome-desktop-thumbnail.c -@@ -967,8 +967,8 @@ get_preview_thumbnail (const char *uri, - if (file_info == NULL) - return NULL; - -- object = g_file_info_get_attribute_object (file_info, -- G_FILE_ATTRIBUTE_PREVIEW_ICON); -+ object = g_object_ref (g_file_info_get_attribute_object (file_info, -+ G_FILE_ATTRIBUTE_PREVIEW_ICON)); - g_object_unref (file_info); - - if (!object) --- -2.17.0 - diff --git a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch deleted file mode 100644 index 884deb420911..000000000000 --- a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 87aa2520989bafbd861a03a32d6fdb0d2620faf5 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Mon, 11 Mar 2019 23:23:11 +0200 -Subject: [PATCH] Sync gnome-desktop code - -Brings in fontconfig cache bind mount and a small memory fix; cache path hardcoded to Gentoo for now ---- - src/gnome-desktop/gnome-desktop-thumbnail-script.c | 4 ++++ - src/gnome-desktop/gnome-desktop-thumbnail.c | 6 ++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/gnome-desktop/gnome-desktop-thumbnail-script.c b/src/gnome-desktop/gnome-desktop-thumbnail-script.c -index 525766388..0331cb3c7 100644 ---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -+++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -565,6 +565,10 @@ add_bwrap (GPtrArray *array, - } - } - -+ /* fontconfig cache if necessary */ -+ if (!g_str_has_prefix ("/var/cache/fontconfig", "/usr/")) -+ add_args (array, "--ro-bind-try", "/var/cache/fontconfig", "/var/cache/fontconfig", NULL); -+ - add_args (array, - "--proc", "/proc", - "--dev", "/dev", -diff --git a/src/gnome-desktop/gnome-desktop-thumbnail.c b/src/gnome-desktop/gnome-desktop-thumbnail.c -index f48fd461a..566fbeb84 100644 ---- a/src/gnome-desktop/gnome-desktop-thumbnail.c -+++ b/src/gnome-desktop/gnome-desktop-thumbnail.c -@@ -967,8 +967,10 @@ get_preview_thumbnail (const char *uri, - if (file_info == NULL) - return NULL; - -- object = g_object_ref (g_file_info_get_attribute_object (file_info, -- G_FILE_ATTRIBUTE_PREVIEW_ICON)); -+ object = g_file_info_get_attribute_object (file_info, -+ G_FILE_ATTRIBUTE_PREVIEW_ICON); -+ if (object) -+ g_object_ref (object); - g_object_unref (file_info); - - if (!object) --- -2.17.0 - diff --git a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild deleted file mode 100644 index cdb86ae33285..000000000000 --- a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 gtk-doc +introspection packagekit +previewer seccomp selinux sendto" - -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" - -COMMON_DEPEND=" - >=dev-libs/glib-2.55.1:2 - >=media-libs/gexiv2-0.10.0 - >=app-arch/gnome-autoar-0.2.1 - gnome-base/gsettings-desktop-schemas - >=x11-libs/gtk+-3.22.27:3[X,introspection?] - seccomp? ( sys-libs/libseccomp ) - >=x11-libs/pango-1.28.3 - selinux? ( >=sys-libs/libselinux-2.0 ) - >=app-misc/tracker-2.0:= - x11-libs/libX11 - >=dev-libs/libxml2-2.7.8:2 - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -DEPEND="${COMMON_DEPEND} - >=dev-util/gdbus-codegen-2.51.2 - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gtk-doc-1.10 - app-text/docbook-xml-dtd:4.1.2 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - packagekit? ( app-admin/packagekit-base ) - seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) - sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) -" - -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}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc - "${FILESDIR}"/${PV}-thumbnailer-updates{,2}.patch # syncs with gnome-desktop; fixes the ld.so.cache for us - "${FILESDIR}"/${PV}-seccomp-sparc32.patch # 32-bit sparc doesn't have seccomp either - "${FILESDIR}"/${PV}-CVE-2019-11461.patch -) - -src_prepare() { - 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 - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc docs) - -Dextensions=true # image file properties, sendto support - $(meson_use introspection) - $(meson_use packagekit) - $(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() { - 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 -} |