From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- gnome-base/Manifest.gz | Bin 5703 -> 5703 bytes gnome-base/dconf-editor/Manifest | 2 - gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild | 44 ---- gnome-base/gdm/Manifest | 9 +- .../gdm/files/3.30.3-pam-drop-legacy-arg.patch | 29 +++ gnome-base/gdm/files/gdm-CanGraphical-wait.patch | 189 +++++++++++++++++ gnome-base/gdm/files/pam-elogind.patch | 24 +++ gnome-base/gdm/gdm-3.26.2.1-r1.ebuild | 205 ------------------ gnome-base/gdm/gdm-3.30.3-r2.ebuild | 228 +++++++++++++++++++++ gnome-base/gdm/gdm-3.30.3.ebuild | 201 ------------------ gnome-base/gdm/metadata.xml | 1 + gnome-base/gnome-control-center/Manifest | 12 +- .../files/3.26.2-gnome-desktop-3-28-compat.patch | 78 ------- .../files/3.26.2-goa-lifecycle.patch | 95 --------- .../files/3.26.2-without-wayland-fix.patch | 46 ----- .../gnome-control-center-3.26.2-r28.ebuild | 159 -------------- .../gnome-control-center-3.26.2-r3.ebuild | 160 --------------- .../gnome-control-center-3.28.2.ebuild | 149 -------------- .../gnome-control-center-3.30.3-r1.ebuild | 160 +++++++++++++++ .../gnome-control-center-3.30.3.ebuild | 153 -------------- gnome-base/gnome-core-apps/Manifest | 2 - .../gnome-core-apps/gnome-core-apps-3.26.2.ebuild | 52 ----- .../gnome-core-apps/gnome-core-apps-3.28.2.ebuild | 51 ----- gnome-base/gnome-core-libs/Manifest | 2 - .../gnome-core-libs/gnome-core-libs-3.26.2.ebuild | 41 ---- .../gnome-core-libs/gnome-core-libs-3.28.2.ebuild | 42 ---- gnome-base/gnome-extra-apps/Manifest | 6 +- .../gnome-extra-apps-3.24.2.ebuild | 4 +- .../gnome-extra-apps-3.26.2.ebuild | 76 ------- .../gnome-extra-apps-3.28.2.ebuild | 74 ------- .../gnome-extra-apps-3.30.2.ebuild | 2 +- gnome-base/gnome-light/Manifest | 1 - gnome-base/gnome-light/gnome-light-3.28.2.ebuild | 61 ------ gnome-base/gnome-session/Manifest | 4 - .../gnome-session/gnome-session-3.26.1.ebuild | 126 ------------ .../gnome-session/gnome-session-3.28.1.ebuild | 120 ----------- gnome-base/gnome-settings-daemon/Manifest | 10 +- .../files/3.28.1-fix-non-wayland-build.patch | 88 -------- ....settings-daemon.plugins.power.gschema.override | 2 + .../gnome-settings-daemon-3.26.2-r1.ebuild | 132 ------------ .../gnome-settings-daemon-3.28.1-r1.ebuild | 132 ------------ .../gnome-settings-daemon-3.30.2-r1.ebuild | 137 +++++++++++++ .../gnome-settings-daemon-3.30.2.ebuild | 130 ------------ gnome-base/gnome-shell/Manifest | 6 +- .../files/3.28.3-fix-gtk-doc-meson.patch | 59 ------ gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild | 193 ----------------- gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild | 2 +- gnome-base/gnome/Manifest | 2 - gnome-base/gnome/gnome-3.26.2.ebuild | 51 ----- gnome-base/gnome/gnome-3.28.2.ebuild | 51 ----- gnome-base/gvfs/Manifest | 4 - gnome-base/gvfs/gvfs-1.34.2.1-r1.ebuild | 132 ------------ gnome-base/gvfs/gvfs-1.34.2.1-r2.ebuild | 134 ------------ 53 files changed, 785 insertions(+), 3088 deletions(-) delete mode 100644 gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild create mode 100644 gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch create mode 100644 gnome-base/gdm/files/gdm-CanGraphical-wait.patch create mode 100644 gnome-base/gdm/files/pam-elogind.patch delete mode 100644 gnome-base/gdm/gdm-3.26.2.1-r1.ebuild create mode 100644 gnome-base/gdm/gdm-3.30.3-r2.ebuild delete mode 100644 gnome-base/gdm/gdm-3.30.3.ebuild delete mode 100644 gnome-base/gnome-control-center/files/3.26.2-gnome-desktop-3-28-compat.patch delete mode 100644 gnome-base/gnome-control-center/files/3.26.2-goa-lifecycle.patch delete mode 100644 gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch delete mode 100644 gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild delete mode 100644 gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild delete mode 100644 gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild create mode 100644 gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild delete mode 100644 gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild delete mode 100644 gnome-base/gnome-core-apps/gnome-core-apps-3.26.2.ebuild delete mode 100644 gnome-base/gnome-core-apps/gnome-core-apps-3.28.2.ebuild delete mode 100644 gnome-base/gnome-core-libs/gnome-core-libs-3.26.2.ebuild delete mode 100644 gnome-base/gnome-core-libs/gnome-core-libs-3.28.2.ebuild delete mode 100644 gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild delete mode 100644 gnome-base/gnome-extra-apps/gnome-extra-apps-3.28.2.ebuild delete mode 100644 gnome-base/gnome-light/gnome-light-3.28.2.ebuild delete mode 100644 gnome-base/gnome-session/gnome-session-3.26.1.ebuild delete mode 100644 gnome-base/gnome-session/gnome-session-3.28.1.ebuild delete mode 100644 gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch create mode 100644 gnome-base/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.override delete mode 100644 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild delete mode 100644 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild create mode 100644 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild delete mode 100644 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2.ebuild delete mode 100644 gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch delete mode 100644 gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild delete mode 100644 gnome-base/gnome/gnome-3.26.2.ebuild delete mode 100644 gnome-base/gnome/gnome-3.28.2.ebuild delete mode 100644 gnome-base/gvfs/gvfs-1.34.2.1-r1.ebuild delete mode 100644 gnome-base/gvfs/gvfs-1.34.2.1-r2.ebuild (limited to 'gnome-base') diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz index a8aad447e9d4..876c427e81ac 100644 Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest index 1fb9a0717216..8b7faa65ab05 100644 --- a/gnome-base/dconf-editor/Manifest +++ b/gnome-base/dconf-editor/Manifest @@ -1,7 +1,5 @@ DIST dconf-editor-3.26.2.tar.xz 542828 BLAKE2B e7bd35b39d7b0124105513d44f3a24d005f1c6daf2dccb1d3eeb324b65038adfc11e5ee83078058489b1e918222538a97621c74fb0a0ceb20e1a708ccf5a82bd SHA512 25a6536c97b4f6fc26890915e2d0ed3ff1d2247175fd25a7d86e44f33da8667064415b22890c799d3586cd0f08becc90414f02bf3d988aa1d02eee90d7e45ba5 -DIST dconf-editor-3.28.0.tar.xz 417244 BLAKE2B 1237b199b7b991055fe30829dff0554be7e3122001c9c1a3bd1b17dc1aeeb0a4df6536560b072559c96d4da0b26bdf234479cb9c38ae979d08c220348df48649 SHA512 435c159fd3356c19e459ed9441671b508c5ba1b2d9f491d304280ef66b980779fda5769bb2e1e85a294ceebe9e729e4899ac0ab750f86e5ccdbdc455cf1ffc44 DIST dconf-editor-3.30.2.tar.xz 447060 BLAKE2B 4cd8ab7200afaa402d6915a94be12b32a58fdf11ed77d4b833e3734b94de99bf7182d3564d1e0b42935d4364b2c973c296d773de402942af8e66f4ccbe6026be SHA512 c9fe4393e9c75ad19c56670a50199493a32ed55f3135ada599aef5efb4582320a23648da1906ce1a1b64918987fd3684f00bfc749a21a6fd2806066d760418c8 EBUILD dconf-editor-3.26.2.ebuild 705 BLAKE2B 62ece465f4d27773b1089f646660601c10d82efe5bf23811b8b5aa4a4d499a0876d649828305d1408f84d440d80c35a6b073c5ede6f85e541f268f2ccb0ed64a SHA512 40d057586b0eb2710c7d202c3aa5df4901eea00e75dc22f028b5271aca35dbfdc64f74048f6d56d2e11ae22802df91c2ff2c41e938b41a440a6acdc5aa31842a -EBUILD dconf-editor-3.28.0.ebuild 863 BLAKE2B 64b20c626f40bd0aff5fd40fa8ec2e22751f60b88747c8e474e70451218323fc4ad87a0f5b3253b0c75ec537b1832843989113c045e7163b0102f0f856967e96 SHA512 b999a3f7c4d479b37a94b8775aeeaeb9a6ebdce2029e57fbcb63f72980f8aca13568e4b050169b682353e27b50199d8d9493aafd2cf960348a3e291036a7f2de EBUILD dconf-editor-3.30.2.ebuild 863 BLAKE2B 28400984d4bf916ee25eb895185670f87f974d1cfda7313dc296bfc419f5d2b50ff3b723f843b6f20b2b5d5fd12930502beb85f199d61389fdc321ab82cdbe3b SHA512 aa34a24330ec65e5d8e52088cff55d0c5fda3095a55d6ec4bbe2003e5896d065b7fb1863ec3712424acd1ca50171b791faccd03ba6a3893911495a22755be40a MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild b/gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild deleted file mode 100644 index 1b5810193421..000000000000 --- a/gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VALA_MIN_API_VERSION="0.36" - -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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~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/gdm/Manifest b/gnome-base/gdm/Manifest index ef66e9770ff3..c59e531cefe3 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,16 +1,17 @@ AUX 3.24.3-CVE-2018-14424.patch 6513 BLAKE2B ac51cbf4412f53f8460037ca7a811c0f3b883afbd6fabbd248719594e8ec730aab4a9a9e8adece0c53d0dda99f900b0ad450b5d5cf7a74999abd6756983ee4e8 SHA512 7ab8875f15828d8601482953e7b7be96326ff23c0ec945ccbaa401370c622734388daeb6be1043fff8694498dbfe2d7fc74f90bf8c59170df67c78bdb731cd13 AUX 3.24.3-display-object-lifetime-fix.patch 3235 BLAKE2B d92c20c97f4007121029c1c719c7598af8dbcd181098ec52f0b61f281796d1a9e3981f644cd2bd0ae80025f63faf169db44b91b3075c42566ca0a5dfbd7f9ae3 SHA512 57a585a93754adc2448a2a85a55c90f7f27c5da0689debc93236ac3c26c79cf295abea73bcec5fce3d7651b3998715d11e2b232a35f590e53b52a859bc666523 +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 gdm-2.32.0-xinitrc-ssh-agent.patch 842 BLAKE2B 98233eaf06fbe0950aa36bbc8bee2ac7ffa3cdebe75e32b8ef9a5035c383135bfc77e201d2ee07e7ec6b53770bef20484a3fba93b1cd7f434253704b70563e38 SHA512 40630ec2e7bee66102e141a0ba4d02e4202d052bb829606f684b6c23c9f3dbc2d43cea71d7eba163398251af2d7c7b34d0abafee76ccd6400521551de1c385bd AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726e247aea1b3cad2a86c0b0e95c5f9953b680a072d244140615c38becbc605998a2be0ed3332d7b5ef802f55 SHA512 63428d4605d9f4f35445f364657c1d92818125a737add7bc5e5acab424beaf8ae5895368111cd2d1c03c75f5fd8b9538d8750ea732a0990b5b82507735850e4c AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5 AUX gdm-3.8.4-logo.patch 805 BLAKE2B 80c323529acfe9287009494060f3e4d588dcf415845d3502840674ac0108cdd721e9af71e2df7cf94bb69fb3526d76e96bd21f31ed002fce460b30fd2afa3a20 SHA512 98dc0b01f4a4cbb87b32ec52450eb21f07bf96dc4d919cf662314c50fe0f2b1a19c90e3d8d2a0de905e8ada41642c0f89aa89dd640ead7e3d732468c9e363fb2 +AUX gdm-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd +AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552efe8fe044da655037bfd603f1e4ab89a4eb0687f786bf44e9fd1c27e07bc498a769c8f88f0cc22b2dd1c9b1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345 -DIST gdm-3.26.2.1.tar.xz 1119568 BLAKE2B 42ccd3d30a5b22124777792ea3e0bb003771df1d3c5a729d29ff14efe5c6365a82126e6b204301b22dd51e4aaffcef4e018b8fdda45eb52e3b76bd921aca9312 SHA512 4a0009935f2f86803a4dd6cdc01c80c9ee89fb8a71f82ffa6fadb16322e4c7f51d82e0e887c30aa09d1b242c3cc82a1ec0d83463e5d8942719a747f6945cbec9 DIST gdm-3.30.3.tar.xz 1261224 BLAKE2B 338f946a24d2a7e4b3cf34ac6accff01f8e7ce5032ee4ce79a96b1a755693e09788c6225e45de9a91ae4afea595a0562511104a467e561ec179c3ad61810468f SHA512 17aed5bf7d27b07553703873cda28a711d6135497d36e4c241bcf1ab3552b31007cc241dab394dccf8a4f1daccf7d55ba39edf91f4b22bdea5c2aa1ea17404b8 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 EBUILD gdm-3.24.3-r1.ebuild 5913 BLAKE2B b3e84ae6eb46748fa125bb494134e3c0cf8e90d6583c0a270c96e513b0f0f5af5f5cb113a86047038a6a10a0c25add778d7307a886e51d67a156b0dd50decd37 SHA512 24875f6229628dd2f7e8810c473491df1a03a8577782ffd6b538828ee7b92a16de2f54f39abc319e066ede4e5ac46c6082bd3112afc9a51fc199d2dc20df22cc -EBUILD gdm-3.26.2.1-r1.ebuild 5938 BLAKE2B 4a666f06ee67a8b1ce137ff3a493f376d2561e037295277a9992784766971b5a567cba67ec9f21fee0853423f5b9cac87b110c96170f1b3a5654f5544e92cf44 SHA512 35913f4e965cc212774daf5f6e3de1ac3c769a59d04e1e012ee3651a2d00bbf2b78994c6e0451a1ecb3814f8edfe2c8d92e56f38d3444d3eac605756b79ebfa0 -EBUILD gdm-3.30.3.ebuild 6017 BLAKE2B 9d67099f2fc1c4aac168b0588b255fb7b56351da611d58c86e8c86a9f02f6e7c2ff1d08e6995e9a99899e9081a65f0828eb6bde829a581f06fd599fc7184436a SHA512 b8454b9a4c0c14b1ceebe10ebb9852c978f700f7d3be2642c0d4a446b323a0ca585b7555e899e1627cd3cf2f6ac9a0b61366da87c47ac0340170f56080e32786 -MISC metadata.xml 477 BLAKE2B 29eb8d343cd5195f35dc73d07c695dd3090f8f8ea436b88c8a8fb7f15beac82aaeb2b83215443851866e7fcec51aa14ff19c30597a74cd9a73b384ee801b16f0 SHA512 4da6d5a4f518596834d4138db716bf58d2b2f28f07fed6379a6f0d8bdecb6b803fb3b24880dfcb93ff5aac03f512bf08af7f9742d01a497dd4fc6d7a74d1a844 +EBUILD gdm-3.30.3-r2.ebuild 7175 BLAKE2B d3947d6167dc78bd29d2d4554b6debadd31b6cdc97169b66cf39ce0a83d9aefa58a3c1b76a38cec14887ebe7ad1399a3aebb413e2559783d931ff2218136c883 SHA512 2a699b93d8d0819e787050a901e76abe2b1cdabbccff7ba38731e3db01d5f0100e6cb66f643d586f85634445770a27d77c3e3575a1e9c6db9402e88fbb057cb0 +MISC metadata.xml 561 BLAKE2B c2f402e5b3695ebfd886f93f3974b82c0e287e971f81b3ffdd9d956edac9b80fa90829900da238c47421c64b87394d5c9bdd1c4675c0cf37a0e3681c746ba3cc SHA512 203bc4a106b2ce4270dbfbc91f45d6c488b41449b317370dfe1e3c26d2a28bd457d13bfa67e6b7c65f1520fca0cd0ca36197f2063dc4fdd296f76e156dbf4895 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 new file mode 100644 index 000000000000..8d82a284bf50 --- /dev/null +++ b/gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch @@ -0,0 +1,29 @@ +From a26ed5502622c22daa175861fa9d651a32131cf5 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +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 +(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/files/gdm-CanGraphical-wait.patch b/gnome-base/gdm/files/gdm-CanGraphical-wait.patch new file mode 100644 index 000000000000..206219d8e059 --- /dev/null +++ b/gnome-base/gdm/files/gdm-CanGraphical-wait.patch @@ -0,0 +1,189 @@ +From 198d6392ff595f330430d92d5c380cd993be73d7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= +Date: Tue, 16 Oct 2018 20:59:23 +0200 +Subject: [PATCH] gdm3.service: wait for drm device before trying to start it + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1794280 +Forwarded: not-needed +--- + configure.ac | 1 + + data/Makefile.am | 1 + + data/gdm.service.in | 1 + + utils/Makefile.am | 9 ++++ + utils/gdm-wait-for-drm.c | 101 +++++++++++++++++++++++++++++++++++++++ + 5 files changed, 113 insertions(+) + create mode 100644 utils/gdm-wait-for-drm.c + +diff --git a/configure.ac b/configure.ac +index a8dcfbef..2755c100 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(COMMON, + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + gio-unix-2.0 >= $GLIB_REQUIRED_VERSION ++ gudev-1.0 + ) + AC_SUBST(COMMON_CFLAGS) + AC_SUBST(COMMON_LIBS) +diff --git a/data/Makefile.am b/data/Makefile.am +index 162074f1..5f426fea 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -204,6 +204,7 @@ systemdsystemunit = + gdm.service: $(srcdir)/gdm.service.in + $(AM_V_GEN)sed \ + -e 's,[@]sbindir[@],$(sbindir),g' \ ++ -e 's,[@]libexecdir[@],$(libexecdir),g' \ + -e 's,[@]GDM_INITIAL_VT[@],$(GDM_INITIAL_VT),g' \ + -e 's,[@]LANG_CONFIG_FILE[@],$(LANG_CONFIG_FILE),g' \ + -e 's,[@]PLYMOUTH_QUIT_SERVICE[@],$(PLYMOUTH_QUIT_SERVICE),g' \ +diff --git a/data/gdm.service.in b/data/gdm.service.in +index 57d60ada..f7630ec4 100644 +--- a/data/gdm.service.in ++++ b/data/gdm.service.in +@@ -30,6 +30,7 @@ StandardError=inherit + EnvironmentFile=-@LANG_CONFIG_FILE@ + ExecReload=/bin/kill -SIGHUP $MAINPID + KeyringMode=shared ++ExecStartPre=@libexecdir@/gdm-wait-for-drm + + [Install] + Alias=display-manager.service +diff --git a/utils/Makefile.am b/utils/Makefile.am +index babe890b..3eb43c30 100644 +--- a/utils/Makefile.am ++++ b/utils/Makefile.am +@@ -35,6 +35,7 @@ bin_PROGRAMS = \ + + libexec_PROGRAMS = \ + gdm-disable-wayland \ ++ gdm-wait-for-drm \ + $(NULL) + + gdmflexiserver_LDADD = \ +@@ -63,6 +64,14 @@ gdm_disable_wayland_SOURCES = \ + gdm-disable-wayland.c \ + $(NULL) + ++gdm_wait_for_drm_LDADD = \ ++ $(COMMON_LIBS) \ ++ $(NULL) ++ ++gdm_wait_for_drm_SOURCES = \ ++ gdm-wait-for-drm.c \ ++ $(NULL) ++ + CLEANFILES = \ + $(NULL) + +diff --git a/utils/gdm-wait-for-drm.c b/utils/gdm-wait-for-drm.c +new file mode 100644 +index 00000000..aeffb3c0 +--- /dev/null ++++ b/utils/gdm-wait-for-drm.c +@@ -0,0 +1,101 @@ ++#include ++#include ++ ++/* ++ * Workaround for LP: #1794280. ++ * ++ * That bug is because the DRM device isn't ready by the time GDM tries to ++ * start wayland/X. ++ * This is a script to add to ExecStartPre of gdm.service. It does the ++ * following: ++ * ++ * 1. Enumerate drm devices from udev, looking for a DRM master. If found, ++ * exit. ++ * 2. Connect to the 'uevent' signal of gudev, watching for the same to be ++ * added. Again exit if any are found. ++ * 3. If, after 10 seconds, we haven't seen anything, try to proceed anyway as ++ * a failsafe. ++ */ ++ ++static gboolean ++handle_device (GUdevDevice *device) ++{ ++ const gchar * const * tags; ++ tags = g_udev_device_get_tags (device); ++ g_debug ("%s\n", g_udev_device_get_name (device)); ++ if (g_strv_contains (tags, "master-of-seat")) ++ { ++ g_debug (" is seat master\n"); ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static void ++uevent_cb (GUdevClient *client G_GNUC_UNUSED, ++ gchar *action, ++ GUdevDevice *device, ++ gpointer user_data) ++{ ++ GMainLoop *loop; ++ ++ g_debug ("uevent action: %s\n", action); ++ ++ loop = (GMainLoop *) user_data; ++ ++ if (g_strcmp0 (action, "add") == 0) ++ { ++ if (handle_device (device)) ++ { ++ g_debug (" this is good\n"); ++ g_main_loop_quit (loop); ++ } ++ else ++ { ++ g_debug (" this is bad\n"); ++ } ++ } ++} ++ ++int ++main() ++{ ++ const gchar * const subsystems[] = { "drm", NULL }; ++ ++ g_autoptr(GList) devices = NULL; ++ g_autoptr(GMainLoop) loop = NULL; ++ g_autoptr(GUdevClient) udev_client = NULL; ++ g_autoptr(GUdevEnumerator) enumerator = NULL; ++ ++ loop = g_main_loop_new (NULL, FALSE); ++ ++ udev_client = g_udev_client_new (subsystems); ++ enumerator = g_udev_enumerator_new (udev_client); ++ g_udev_enumerator_add_match_is_initialized (enumerator); ++ g_udev_enumerator_add_match_subsystem (enumerator, "drm"); ++ ++ devices = g_udev_enumerator_execute (enumerator); ++ ++ g_debug ("enumerating devices...\n"); ++ ++ for (GList *l = devices; l != NULL; l = l->next) ++ { ++ g_autoptr(GUdevDevice) device = G_UDEV_DEVICE (l->data); ++ ++ if (handle_device (device)) ++ { ++ g_debug (" good enough for gdm\n"); ++ return EXIT_SUCCESS; ++ } ++ } ++ ++ g_signal_connect (udev_client, "uevent", G_CALLBACK (uevent_cb), loop); ++ ++ /* after 10 seconds we try anyway */ ++ g_timeout_add_seconds (10, (GSourceFunc) g_main_loop_quit, loop); ++ ++ g_main_loop_run (loop); ++ ++ return EXIT_SUCCESS; ++} +-- +2.17.0 + diff --git a/gnome-base/gdm/files/pam-elogind.patch b/gnome-base/gdm/files/pam-elogind.patch new file mode 100644 index 000000000000..e17bed395b54 --- /dev/null +++ b/gnome-base/gdm/files/pam-elogind.patch @@ -0,0 +1,24 @@ +From 96e605d6bd832a89f022872492a9c9cb1eb62f66 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Tue, 19 Mar 2019 23:13:29 +0200 +Subject: [PATCH 2/2] pam-exherbo: Support elogind + +--- + data/pam-exherbo/gdm-launch-environment.pam | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/pam-exherbo/gdm-launch-environment.pam b/data/pam-exherbo/gdm-launch-environment.pam +index 51a8e003..c697a528 100644 +--- a/data/pam-exherbo/gdm-launch-environment.pam ++++ b/data/pam-exherbo/gdm-launch-environment.pam +@@ -8,6 +8,7 @@ auth required pam_permit.so + + password required pam_deny.so + ++-session optional pam_elogind.so + -session optional pam_systemd.so + session optional pam_keyinit.so force revoke + session required pam_succeed_if.so audit quiet_success user = gdm +-- +2.17.0 + diff --git a/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild b/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild deleted file mode 100644 index 5d46e8815208..000000000000 --- a/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 pam readme.gentoo-r1 systemd user - -DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/Projects/GDM" - -SRC_URI="${SRC_URI} - branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) -" - -LICENSE=" - GPL-2+ - branding? ( CC-BY-SA-4.0 ) -" - -SLOT="0" - -IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86" - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -# nspr used by smartcard extension -# dconf, dbus and g-s-d are needed at install time for dconf update -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -# Requires org.gnome.SettingsDaemon.A11yKeyboard component which doesn't exist in 3.28 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.36:2[dbus] - >=x11-libs/gtk+-2.91.1:3 - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - =media-libs/fontconfig-2.5.0:1.0 - >=media-libs/libcanberra-0.4[gtk3] - sys-apps/dbus - >=sys-apps/accountsservice-0.6.35 - - x11-apps/sessreg - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libxcb - >=x11-misc/xdg-utils-1.0.2-r3 - - virtual/pam - >=sys-apps/systemd-186:0=[pam] - - sys-auth/pambase[systemd] - - audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-session-3.6 - >=gnome-base/gnome-shell-3.1.90 - x11-apps/xhost - - accessibility? ( - >=app-accessibility/orca-3.10 - gnome-extra/mousetweaks ) - fprint? ( - sys-auth/fprintd - sys-auth/pam_fprint ) - - !gnome-extra/fast-user-switch-applet -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - dev-util/glib-utils - >=dev-util/intltool-0.40.0 - dev-util/itstool - virtual/pkgconfig - x11-base/xorg-proto - test? ( >=dev-libs/check-0.9.4 ) -" - -DOC_CONTENTS=" - To make GDM start at boot, run:\n - # systemctl enable gdm.service\n - \n - For passwordless login to unlock your keyring, you need to install - sys-auth/pambase with USE=gnome-keyring and set an empty password - on your keyring. Use app-crypt/seahorse for that.\n - \n - You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 - for smartcard support -" - -pkg_setup() { - enewgroup gdm - enewgroup video # Just in case it hasn't been created yet - enewuser gdm -1 -1 /var/lib/gdm gdm,video - - # For compatibility with certain versions of nvidia-drivers, etc., need to - # ensure that gdm user is in the video group - if ! egetent group video | grep -q gdm; then - # FIXME XXX: is this at all portable, ldap-safe, etc.? - # XXX: egetent does not have a 1-argument form, so we can't use it to - # get the list of gdm's groups - local g=$(groups gdm) - elog "Adding user gdm to video group" - usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" - fi -} - -src_prepare() { - # ssh-agent handling must be done at xinitrc.d, bug #220603 - eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" - - # Gentoo does not have a fingerprint-auth pam stack - eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" - - # CVE-2018-14424, bug #662782 - eapply "${FILESDIR}/3.24.3-CVE-2018-14424.patch" - eapply "${FILESDIR}/3.24.3-display-object-lifetime-fix.patch" - - # Show logo when branding is enabled - use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch" - - gnome2_src_prepare -} - -src_configure() { - local myconf - # PAM is the only auth scheme supported - # even though configure lists shadow and crypt - # they don't have any corresponding code. - # --with-at-spi-registryd-directory= needs to be passed explicitly because - # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 - # Xevie is obsolete, bug #482304 - # --with-initial-vt=7 conflicts with plymouth, bug #453392 - ! use plymouth && myconf="${myconf} --with-initial-vt=7" - - gnome2_src_configure \ - --enable-gdm-xsession \ - --enable-user-display-server \ - --with-run-dir=/run/gdm \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - --with-xdmcp=yes \ - --enable-authentication-scheme=pam \ - --with-default-pam-config=exherbo \ - --with-pam-mod-dir=$(getpam_mod_dir) \ - --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ - --without-xevie \ - --enable-systemd-journal \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $(use_with audit libaudit) \ - $(use_enable ipv6) \ - $(use_with plymouth) \ - $(use_with selinux) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable wayland wayland-support) \ - $(use_with xinerama) \ - ${myconf} -} - -src_install() { - gnome2_src_install - - if ! use accessibility ; then - rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die - fi - - exeinto /etc/X11/xinit/xinitrc.d - newexe "${FILESDIR}/49-keychain-r1" 49-keychain - newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent - - # gdm user's home directory - keepdir /var/lib/gdm - fowners gdm:gdm /var/lib/gdm - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm - - use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable gdm.service - readme.gentoo_print_elog -} diff --git a/gnome-base/gdm/gdm-3.30.3-r2.ebuild b/gnome-base/gdm/gdm-3.30.3-r2.ebuild new file mode 100644 index 000000000000..7acebf2d3d85 --- /dev/null +++ b/gnome-base/gdm/gdm-3.30.3-r2.ebuild @@ -0,0 +1,228 @@ +# 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 branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama" +REQUIRED_USE="^^ ( elogind systemd )" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.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 + + virtual/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 + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + systemd_reenable gdm.service + readme.gentoo_print_elog +} diff --git a/gnome-base/gdm/gdm-3.30.3.ebuild b/gnome-base/gdm/gdm-3.30.3.ebuild deleted file mode 100644 index 1b23de4ad557..000000000000 --- a/gnome-base/gdm/gdm-3.30.3.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 pam readme.gentoo-r1 systemd 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 branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86" - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -# nspr used by smartcard extension -# dconf, dbus and g-s-d are needed at install time for dconf update -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.44:2 - >=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 - - virtual/pam - >=sys-apps/systemd-186:0=[pam] - - sys-auth/pambase[systemd] - - audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-session-3.6 - >=gnome-base/gnome-shell-3.1.90 - x11-apps/xhost - - accessibility? ( - >=app-accessibility/orca-3.10 - gnome-extra/mousetweaks ) - fprint? ( - sys-auth/fprintd - sys-auth/pam_fprint ) - - !gnome-extra/fast-user-switch-applet -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto - test? ( >=dev-libs/check-0.9.4 ) -" - -DOC_CONTENTS=" - To make GDM start at boot, run:\n - # systemctl enable gdm.service\n - \n - For passwordless login to unlock your keyring, you need to install - sys-auth/pambase with USE=gnome-keyring and set an empty password - on your keyring. Use app-crypt/seahorse for that.\n - \n - You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 - for smartcard support -" - -pkg_setup() { - enewgroup gdm - enewgroup video # Just in case it hasn't been created yet - enewuser gdm -1 -1 /var/lib/gdm gdm,video - - # For compatibility with certain versions of nvidia-drivers, etc., need to - # ensure that gdm user is in the video group - if ! egetent group video | grep -q gdm; then - # FIXME XXX: is this at all portable, ldap-safe, etc.? - # XXX: egetent does not have a 1-argument form, so we can't use it to - # get the list of gdm's groups - local g=$(groups gdm) - elog "Adding user gdm to video group" - usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" - fi -} - -src_prepare() { - # ssh-agent handling must be done at xinitrc.d, bug #220603 - eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" - - # Gentoo does not have a fingerprint-auth pam stack - eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" - - # 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" - - gnome2_src_configure \ - --enable-gdm-xsession \ - --enable-user-display-server \ - --with-run-dir=/run/gdm \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - --with-xdmcp=yes \ - --enable-authentication-scheme=pam \ - --with-default-pam-config=exherbo \ - --with-pam-mod-dir=$(getpam_mod_dir) \ - --with-udevdir=$(get_udevdir) \ - --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ - --without-xevie \ - --enable-systemd-journal \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $(use_with audit libaudit) \ - $(use_enable ipv6) \ - $(use_with plymouth) \ - $(use_with selinux) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable wayland wayland-support) \ - $(use_with xinerama) -} - -src_install() { - gnome2_src_install - - if ! use accessibility ; then - rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die - fi - - exeinto /etc/X11/xinit/xinitrc.d - newexe "${FILESDIR}/49-keychain-r1" 49-keychain - newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent - - # gdm user's home directory - keepdir /var/lib/gdm - fowners gdm:gdm /var/lib/gdm - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm - - use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable gdm.service - readme.gentoo_print_elog -} diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml index 747420ed8b55..ac51d07ebe21 100644 --- a/gnome-base/gdm/metadata.xml +++ b/gnome-base/gdm/metadata.xml @@ -6,6 +6,7 @@ Gentoo GNOME Desktop + Use sys-auth/elogind for session management Enables experimental fingerprint authentication using sys-auth/fprintd Enable support for smooth transition from diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 803cedaa2bc6..69569d1b4042 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,18 +1,8 @@ -AUX 3.26.2-gnome-desktop-3-28-compat.patch 2726 BLAKE2B 033eda60333bc08ff6c9a766d00f49f881ff86a0e19f8a33e75b9ee2c75cd8ef49ae6cf466d42dc9f9d8852f63da68992b1c78d0a5a36b809ee75c04bc257bc5 SHA512 d49d634ce59a10512cb91f96da494a5c4d732622acdb3b1c0e89b6428fe3269f0404bd60f6fc2456c08b6e7e6fb34180d8bd8ae4a5687bd9f6fffd2ff933c2fc -AUX 3.26.2-goa-lifecycle.patch 3691 BLAKE2B dd41ac81c11bbe41c2b68017b5dfde12718c1c198e2e57357a5c4614ab65618599908dbc2fd0eef5cee8b3b1448c2da4b44b2b8321697cb70479d5752de8137c SHA512 6d8234687ca4dedbeda83f4e5b77195287b4f5fb6d94aa0ac52516cc9ed71b20f6e24ac5cd0ee6a6b3fcddb3584013b693e1688d7b58f762787cde11d9fe975c -AUX 3.26.2-without-wayland-fix.patch 1546 BLAKE2B a675dbf8c7b8a5e5a6fdcd8204d673018a09836022d8ccd3e582b3c991a1fc9a796fcb23cd5e6779c5c8cb11b88153819c1bb6f28d5d9495ecf3bcf1e47a23bf SHA512 d7dd7f1cb4db63a771c8116288ebdc4c0bf8dd515ea9f94c6f4f8f76c2dc5fe4cb21e178e76e351b8a50f7acfbf818be9f3864e3c8df5b0604b8b285d49d7978 AUX 3.30.3-conditional-cups-tests.patch 767 BLAKE2B 7f92f98da527c96dd6c6cd236085af41a0292ad635c9c68f078eb0c9a54ada04c51d7fba805dbb0b1340b7de94f49d65d9492c942600722830719f6d551c10f2 SHA512 37481ac8ffcd2a56fb55521f179bee03007cc93ef40e74d7571be501ac4a4447099a17a41df78ae9ecf5f6f04138c31d74dfe41ecc656d870190027209a26113 DIST gnome-control-center-3.24.4-patchset.tar.xz 8076 BLAKE2B e70086987957b4c33fff6d3b5038ffc260fc47520de4606fa96a0993cee4eea699bb57e8c0a6406e7d5c99adde702351d6462bf0594398f48f6ba4c9bc217417 SHA512 6228bffb71b61a100248f2f3ffc659532e9a067579d0dcf869e58ba9fb5d0b3e745a3bda2a92caa5bc86f8809885268b543f6863262dc6fef52b61e74eaef927 DIST gnome-control-center-3.24.4.tar.xz 7320232 BLAKE2B 29a5860b8cc27f161451ae8c053db1d28e8c5f8714cbccac7674c00689569ac4e51f7deb0a341e0868b1467a095f87d685ea0ec733f69274f02ecaf5badfef6e SHA512 34a59d4d89971054b1f54e7a7e3cbc3c306a3fbe3cc94adf1241ad37076a6179c93f04a95e51e57982eda57187e578005060d711a5d955734d5a138e61b3598a -DIST gnome-control-center-3.26.2-patchset.tar.xz 159088 BLAKE2B 521af115f7d4372ecf645b915e9081607a6699528b2914e73f11856fc9a8ae80406c210ad97b5d84b616d324d0c1539e2155c5e6db4920cbd8355b85f21a8e3b SHA512 90bf9e19b98dcc39fe5af6604876e5d9fe31358a4da602fe518589d9b3a9261fee3b3785f40a889295e3e7b38370173d03350f475be576830efa2ad74718c19e -DIST gnome-control-center-3.26.2.tar.xz 7386516 BLAKE2B 156c24bc2ab60943ade1e255976e29478c9b0e9dbad12921a835ec55f09ad62c71886750a50fa74f2a0afb660cac073c9ff54cef4b72c790b6dd91c7cac8aaa9 SHA512 d3ad9067c7e66a3a6bf5b6c058f3862f6e4b59c0254fd47f0b4a9093f3b7e2d7f1900b510aba8bbdac7c1212a0f6cdd4974c3d04003af63edb72ed3e56f7dbca -DIST gnome-control-center-3.28.2-patchset.tar.xz 75820 BLAKE2B 7f7cda69248862eb9ddba5d69d84c6cf1e550a9db6d914d4f5327b107d01bcb4b40152889ffc13700a8e777b805b037a267e9b641df65612a86099e0851ab417 SHA512 927287e98d1b958b27a644a90fe3da38ba3040a60e4318268f46e764226906d851148370635ab232748f5ef78cf9406b71025738cdec951582042ce4282914c6 -DIST gnome-control-center-3.28.2.tar.xz 5857128 BLAKE2B 253c220fdc759a26f23210a7665323ccdfb18e5f76652791718f2523badbac1f42c9c0fd75e5505c1e3d5f7391abc344b47cb101741ef35ed60859c4c16d7988 SHA512 3e1b54cf1a603ee7c47d8b0f1fb025405c8d133c9e0dbe0eaf2f287eff82109e95581c79f131d227422d682b7049ccb6e6297dba1ff2276cff5f715308195d7f DIST gnome-control-center-3.30.3-patchset.tar.xz 65244 BLAKE2B d210f94e0058e628401ea74fa90582721aaffddfb0e3f8e78013edde0d2f712d4433c316b3da08c9ec1038200cfd4e9b1a315b224d2e881d056b0f685f7067eb SHA512 99519c54ef223b94d5101987b7d7dc203c447765ef79374a3f0911282cd77917f64dea7318d70c63b8df8506c058fa1fcb1d71b23488b3ca9be993667509b7d1 DIST gnome-control-center-3.30.3.tar.xz 5889900 BLAKE2B a03153cb689edc3c8c96a0f184f8831a8df218691fefd035842170871eebb6f17e34405e7c4c18da6a191b92c7b58fcd40b252cdb67154becdf7e7ac6a63aa8f SHA512 85c7b51d6bc32f73d7f4ad6df8d4cc14c59e19da88d7a17b7337f995483f41008213ca829247a3c9db43c4b31eae0be321ed6804570660fbe0356da3dd0948dc EBUILD gnome-control-center-3.24.4.ebuild 4912 BLAKE2B d850ac29017bc316776eea8c6f5fccc61d0189bcf539c05812c2aea4b9ab84fd6a7f49b59aa2278115c9c98707f94f5c67dd5d8a2663f6353db8a78be7422161 SHA512 bf26a543f04fbd28c7c27b0833210946a1c03a803bbe676cde97906fa15bd1c655b3e91bfedd469947b1669be863b8708422993a74eb6cca55a827a67a5910b8 -EBUILD gnome-control-center-3.26.2-r28.ebuild 5258 BLAKE2B c4b203840af046a6ccc95d74ccab2304306ac094840ec18c6e6ba56f95fa59c4091160778bc1e6d62277c3457f32131b8aee8146ac997bcb7ecd36646f01599e SHA512 a83508a628d7bccf46c77a9fd77ca9c952dd31c7417b6642d13706698c6ba74a9be261643a5b36dfde1a995c231ed399b2c467511a4a8216f0c808382999c053 -EBUILD gnome-control-center-3.26.2-r3.ebuild 5270 BLAKE2B e5dcca2bc3a6ab5d474ec1461d19072b5b1933e08319b9d7c8df8d59dffce3b1dc111b3fd834187c69fc53ee110f77173ba65c60c5f37a1429d0cf673e909801 SHA512 34eebe34fe2b6cd05164bb364c4b6eaf6f2c064792cb032e9a53202030ca029314669eb92e9aeffd3095158e2e4d605aa772c72f4dfddd14527b10cd82c3e995 -EBUILD gnome-control-center-3.28.2.ebuild 5235 BLAKE2B 4a6094a68fec23b788565f78e034ae798e1ebee31b9f03a4b3f880b84863b7507e579530403e5e575f6568e12805f2495ebdc298a199f1db65b347d2c70e1b8a SHA512 0ea26b9e5f265c16a5280d81d864717f8bfbe999c6b26e1863259c4a4d60fa8435c126b686fa9879c5448135ff7436f24dda0cdf215b9054eae6ee88cd5b2b8b -EBUILD gnome-control-center-3.30.3.ebuild 5449 BLAKE2B deba6ca1be7aa03a8ac2f84848512001acf095a31dac0083fcf18c6a3755ffb43cea96e5ab4005c080b7400f0c46fb891b54332b796424f98c1ed4d755d1a8f8 SHA512 fb1ad500a5e25b0dba48e42bf746209fdf051805a99e953a802d4dd949d3e198b4a33d29ac6cc5675915ed48716eeeb7a6b41ed0a4a3f0de2f4e41f45520a5ee +EBUILD gnome-control-center-3.30.3-r1.ebuild 5837 BLAKE2B 9a1a6e80e77851803e860046037b29c7ca6ea9e571b500cafd4f24d036babcd6648a816568baa6c8844917af17614831fb83120d1704c04e3b510b092f26b285 SHA512 b2f93f7e95ababbd00b28dc83e941add95db0316f1a565f5e66228c1beac43a58f88a1e01bc3f65d0277ffd3b2b8d3c8c0d1d9cb296326bf5c3bde3d23fbf72b MISC metadata.xml 675 BLAKE2B e22d57c5a893d8c2a20851671a82741ea1918a6792444898a808a2b50668fd0fc6d712025b167fff6371644e7eaa182ef4bfd0a85718f7fee57fb0d586ff62cf SHA512 debac95237dacc2b937bb9d4a75f569f10c7798434a2b22cff342d51b7c50a6a78af1aeddf0ee3274cac332b55d25b2d3da8482b49d8d355e6428aca11e1b908 diff --git a/gnome-base/gnome-control-center/files/3.26.2-gnome-desktop-3-28-compat.patch b/gnome-base/gnome-control-center/files/3.26.2-gnome-desktop-3-28-compat.patch deleted file mode 100644 index f90e0514dd7c..000000000000 --- a/gnome-base/gnome-control-center/files/3.26.2-gnome-desktop-3-28-compat.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 6c98cbb514b2a455dd27f3a32a48e43a65cd29a2 Mon Sep 17 00:00:00 2001 -From: Robert Ancell -Date: Tue, 26 Sep 2017 14:12:13 -0400 -Subject: [PATCH 2/2] background: Remove GdkColor deprecation warnings - -https://bugzilla.gnome.org/show_bug.cgi?id=788205 -(cherry picked from commit ed03e9c49faafba132ab4077daeaf213b541aed7) ---- - configure.ac | 2 +- - panels/background/cc-background-item.c | 19 ++++++++++--------- - 2 files changed, 11 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 90579ac9f..f810bfb1f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -97,7 +97,7 @@ NETWORK_MANAGER_REQUIRED_VERSION=1.2.0 - NETWORK_MANAGER_APPLET_REQUIRED_VERSION=1.2.0 - MODEM_MANAGER_REQUIRED_VERSION=0.7 - LIBNOTIFY_REQUIRED_VERSION=0.7.3 --GNOME_DESKTOP_REQUIRED_VERSION=3.21.2 -+GNOME_DESKTOP_REQUIRED_VERSION=3.27.3 - SCHEMAS_REQUIRED_VERSION=3.21.4 - LIBWACOM_REQUIRED_VERSION=0.7 - CLUTTER_REQUIRED_VERSION=1.11.3 -diff --git a/panels/background/cc-background-item.c b/panels/background/cc-background-item.c -index 92220f823..8f8759bd0 100644 ---- a/panels/background/cc-background-item.c -+++ b/panels/background/cc-background-item.c -@@ -150,8 +150,9 @@ get_emblemed_pixbuf (CcBackgroundItem *item, GdkPixbuf *pixbuf, gint scale_facto - static void - set_bg_properties (CcBackgroundItem *item) - { -- GdkColor pcolor = { 0, 0, 0, 0 }; -- GdkColor scolor = { 0, 0, 0, 0 }; -+ GdkRGBA pcolor = { 0, 0, 0, 0 }; -+ GdkRGBA scolor = { 0, 0, 0, 0 }; -+ GdkColor p, s; - - if (item->priv->uri) { - GFile *file; -@@ -166,13 +167,13 @@ set_bg_properties (CcBackgroundItem *item) - } - - if (item->priv->primary_color != NULL) { -- gdk_color_parse (item->priv->primary_color, &pcolor); -+ gdk_rgba_parse (&pcolor, item->priv->primary_color); - } - if (item->priv->secondary_color != NULL) { -- gdk_color_parse (item->priv->secondary_color, &scolor); -+ gdk_rgba_parse (&scolor, item->priv->secondary_color); - } - -- gnome_bg_set_color (item->priv->bg, item->priv->shading, &pcolor, &scolor); -+ gnome_bg_set_rgba (item->priv->bg, item->priv->shading, &pcolor, &scolor); - gnome_bg_set_placement (item->priv->bg, item->priv->placement); - } - -@@ -996,12 +997,12 @@ static gboolean - colors_equal (const char *a, - const char *b) - { -- GdkColor color1, color2; -+ GdkRGBA color1, color2; - -- gdk_color_parse (a, &color1); -- gdk_color_parse (b, &color2); -+ gdk_rgba_parse (&color1, a); -+ gdk_rgba_parse (&color2, b); - -- return gdk_color_equal (&color1, &color2); -+ return gdk_rgba_equal (&color1, &color2); - } - - gboolean --- -2.17.0 - diff --git a/gnome-base/gnome-control-center/files/3.26.2-goa-lifecycle.patch b/gnome-base/gnome-control-center/files/3.26.2-goa-lifecycle.patch deleted file mode 100644 index bbc8befdf280..000000000000 --- a/gnome-base/gnome-control-center/files/3.26.2-goa-lifecycle.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a1bc1ae54d2330e32eac7b4df7c07393df87e7da Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Thu, 4 Oct 2018 11:28:15 +0200 -Subject: [PATCH 1/2] online-accounts: Track the lifecycle of CcGoaPanel across - async calls - -Due to an API bug in GNOME Online Accounts, the asynchronous -goa_provider_get_all method doesn't accept a GCancellable argument. -This makes it difficult to cancel an ongoing call when the CcGoaPanel -gets destroyed. - -Prior to commit c26f8ae018900a55, this was hacked around by taking a -reference on the panel for the duration of the call. Instead of -cancelling a pending call on destruction, it would keep the panel alive -until the call was over. However, that was lost during commit -c26f8ae018900a55. - -One thing to bear in mind is that GtkWidgets, CcGoaPanel is one, can -be destroyed by a gtk_widget_destroy call, which is subtly different -than a simple sequence of g_object_unref calls. When gtk_widget_destroy -is used, it invokes the GObject::dispose virtual method of the widget. -It is expected this will cause anything holding a reference to this -widget to drop their references, leading to GObject::finalize being -called. However, there is no guarantee that this will happen in the -same iteration of the GMainLoop. Therefore, it is possible that when -the goa_provider_get_all call finishes, the CcGoaPanel might be in a -disposed, but not yet finalized state. - -When a GObject is in a disposed-but-not-finalized state, only a very -limited number of operations can be performed on it. Its reference -count can be altered, the memory used by the instance struct can be -accessed, but none of the member GObjects can be assumed to be valid. -eg., it's definitely illegal to add new rows to the member GtkListBox. -Hence a boolean flag is used to mark the destroyed state of the panel. - -This second part is a small improvement over the earlier hack. - -https://gitlab.gnome.org/GNOME/gnome-control-center/issues/208 -(cherry picked from commit 83558429b3f98a4bf4ada17b64f09f073a6b8c38) ---- - panels/online-accounts/cc-online-accounts-panel.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c -index edd140e4b..1640c74c4 100644 ---- a/panels/online-accounts/cc-online-accounts-panel.c -+++ b/panels/online-accounts/cc-online-accounts-panel.c -@@ -56,6 +56,7 @@ struct _CcGoaPanel - GtkWidget *stack; - GtkWidget *accounts_vbox; - -+ gboolean destroyed; - guint remove_account_timeout_id; - }; - -@@ -401,6 +402,8 @@ cc_goa_panel_dispose (GObject *object) - /* Must be destroyed in dispose, not finalize. */ - g_clear_pointer (&panel->edit_account_dialog, gtk_widget_destroy); - -+ panel->destroyed = TRUE; -+ - G_OBJECT_CLASS (cc_goa_panel_parent_class)->dispose (object); - } - -@@ -480,7 +483,7 @@ cc_goa_panel_init (CcGoaPanel *panel) - panel); - - fill_accounts_listbox (panel); -- goa_provider_get_all (get_all_providers_cb, panel); -+ goa_provider_get_all (get_all_providers_cb, g_object_ref_sink (panel)); - - gtk_widget_show (GTK_WIDGET (panel)); - } -@@ -843,7 +846,7 @@ get_all_providers_cb (GObject *source, - GAsyncResult *res, - gpointer user_data) - { -- CcGoaPanel *self = user_data; -+ g_autoptr (CcGoaPanel) self = user_data; - GList *providers; - GList *l; - -@@ -851,6 +854,9 @@ get_all_providers_cb (GObject *source, - if (!goa_provider_get_all_finish (&providers, res, NULL)) - return; - -+ if (self->destroyed) -+ return; -+ - for (l = providers; l != NULL; l = l->next) - { - GoaProvider *provider; --- -2.17.0 - diff --git a/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch b/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch deleted file mode 100644 index d045790d6c7e..000000000000 --- a/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 75dc553f10df3cf48227ec69b9465009eebf7b8b Mon Sep 17 00:00:00 2001 -From: Georges Basile Stavracas Neto -Date: Wed, 17 Jan 2018 20:05:03 -0200 -Subject: [PATCH] common: Don't unconditionally define HAVE_WAYLAND - -This header unconditionally defines HAVE_WAYLAND when GTK -is built with Wayland support. This breaks the build when -building with Wayland disabled. - -https://bugzilla.gnome.org/show_bug.cgi?id=785414 -(cherry picked from commit 62f07b2c6d8a28378e1f2c9f5d0c3241332ee8cf) -[Added HAVE_WAYLAND config.h definition for autotools to fix runtime] -Signed-off-by: Mart Raudsepp ---- - configure.ac | 1 + - panels/common/gnome-settings-bus.h | 2 -- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f810bfb1f..24940a798 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -291,6 +291,7 @@ AS_IF([test "$enable_wayland" != "no"], - [AC_DEFINE(HAVE_UDEV, 1, [System has udev])]) - - PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0) -+ AC_DEFINE(HAVE_WAYLAND, 1, [Compile with Wayland support]) - ]) - AM_CONDITIONAL(HAVE_WAYLAND, [test "x$enable_wayland" != "xno"]) - -diff --git a/panels/common/gnome-settings-bus.h b/panels/common/gnome-settings-bus.h -index ce58f5805..763a9cca7 100644 ---- a/panels/common/gnome-settings-bus.h -+++ b/panels/common/gnome-settings-bus.h -@@ -5,8 +5,6 @@ - - #ifdef GDK_WINDOWING_WAYLAND - --#define HAVE_WAYLAND 1 -- - static inline gboolean - gnome_settings_is_wayland (void) - { --- -2.17.0 - diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild deleted file mode 100644 index 62bb2625cd02..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild +++ /dev/null @@ -1,159 +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 bash-completion-r1 gnome2 - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2+" -SLOT="2" -IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# kerberos unfortunately means mit-krb5; build fails with heimdal -# udev could be made optional, only conditions gsd-device-panel -# (mouse, keyboards, touchscreen, etc) -# display panel requires colord and gnome-settings-daemon[colord] -# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional) -COMMON_DEPEND=" - >=dev-libs/glib-2.53.0:2[dbus] - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.22.0:3[X,wayland=] - >=gnome-base/gsettings-desktop-schemas-3.21.4 - >=gnome-base/gnome-desktop-3.27.3:3= - >=gnome-base/gnome-settings-daemon-3.25.90[colord] - >=x11-misc/colord-0.1.34:0= - - >=dev-libs/libpwquality-1.2.2 - dev-libs/libxml2:2 - gnome-base/libgtop:2= - media-libs/fontconfig - >=sys-apps/accountsservice-0.6.39 - - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-2[glib] - >=sys-auth/polkit-0.97 - >=sys-power/upower-0.99:= - - virtual/libgudev - x11-apps/xmodmap - x11-libs/cairo - x11-libs/libX11 - x11-libs/libXxf86misc - >=x11-libs/libXi-1.2 - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) - colord? ( - net-libs/libsoup:2.4 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/colord-gtk-0.1.24 ) - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - gnome-online-accounts? ( - >=media-libs/grilo-0.3.0:0.3= - >=net-libs/gnome-online-accounts-3.25.3:= ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - kerberos? ( app-crypt/mit-krb5 ) - networkmanager? ( - >=gnome-extra/nm-applet-1.2.0 - >=net-misc/networkmanager-1.2.0:=[modemmanager] - >=net-misc/modemmanager-0.7.990 ) - v4l? ( - media-libs/clutter-gtk:1.0 - >=media-video/cheese-3.5.91 ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=media-libs/clutter-1.11.3:1.0 - media-libs/clutter-gtk:1.0 - >=x11-libs/libXi-1.2 ) -" -# =polkit-0.114 for .policy files gettext ITS -clutter_gtk_dep="media-libs/clutter-gtk:1.0" -# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order -COMMON_DEPEND=" - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) - >=media-sound/pulseaudio-2.0[glib] - >=sys-apps/accountsservice-0.6.39 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=dev-libs/glib-2.53.0:2 - >=gnome-base/gnome-desktop-3.27.90:3= - >=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-3.27.2 - dev-libs/libxml2:2 - >=sys-auth/polkit-0.114 - >=sys-power/upower-0.99:= - x11-libs/libX11 - >=x11-libs/libXi-1.2 - flickr? ( >=media-libs/grilo-0.3.0:0.3= ) - >=x11-libs/gtk+-3.22.0:3[X,wayland=] - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - v4l? ( - ${clutter_gtk_dep} - >=media-video/cheese-3.28.0 ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - wayland? ( virtual/libgudev ) - networkmanager? ( - >=gnome-extra/nm-applet-1.2.0 - >=net-misc/networkmanager-1.2.0:=[modemmanager] - >=net-misc/modemmanager-0.7.990 ) - bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) - input_devices_wacom? ( - ${clutter_gtk_dep} - >=dev-libs/libwacom-0.27 - >=media-libs/clutter-1.11.3:1.0 ) - kerberos? ( app-crypt/mit-krb5 ) - - x11-libs/cairo[glib] - >=x11-libs/colord-gtk-0.1.24 - net-libs/libsoup:2.4 - media-libs/fontconfig - gnome-base/libgtop:2= - >=media-libs/libcanberra-0.13[gtk3] - >=dev-libs/libpwquality-1.2.2 -" -# libgnomekbd needed only for gkbd-keyboard-display tool -# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel -# =polkit-0.114 for .policy files gettext ITS +clutter_gtk_dep="media-libs/clutter-gtk:1.0" +# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order +COMMON_DEPEND=" + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) + >=media-sound/pulseaudio-2.0[glib] + >=sys-apps/accountsservice-0.6.39 + >=x11-misc/colord-0.1.34:0= + >=x11-libs/gdk-pixbuf-2.23.0:2 + >=dev-libs/glib-2.53.0:2 + >=gnome-base/gnome-desktop-3.27.90:3= + >=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?] + >=gnome-base/gsettings-desktop-schemas-3.27.2 + dev-libs/libxml2:2 + >=sys-auth/polkit-0.114 + >=sys-power/upower-0.99:= + x11-libs/libX11 + >=x11-libs/libXi-1.2 + flickr? ( >=media-libs/grilo-0.3.0:0.3= ) + >=x11-libs/gtk+-3.22.0:3[X,wayland=] + cups? ( + >=net-print/cups-1.7[dbus] + >=net-fs/samba-4.0.0[client] + ) + v4l? ( + ${clutter_gtk_dep} + >=media-video/cheese-3.28.0 ) + ibus? ( >=app-i18n/ibus-1.5.2 ) + wayland? ( virtual/libgudev ) + networkmanager? ( + >=gnome-extra/nm-applet-1.8.0 + >=net-misc/networkmanager-1.10.0:=[modemmanager] + >=net-misc/modemmanager-0.7.990 ) + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) + input_devices_wacom? ( + ${clutter_gtk_dep} + >=dev-libs/libwacom-0.27 + >=media-libs/clutter-1.11.3:1.0 ) + kerberos? ( app-crypt/mit-krb5 ) + + x11-libs/cairo[glib] + >=x11-libs/colord-gtk-0.1.24 + net-libs/libsoup:2.4 + media-libs/fontconfig + gnome-base/libgtop:2= + app-crypt/libsecret + >=media-libs/libcanberra-0.13[gtk3] + >=dev-libs/libpwquality-1.2.2 +" +# systemd/elogind USE flagged because package manager will potentially try to satisfy a +# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed. +# libgnomekbd needed only for gkbd-keyboard-display tool +# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel +# =polkit-0.114 for .policy files gettext ITS -clutter_gtk_dep="media-libs/clutter-gtk:1.0" -# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order -COMMON_DEPEND=" - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) - >=media-sound/pulseaudio-2.0[glib] - >=sys-apps/accountsservice-0.6.39 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=dev-libs/glib-2.53.0:2 - >=gnome-base/gnome-desktop-3.27.90:3= - >=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-3.27.2 - dev-libs/libxml2:2 - >=sys-auth/polkit-0.114 - >=sys-power/upower-0.99:= - x11-libs/libX11 - >=x11-libs/libXi-1.2 - flickr? ( >=media-libs/grilo-0.3.0:0.3= ) - >=x11-libs/gtk+-3.22.0:3[X,wayland=] - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - v4l? ( - ${clutter_gtk_dep} - >=media-video/cheese-3.28.0 ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - wayland? ( virtual/libgudev ) - networkmanager? ( - >=gnome-extra/nm-applet-1.8.0 - >=net-misc/networkmanager-1.10.0:=[modemmanager] - >=net-misc/modemmanager-0.7.990 ) - bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) - input_devices_wacom? ( - ${clutter_gtk_dep} - >=dev-libs/libwacom-0.27 - >=media-libs/clutter-1.11.3:1.0 ) - kerberos? ( app-crypt/mit-krb5 ) - - x11-libs/cairo[glib] - >=x11-libs/colord-gtk-0.1.24 - net-libs/libsoup:2.4 - media-libs/fontconfig - gnome-base/libgtop:2= - app-crypt/libsecret - >=media-libs/libcanberra-0.13[gtk3] - >=dev-libs/libpwquality-1.2.2 -" -# libgnomekbd needed only for gkbd-keyboard-display tool -# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel -# =app-cdr/brasero-3.12.2 ) # not part of gnome releng release anymore -# >=gnome-base/gnome-menus-3.13.3:3 # not used by core gnome anymore, just gnome-classic extensions -# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore - -S="${WORKDIR}" diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.28.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.28.2.ebuild deleted file mode 100644 index c3b449e0e294..000000000000 --- a/gnome-base/gnome-core-apps/gnome-core-apps-3.28.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="Sub-meta package for the core applications integrated with GNOME 3" -HOMEPAGE="https://www.gnome.org/" -LICENSE="metapackage" -SLOT="3.0" -IUSE="+bluetooth cups" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" - -# gnome-color-manager min version enforced here due to control-center pulling it in -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV}[cups?] - - >=gnome-base/gnome-session-3.28.1 - >=gnome-base/gnome-settings-daemon-3.28.1[cups?] - >=gnome-base/gnome-control-center-${PV}[cups?] - >=gnome-extra/gnome-color-manager-3.28.0 - - >=app-crypt/gcr-3.28.0 - >=gnome-base/nautilus-3.28.1 - >=gnome-base/gnome-keyring-3.28.2 - >=gnome-extra/evolution-data-server-3.28.2 - - >=app-crypt/seahorse-3.20.0 - >=app-editors/gedit-3.28.1 - >=app-text/evince-3.28.2 - >=gnome-extra/gnome-contacts-3.28.2 - >=media-gfx/eog-3.28.2 - >=media-video/totem-3.26.2 - >=x11-terms/gnome-terminal-${PV} - - >=gnome-extra/gnome-user-docs-${PV} - >=gnome-extra/yelp-3.28.1 - - >=x11-themes/adwaita-icon-theme-3.28.0 - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.28.0 ) -" -DEPEND="" - -# cdr? ( >=app-cdr/brasero-3.12.2 ) # not part of gnome releng release anymore -# >=gnome-base/gnome-menus-3.13.3:3 # not used by core gnome anymore, just gnome-classic extensions -# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore - -S="${WORKDIR}" diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest index fa44fed9b9f7..b4bce6d0f042 100644 --- a/gnome-base/gnome-core-libs/Manifest +++ b/gnome-base/gnome-core-libs/Manifest @@ -1,5 +1,3 @@ EBUILD gnome-core-libs-3.24.2.ebuild 1053 BLAKE2B baea5363a73c2a7ea9f77417d3e224d24983405572d4aaa48fdf41198b489aee0ca9c5df2820a8f676adf2b28b28bc31c9154e8dcab1deee390782b5c14c46d9 SHA512 48301a8470a7d2179ee9a8b639cf449d7493b41abfe48a33f454fe66f88eb67d888827d15f2bccbc63a93923bcbca074ade6e185251a93eac2cc374506284ac0 -EBUILD gnome-core-libs-3.26.2.ebuild 1058 BLAKE2B 4170f7b1219be32582128c78c2937712a42b98692b6d3535767252046c0edc48ff42678db995f978b683244bbd97a04c4caf29a9fd14ec8a01fc5673ad2d169e SHA512 d4d300d45c93700a48eb256c66fc1b6c9617c74820051928d5eef8f30af1d8ed24e9f58cfe2aecdb98397e37a77e418ec8b403d508f0508ef6fb04293ffaee49 -EBUILD gnome-core-libs-3.28.2.ebuild 1150 BLAKE2B 85a9d449c534d11d1f96f3b1c7cf5168e3a1a6d28251f29fc8543a1c71f7b0ae24541be76d8b03f947a4b59e2b92ddfc001704d00877fe451dcc1dfa6e078f81 SHA512 7c28d6a49eb3850d64dd32e3c907e347bbf703563c45d854c146f9d7810b22b413df4296a2e282263cfc468b81a1c551e1c7bab0df8c0e067c73d5d08f596498 EBUILD gnome-core-libs-3.30.2.ebuild 1148 BLAKE2B 008285a3064735d3657b3329ff4fd7476a085d6e1eeb510f7f6bbc5bd6fdc2d55a66b4129e9be5e08f00b471e78cc3992e26642640dcf64c3b733d6518fd117c SHA512 2e93ea0e86773138f3969ac31e1df36176c0ff1c47345efa8b184b9655890a64ef938a2d6f745c9ec237eedf0793606d538f2a902d1b49d5c79a9791687a5f74 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.26.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.26.2.ebuild deleted file mode 100644 index f16a1f315c28..000000000000 --- a/gnome-base/gnome-core-libs/gnome-core-libs-3.26.2.ebuild +++ /dev/null @@ -1,41 +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 ~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.54.2:2 - >=x11-libs/gdk-pixbuf-2.36.11:2 - >=x11-libs/pango-1.40.13 - >=x11-libs/gtk+-3.22.25:3[cups?] - >=dev-libs/atk-2.26.1 - >=gnome-base/librsvg-2.40.19 - >=gnome-base/gnome-desktop-${PV}:3 - >=x11-libs/startup-notification-0.12 - - >=gnome-base/gvfs-1.34.1 - >=gnome-base/dconf-0.26.1 - - >=media-libs/gstreamer-1.14.1:1.0 - >=media-libs/gst-plugins-base-1.14.1:1.0 - >=media-libs/gst-plugins-good-1.14.1:1.0 - - python? ( >=dev-python/pygobject-3.26.1:3 ) -" -DEPEND="" - -# >=x11-libs/libwnck-3.24.1:3 - not used by core packages anymore - -S="${WORKDIR}" diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.28.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.28.2.ebuild deleted file mode 100644 index b57046690932..000000000000 --- a/gnome-base/gnome-core-libs/gnome-core-libs-3.28.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 ~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.56.1:2 - >=x11-libs/gdk-pixbuf-2.36.12:2 - >=x11-libs/pango-1.42.1 - >=x11-libs/gtk+-3.22.30:3[cups?] - >=dev-libs/atk-2.29.1 - >=gnome-base/librsvg-2.40.20 - >=gnome-base/gnome-desktop-${PV}:3 - >=x11-libs/startup-notification-0.12 - - >=gnome-base/gvfs-1.36.2 - >=gnome-base/dconf-0.28.0 - - >=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.28.2: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-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest index ad5e0a247f7a..ccc1ce614c84 100644 --- a/gnome-base/gnome-extra-apps/Manifest +++ b/gnome-base/gnome-extra-apps/Manifest @@ -1,5 +1,3 @@ -EBUILD gnome-extra-apps-3.24.2.ebuild 2331 BLAKE2B 1de7437ed424274cf4f005319da33d5d0556560889bacd2e191fa3c3c4e78081b71f895c653a9ea2463684ae0a9392033a867b9c74dde3a9b506b3226897245d SHA512 cb58fc592771921bc669899f8d42e70d995488ef79a5d2876a009b4dc5d8b06d1a529d75647e605ec6621a4ef2a5364aedb1eb2c8be7760d0b090445958eb8be -EBUILD gnome-extra-apps-3.26.2.ebuild 2538 BLAKE2B 8be0227a8ff521dea1934538f784430ee9f7c32e1ab719c4eb1d865a853865af53d153ac28d69622b6e31f4b0a07036052abad3be6a3f8bacaaadc69fa8f0862 SHA512 3296693e3d3088f70b82f73195e8b804e72c7d8b829bec8c467cfcc4aea091d0ce1907168bb648d9d4f65291ab893899165635c3726ecc637145ca88c3b4ea4a -EBUILD gnome-extra-apps-3.28.2.ebuild 2448 BLAKE2B 1871a0373a37565583cc4729a7478ae9e41cf2bec063ce1fe1544ffb82cb6db5efb27fb93d0450ef6a07432554b40ae2c305c3da2577d6ab87e1211589df51c9 SHA512 1a85f134623eab6e7044fe226f3546eef0b821055d5507c8871625b489c844ea25e5fd0241e44df77a9638b0085b3510a41d4a49fd9f7ccac0a9d5730650091b -EBUILD gnome-extra-apps-3.30.2.ebuild 2469 BLAKE2B d6edcad7fb86d65ddbcc5f761d10e6f5b2c09fc49dfddad58b287b5faa1ce8172d347cf0196da51fa81d7bdbd355c710fcc5c70fa666ac0aad660452f4d8ceee SHA512 2593b092cfda666ae4e3b1d4f8a917e2585a9c423e30016acf102b9d3f46d6b73aa85a80b0fdaa590dc1476fd6b3d03250179a0fef219eb3fad10da07468ec6b +EBUILD gnome-extra-apps-3.24.2.ebuild 2327 BLAKE2B 904ee371be166b8aa3585664a511dffa2fc446676932515af20e7a502f395bbfdc4284739a1d2896fdc23b01988411911965ae60cdb6c96ff6cb97b2d3e3f1b6 SHA512 3568ca1528ed3f5300244451f1bab719d60cf5137ccabad3437c5551ca40f0ae3760ec800ec08fe5407e4257421299a9ead13ce47583556d41191859d68a25f8 +EBUILD gnome-extra-apps-3.30.2.ebuild 2468 BLAKE2B af2e7dd53330e25924debb236f53624f3804554aa4e7bc2437ef547df4a1278992e96d1ae82f82131cb005ed4e3a6e65e20ead2216d29bee70d87ad3d23d0e45 SHA512 5483a4b0b1c19e7cf80f99868eaddb75aacce0b7b97c01d2c01a555448bb38a719e7e8a38db30ce56035f20acb1513e685d03105ecd68dd45ae604ef21a48ee9 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild index 30f1f7ac3157..e516ccbc8be6 100644 --- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild +++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ 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" +IUSE="+games share +shotwell +tracker" KEYWORDS="amd64 x86" diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild deleted file mode 100644 index ed49b6726619..000000000000 --- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild +++ /dev/null @@ -1,76 +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 ~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-power-manager, gucharmap, sound-juicer, vinagre; 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.26.1 - >=media-video/cheese-3.26.0 - >=www-client/epiphany-${PV} - >=app-arch/file-roller-3.26.1 - >=gnome-extra/gnome-calculator-3.26.0 - >=gnome-extra/gnome-calendar-${PV} - >=gnome-extra/gnome-characters-${PV} - >=sys-apps/gnome-disk-utility-${PV} - >=media-gfx/gnome-font-viewer-3.26.0 - >=gnome-extra/gnome-power-manager-3.26.0 - >=media-gfx/gnome-screenshot-3.26.0 - >=gnome-extra/gnome-system-monitor-3.26.0 - >=gnome-extra/gnome-weather-3.26.0 - >=gnome-extra/gucharmap-10.0.3:2.90 - >=gnome-extra/sushi-3.24.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} - >=net-analyzer/gnome-nettool-3.8.1 - >=gnome-extra/gnome-tweaks-3.26.3 - >=gnome-extra/nautilus-sendto-3.8.6 - >=net-misc/vinagre-3.22.0 - - games? ( - >=games-puzzle/five-or-more-3.26.0 - >=games-board/four-in-a-row-3.22.2 - >=games-board/gnome-chess-3.26.0 - >=games-puzzle/gnome-klotski-3.22.2 - >=games-board/gnome-mahjongg-3.22.0 - >=games-board/gnome-mines-3.26.0 - >=games-arcade/gnome-nibbles-3.24.0 - >=games-arcade/gnome-robots-3.22.2 - >=games-puzzle/gnome-sudoku-3.26.0 - >=games-puzzle/gnome-taquin-3.26.1 - >=games-puzzle/gnome-tetravex-3.22.0 - >=games-puzzle/hitori-3.22.4 - >=games-board/iagno-3.26.1 - >=games-puzzle/lightsoff-3.26.0 - >=games-puzzle/quadrapassel-3.22.0 - >=games-puzzle/swell-foop-3.26.0 - >=games-board/tali-3.22.0 - ) - share? ( >=gnome-extra/gnome-user-share-3.18.3 ) - shotwell? ( >=media-gfx/shotwell-0.26 ) - tracker? ( - >=app-misc/tracker-2.0.1 - >=app-misc/tracker-miners-2.0.2 - >=media-gfx/gnome-photos-${PV} - >=media-sound/gnome-music-3.26.1 ) -" -DEPEND="" -S=${WORKDIR} diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.28.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.28.2.ebuild deleted file mode 100644 index 02e761ad4f84..000000000000 --- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.28.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 ~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: gucharmap, sound-juicer, vinagre; 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.28.0 - >=media-video/cheese-3.28.0 - >=www-client/epiphany-3.28.1.1 - >=app-arch/file-roller-3.28.0 - >=gnome-extra/gnome-calculator-3.28.1 - >=gnome-extra/gnome-calendar-${PV} - >=gnome-extra/gnome-characters-${PV} - >=sys-apps/gnome-disk-utility-${PV} - >=media-gfx/gnome-font-viewer-3.28.0 - >=media-gfx/gnome-screenshot-3.26.0 - >=gnome-extra/gnome-system-monitor-3.28.2 - >=gnome-extra/gnome-weather-3.26.0 - >=gnome-extra/gucharmap-10.0.3:2.90 - >=gnome-extra/sushi-3.28.3 - >=media-sound/sound-juicer-3.24.0 - >=net-misc/vino-3.22.0 - - >=gnome-base/dconf-editor-3.28.0 - >=app-dicts/gnome-dictionary-3.26.1 - >=mail-client/evolution-${PV} - >=gnome-extra/gnome-tweaks-3.28.1 - >=gnome-extra/nautilus-sendto-3.8.6 - >=net-misc/vinagre-3.22.0 - - games? ( - >=games-puzzle/five-or-more-3.28.0 - >=games-board/four-in-a-row-3.28.0 - >=games-board/gnome-chess-3.28.1 - >=games-puzzle/gnome-klotski-3.22.3 - >=games-board/gnome-mahjongg-3.22.0 - >=games-board/gnome-mines-3.28.0 - >=games-arcade/gnome-nibbles-3.24.1 - >=games-arcade/gnome-robots-3.22.3 - >=games-puzzle/gnome-sudoku-3.28.0 - >=games-puzzle/gnome-taquin-3.28.0 - >=games-puzzle/gnome-tetravex-3.22.0 - >=games-puzzle/hitori-3.22.4 - >=games-board/iagno-3.28.0 - >=games-puzzle/lightsoff-3.28.0 - >=games-puzzle/quadrapassel-3.22.0 - >=games-puzzle/swell-foop-3.28.0 - >=games-board/tali-3.22.0 - ) - share? ( >=gnome-extra/gnome-user-share-3.28.0 ) - shotwell? ( >=media-gfx/shotwell-0.28.4 ) - tracker? ( - >=app-misc/tracker-2.0.3 - >=app-misc/tracker-miners-2.0.4 - >=media-gfx/gnome-photos-3.28.0 - >=media-sound/gnome-music-3.28.2.1 ) -" -DEPEND="" -S=${WORKDIR} 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 index a0a0a670b4dd..16f33ac0c8e8 100644 --- 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 @@ -7,7 +7,7 @@ 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" +IUSE="+games share +shotwell +tracker" KEYWORDS="~amd64 ~x86" diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest index 15f138816129..d50d97ef689e 100644 --- a/gnome-base/gnome-light/Manifest +++ b/gnome-base/gnome-light/Manifest @@ -1,6 +1,5 @@ EBUILD gnome-light-3.22.0.ebuild 1762 BLAKE2B 7aece5726a0453567f9a0191f42fbe888cb567aad79b5066d19e3fc5f190d451f926cd1298868d137b996fde0111c30c6214ec52c72da04c20a0a889586d8a3c SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5 EBUILD gnome-light-3.24.2.ebuild 1711 BLAKE2B bb5e48a4346beb4e4fb7e4237ea684fa4bbfb4fc3e57783ef7020282a54baa68a0dc56d06f730e915d55628a10c0e6a66510e96b8ba54fa6b54ba0b93d28d02f SHA512 a1a9d02b0eea870d92084193173042351bb9b7c1110d18accf98c0852be66f27c0f1f6c79e45da7f9946d00c2c78ba9729588106dae51e723b00e9ba01284f4d EBUILD gnome-light-3.26.2.ebuild 1692 BLAKE2B 559111105e792c0f3af9dc66ba6ed8560845e9d8c4dd41af29b39fea2f38c3dd5b0f6552f46ecc9ca6f6c8b0262ecea07620101b2a7bd0426a5de9679244445f SHA512 f9bb9fc468fe5c73a508286c69468888897d449958bc06cd8e4a46730a362cc5f738d7212c0fa7ea9e81aadfef245b71271eba0587119809068876d217bb3e16 -EBUILD gnome-light-3.28.2.ebuild 1800 BLAKE2B 2dc17d2be23307a7d306653e3893881a224c8af9631a9d881429718e8f626cb01486ef2dc37ff602c1b2aa379baef048b874c91f90ae4766d892e3907ae86d2f SHA512 a17b921ec8c4accc711292efa78f6b23dfd4984c1914e5662926600c8c6f88dbdd67df85bfcd8d956940c0e4a32a36623347bef801acbc08cf2a570e5f30dc22 EBUILD gnome-light-3.30.2.ebuild 1807 BLAKE2B 5c3f740839bbe83747511c47a12f16dc77cd7341df877901479bf648d018ff8bf1566ab329d2fe2c673772bbbacc643d62028320ae92a34b56aabdb5a3bcc720 SHA512 e64f046b280f83bf9cbf91bd9e54675fbc1bd791b7c8fb0a4a24c6ffdf464b92e86b43d663759b342d0deca1511d3c862c4dddd3a49d4e0cf71be323b2362d3d MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047 diff --git a/gnome-base/gnome-light/gnome-light-3.28.2.ebuild b/gnome-base/gnome-light/gnome-light-3.28.2.ebuild deleted file mode 100644 index 5e0db649307c..000000000000 --- a/gnome-base/gnome-light/gnome-light-3.28.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver - -P_RELEASE="$(ver_cut 1-2)" - -DESCRIPTION="Meta package for GNOME-Light, merge this package to install" -HOMEPAGE="https://www.gnome.org/" -LICENSE="metapackage" -SLOT="2.0" -IUSE="cups +gnome-shell" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" - -# XXX: Note to developers: -# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of -# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without -# any apps, but shouldn't be used by users unless they know what they are doing. -# cantarell minimum version is ensured here as gnome-shell depends on it. -RDEPEND="!gnome-base/gnome - >=gnome-base/gnome-core-libs-${PV}[cups?] - - >=gnome-base/gnome-session-3.28.1 - >=gnome-base/gnome-settings-daemon-3.28.1[cups?] - >=gnome-base/gnome-control-center-${PV}[cups?] - - >=gnome-base/nautilus-3.28.1 - - gnome-shell? ( - >=x11-wm/mutter-${PV} - >=gnome-base/gnome-shell-${PV} - >=media-fonts/cantarell-0.100 ) - - >=x11-themes/adwaita-icon-theme-${P_RELEASE} - >=x11-themes/gnome-themes-standard-3.28 - >=x11-themes/gnome-backgrounds-${P_RELEASE} - - >=x11-terms/gnome-terminal-3.28.1 -" -DEPEND="" -PDEPEND=">=gnome-base/gvfs-1.36.2" -S="${WORKDIR}" - -pkg_pretend() { - if ! use gnome-shell; then - # Users probably want to use e16, sawfish, etc - ewarn "You're not installing GNOME Shell" - ewarn "You will have to install and manage a window manager by yourself" - fi -} - -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/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index b3984c2333d5..808bb346db76 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -8,11 +8,7 @@ AUX defaults.list-r3 18178 BLAKE2B 77d04148ddb7a1ad76b4c59e3d1bd216791c88bc8b25b AUX defaults.list-r4 18853 BLAKE2B abf7b422bf6e0e7dc04e26416d54018f3fb04ff6b4bfe8aed122e3b918cf840e5b8df8bb68c5ebb5ffed9d95b530581e10c03f7b4454ffe23fd8993253ce2898 SHA512 1d282ab6a139f6e0f0309263ca736dc2eeca0490f25a740583a24cd4f84a21531aaa0bd916d0809844e928029a434acdb3922305ce1253241ff62938c13c4eae DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27 -DIST gnome-session-3.26.1.tar.xz 782676 BLAKE2B 68ffae002910f827dca372402b8e014298b12fc892d6e6c477ff8ba0f793c98cd28f4a974c5665ac8bf7d61f485e4c662ba2f96cb3fd9bdec4a6218e86a797db SHA512 a4c2e82306ae044c56b857c8f7347dc5d5235231e702d2ac38c8c433e21efc75ca3911ee029af01754685f64000a0e6f5d17408192208b19d7dc367079ee7b0a -DIST gnome-session-3.28.1.tar.xz 480196 BLAKE2B 37bd2138c0610f5cbaa77d558a02f025e2df3105d1b07a3e41f06078215c06c01d47fd6803cb72ee05ccc98765b46221fc618e2b7c3e091398c4420d5be8a015 SHA512 ceeacb3cb4729d4b0a646220097a49359d1eb85ec20cd5d5a44c273b661d41ee83caaf6598def06c4e89b5f785f9317b1171b5550bf8f5634bc882a21e5e685b DIST gnome-session-3.30.1.tar.xz 485996 BLAKE2B 6882aa9f6004dc6da5070a484d92450bd1e8f61885492edf11260d9834fcae700f113a8ddeb1d905171432400ad9e94fba99ed6eaa49f08efd2d0ec2dffd9c5a SHA512 b6bc98da0245cdefa7e462b1f4e2c9198ee0da1f15a426d377331f79aec2f637bef27b093780c77f7ffbe7eb62c6829acdbd9f9e25cac5a4f6ed0da6ab96359a EBUILD gnome-session-3.24.2-r1.ebuild 4552 BLAKE2B c5aee03290d0fb718777313002f2a3fe2c7df2d6403e00ca1bbcb3105f21fad2eede1f487e1e9b2b06f2554b436d73310ae3fad994a42f92ca64be81b18f5e11 SHA512 e2ebe3cb856799af58998e74a9d642eb0599bfc0ebed80c7e5047977a8337c925c909ed8fb19bea33ffcd93bf7b5f587bb2ec97f4d97942f6b263bb58c866e89 -EBUILD gnome-session-3.26.1.ebuild 3823 BLAKE2B 33b52074741047fc2d65e0f816f3203499c8f77da68ef46db35eca0ea1c1f04a5a98c95a845a8064a3f67cfbe0ceb7cc779ccb0b617cdd42d6e8baa72c79052c SHA512 d09f324cbd7eb3c253808f6a6403583f8f6c80a7b18fdb830bad6e7b97e660e937254087938646a1d42be312bc4f8239c03914e9b78579e09823b45a59100757 -EBUILD gnome-session-3.28.1.ebuild 3559 BLAKE2B 2ab5cf629764184c2b4939eca8368c9c0234d74ad388bb1c05814090c8c82a1f31a5005949e44691046634f394509de241493da91f77c40067a9c09d68cefe3a SHA512 f2a85a2a5a703601d9e4f9b5f198a38acbd4a7fd04efbd4ae28385f19996ba6499eea612bf59ed50621bd92cfbf4d51b22bbd23194ccd583ed0126d5bc648990 EBUILD gnome-session-3.30.1-r1.ebuild 3910 BLAKE2B 7c18986539b8a02bc96e2edcf1c7abaac232e7b3151cceeeb96e161bbf01e0fe774f8e29abfc1851077d0c9284a7683809bd6803c5bb58430befb6fe477630d3 SHA512 61fc7c11cafe698fe690589039b7b40fc2e629bbe93e6e3619258a8e0aa22358d6026e5ae204125e98ac7129d762b1a220b46a56a74ca6cca04b2ee6da9dfbcc MISC metadata.xml 440 BLAKE2B 83fb0d37323db0c6105b3c231b6ecb7c4344bcd40577f23581af437fb4c4c330a77d2b8b19c9c69a5b586fd4638e55a9153014c32214547bf2437da7c3a161e6 SHA512 93f57253eccec50c77ad84960af623482bb34ad7d1f00463b29ccb54c3f034b95aa1a489acbf5075aa97e37e9303c2973e126cb201c15b2785416d882810378b diff --git a/gnome-base/gnome-session/gnome-session-3.26.1.ebuild b/gnome-base/gnome-session/gnome-session-3.26.1.ebuild deleted file mode 100644 index b7c49fd16457..000000000000 --- a/gnome-base/gnome-session/gnome-session-3.26.1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -inherit gnome2 - -DESCRIPTION="Gnome session manager" -HOMEPAGE="https://git.gnome.org/browse/gnome-session" - -LICENSE="GPL-2 LGPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="doc elibc_FreeBSD ipv6 systemd" - -# 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). -# gdk-pixbuf used in the inhibit dialog -COMMON_DEPEND=" - >=dev-libs/glib-2.46.0:2 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.18.0:3 - >=dev-libs/json-glib-0.10 - >=gnome-base/gnome-desktop-3.18:3= - elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) - - media-libs/mesa[egl,gles2] - - media-libs/libepoxy - x11-libs/libSM - x11-libs/libICE - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXtst - x11-misc/xdg-user-dirs - x11-misc/xdg-user-dirs-gtk - x11-apps/xdpyinfo - - systemd? ( >=sys-apps/systemd-183:0= ) -" -# Pure-runtime deps from the session files should *NOT* be added here -# Otherwise, things like gdm pull in gnome-shell -# gnome-themes-standard is needed for the failwhale dialog themeing -# sys-apps/dbus[X] is needed for session management. -# gnome-settings-daemon is assumed to be >3.25.4, but this is about -# removed components, so no need to strictly require it (older just -# won't have those daemons loaded by gnome-session) -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-settings-daemon-3.23.2 - >=gnome-base/gsettings-desktop-schemas-0.1.7 - x11-themes/adwaita-icon-theme - sys-apps/dbus[X] - !systemd? ( - sys-auth/consolekit - >=dev-libs/dbus-glib-0.76 - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.40.6 - >=sys-devel/gettext-0.10.40 - virtual/pkgconfig - !=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 ) -" - -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 - -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 consolekit; then - ewarn "You are building without systemd 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 f9376395c9e4..e14126d8e73d 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,15 +1,9 @@ -AUX 3.28.1-fix-non-wayland-build.patch 2975 BLAKE2B 5bca06c83e4a672a911012d808efaaff0d054c2c4bb723133aca9859e701b965160bdc118fb53bcb9e74201c5e181c0eef7c5eaa87ce8285bcd4e460fa02fcb5 SHA512 4b0b29fee20f1ede2b3e27b54eaf2ec37892d7fe755ef8241527c97c9a8de95a16a7702a6abd630cf7ebfafd94b2681f574d82c21f08d78a7d50f9d3596a53b2 AUX glib-2.58-compat.patch 1328 BLAKE2B aa65a9aca82aa201995bc8b8a02cc9fa4fa3ec2d6410981df8ef9ac77d15afb8ea819970e0305d3d2c8d376e3cb193183b0a9d897132d0bf770063e2974efb6f SHA512 bf5586896c12584606ddcf36f5745e745e90cd1d391ae93527d50e249746eeedeb50a7c808d5bd08a80526d30a550f665551f13694333961bf97cab0c36a3324 +AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0 -DIST gnome-settings-daemon-3.26.2-patchset.tar.xz 42408 BLAKE2B 3b54dd1b161f4137eeb7c110be70444e3b8eb602a7d1c12ec6aaa32d887d46c3e1dc61df2a04895b7c6e2d67a68edeced5f758f688533caa9900deace7b6d542 SHA512 3ab36a03e2892ad193f420722025753990158ac450c686b9fba490cda4e7e1be69574dd4d3b9c8ed5e238f23933065abc28aee480ff1e2e5dad28e364c04fc0b -DIST gnome-settings-daemon-3.26.2.tar.xz 1589696 BLAKE2B f1fd18e80caf5badb0da1f07cbe994b73a99ace004bf3b568114d6cd6110ebd092ee3a023a1ec818f3946f6f7cdb7ee21417782e271c8aa9ebd9d1d4c35ea286 SHA512 7785ebcb7df466c50557b75a3092f568e375adcf5a40f73e31d5cc69fa63bc556a4447a96e6e612c3bf523735e67168afae0b9c1fab32912d41014436d33b7ff -DIST gnome-settings-daemon-3.28.1-patchset.tar.xz 5216 BLAKE2B eab85f6475c1da9c8beb1dea7d7d79bdaf2e57ac82e90a4ab877e5ffbd8423df8ed5dbd03ac6586a3aadf2be16b89e2955267be24af71db8c89cc407241e0bc9 SHA512 f56a5d62ba45976a01c8fcab63c4d7afd21dbe7a4c75158cc54fc60552faf875b0ca1be7a882c11d814566e7a4ded63ce52d10d214bd1f7926c2d7b0dbaf1590 -DIST gnome-settings-daemon-3.28.1.tar.xz 1362420 BLAKE2B d809696ea7a2df3b89b1e2badbd015623e624c38f44a087e26d167c7ba9a5499a33e6e4ebb12448f69d8aa645154bc176a156f1b9e4a749684e5a497a7be6fc6 SHA512 22e42ce92a6f3ad67a0ef7d1676a6dd3d533b0bc91193d8b2a19a51d7c9601c87caf391c233bb1b96e8a1270d610aca52523d0ae12a38b0e3911065c3a67e10f 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 EBUILD gnome-settings-daemon-3.24.4.ebuild 4721 BLAKE2B 8e8933764655357514fca45a002376d2de3dea4eb5df7ce4bf1bdbc4b465d8d351aabf4f91aabdda46bfe3f72812137e8fc8423d30060e99e07ce045e7fed3dc SHA512 f4382da6b22932620ccb995a166ed3b6d1006bec9c2e96cabc42269d73e0508d945d4803efa5b84ccd4167d72a6c7c44f6173a5670af60895fc577e18cf98e5e -EBUILD gnome-settings-daemon-3.26.2-r1.ebuild 3841 BLAKE2B fe70ab9081814d5bc8f81db2de1dfb4d31aebd98c2aa10ac566560f11013ce64d2a21957b96adafebc4802f84ae845f7535509d0100e662468798791dec15b24 SHA512 2555b73ae173cb3c5bde8f53081582f951334a0048e216cfc50ce509dc5346dba86925aff6d51b77c8e10e93384e9f57d6ed741ec1f650aa614b61e590149794 -EBUILD gnome-settings-daemon-3.28.1-r1.ebuild 3897 BLAKE2B 89a58281ff0c63102fcfb1f76c99e2cf8c8609b02dbceaa2dc1fb34d5e0cdc66eb4fc5e366d9f6e9bf0269f8163d026a13bf71c8ae0b1a4691fd7c34c8f91120 SHA512 582fc0c6815377aba692586d8f104f0bf7b8b1b296e6e0eeb498dfc88317332103815e20ae7ade855e736934b6682b8b3e68cb23a9fcba0213947536bcedf323 -EBUILD gnome-settings-daemon-3.30.2.ebuild 3693 BLAKE2B b5ef04c1689af139d493f15c05429f56da8ff22d4530684dae70a7ba9975bf271a8da1c8c7bf1c5c15e87e5c5cd04fd7a1031418465d1c92cc050bfc32e24fcf SHA512 df76b9390306539201ed59e69e0c6a926b1c79f8f426db04678b520f7de25bb5068a051e2c12e45b795bfc680f796aaef165e85e1b88a15c7f224177a675e095 +EBUILD gnome-settings-daemon-3.30.2-r1.ebuild 3891 BLAKE2B 0272b5255682a868ed82509e281fc870ea341744cdb765961b92a5c8fc79b1e2b124a2a51298c96dc9f28bebf257a372dcfcf1af1e1c380f7ff0d545eb288e14 SHA512 4dca17b1099f5107cfcbf64b559eb40822f55d0d5709d9b8ee12745014b10f1a21b74cadbd727d8fe20e92f3d29027aee335fc4fe188519416f6aaed3478b4af MISC metadata.xml 774 BLAKE2B 94211f84287a451ef68bddcae9824b5345379600b3761067267d8c127bc083337e9bdf41162308efd47f419f13ed790221f082ea6282aa0038a85d13c9edc902 SHA512 4de08b4c743a03dfbb7e9e39cff7473c0f9529ba897b78d0adef9fb980b584a65274b617d1cf50b824e9c35722f6f6ab0565da37ae5fb4c820bdae37b5832833 diff --git a/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch deleted file mode 100644 index dd003d6c0694..000000000000 --- a/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 91d5e708835b4c7810835d59b8ef5968454cfd0a Mon Sep 17 00:00:00 2001 -From: Ting-Wei Lan -Date: Fri, 15 Jun 2018 23:05:01 +0800 -Subject: [PATCH 1/2] common: Fix build with wayland disabled on FreeBSD - -HAVE_WAYLAND is always defined. We should check whether it is set to a -non-zero value instead of checking whether it is defined. - -(cherry picked from commit 34199fa54641abae15199a311002ac726f47aa89) ---- - plugins/common/gsd-device-manager.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/common/gsd-device-manager.c b/plugins/common/gsd-device-manager.c -index 541f2948..ff72ad69 100644 ---- a/plugins/common/gsd-device-manager.c -+++ b/plugins/common/gsd-device-manager.c -@@ -275,7 +275,7 @@ gsd_device_manager_get (void) - manager = g_object_get_data (G_OBJECT (screen), "gsd-device-manager-data"); - - if (!manager) { --#ifdef HAVE_WAYLAND -+#if HAVE_WAYLAND - if (gnome_settings_is_wayland ()) { - manager = g_object_new (GSD_TYPE_UDEV_DEVICE_MANAGER, - NULL); --- -2.17.0 - - -From 218f1ff0a3c6c500fd36601a4db6902fc1c57a43 Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt -Date: Fri, 22 Jun 2018 20:12:50 +0200 -Subject: [PATCH 2/2] build: Fix build when wayland support is disabled - -The udev based device manager used for wayland environments was built -based on the state of the gudev option instead of the wayland option. -This resulted in an build error when building with `-Dwayland=false` -since the gdk/gdkwayland.h header file is not present on systems without -gdk-wayland-3.0. - -This patch puts the compilation of the udev based device manager behind -the wayland option and the gdk-wayland-3.0 dependency - -(cherry picked from commit 51088a9c27d713bbe63359b865603c833eb5a930) ---- - meson.build | 3 ++- - plugins/common/meson.build | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 79c493a1..27fdd049 100644 ---- a/meson.build -+++ b/meson.build -@@ -129,11 +129,12 @@ if enable_colord - colord_dep = dependency('colord', version: '>= 1.0.2') - endif - --# Check for libwayland-client -+# Check for wayland dependencies - enable_wayland = get_option('wayland') - if enable_wayland - assert(enable_gudev, 'GUDev support is required for wayland support.') - wayland_client_dep = dependency('wayland-client') -+ wayland_gdk_dep = dependency('gdk-wayland-3.0') - endif - config_h.set10('HAVE_WAYLAND', enable_wayland) - -diff --git a/plugins/common/meson.build b/plugins/common/meson.build -index 65a0757c..6bda2d2a 100644 ---- a/plugins/common/meson.build -+++ b/plugins/common/meson.build -@@ -42,10 +42,10 @@ if host_is_darwin - ldflags += ['-Wl,-bundle_loader,@0@'.format(join_paths(), meson.build_root(), meson.project_name(), meson.project_name())] - endif - --if enable_gudev -+if enable_wayland - sources += files('gsd-device-manager-udev.c') - -- deps += gudev_dep -+ deps += [wayland_gdk_dep, gudev_dep] - endif - - if enable_wacom --- -2.17.0 - diff --git a/gnome-base/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.override b/gnome-base/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.override new file mode 100644 index 000000000000..f04a3271c2a8 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.settings-daemon.plugins.power] +sleep-inactive-ac-type='nothing' diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild deleted file mode 100644 index b7c6a9990f9d..000000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -GNOME2_LA_PUNT="yes" -#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 -PYTHON_COMPAT=( python2_7 ) - -inherit gnome2 python-any-r1 udev virtualx - -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+" -SLOT="0" -IUSE="+colord +cups debug elogind input_devices_wacom networkmanager policykit smartcard systemd test +udev wayland" -REQUIRED_USE=" - ^^ ( elogind systemd ) - input_devices_wacom? ( udev ) - smartcard? ( udev ) - wayland? ( udev ) -" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -COMMON_DEPEND=" - >=dev-libs/glib-2.53.0:2 - >=x11-libs/gtk+-3.15.3:3[X,wayland?] - >=gnome-base/gnome-desktop-3.11.1:3= - >=gnome-base/gsettings-desktop-schemas-3.23.3 - >=gnome-base/librsvg-2.36.2:2 - media-fonts/cantarell - media-libs/alsa-lib - media-libs/fontconfig - media-libs/libcanberra[gtk3] - >=media-sound/pulseaudio-2 - >=sys-power/upower-0.99:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/libnotify-0.7.3:= - x11-libs/libX11 - x11-libs/libxkbfile - x11-libs/libXi - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXtst - x11-libs/libXxf86misc - x11-misc/xkeyboard-config - - >=app-misc/geoclue-2.3.1:2.0 - >=dev-libs/libgweather-3.9.5:2= - >=sci-geosciences/geocode-glib-3.10 - >=sys-auth/polkit-0.103 - - colord? ( - >=media-libs/lcms-2.2:2 - >=x11-misc/colord-1.0.2:= ) - cups? ( >=net-print/cups-1.4[dbus] ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=x11-libs/pango-1.20 - x11-drivers/xf86-input-wacom - virtual/libgudev:= ) - networkmanager? ( >=net-misc/networkmanager-1.0 ) - smartcard? ( >=dev-libs/nss-3.11.2 ) - udev? ( virtual/libgudev:= ) - wayland? ( dev-libs/wayland ) -" -# logind needed for power and session management, bug #464944 -# gnome-session-3.25.4 adapts to Orientation and XRANDR components removal (moved to mutter) -RDEPEND="${COMMON_DEPEND} - gnome-base/dconf - elogind? ( sys-auth/elogind ) - systemd? ( sys-apps/systemd ) - !=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.23.3 - >=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? ( virtual/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 ) - !=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? ( virtual/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 ) + !=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? ( virtual/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 ) - ! -Date: Mon, 6 Aug 2018 14:21:02 +0200 -Subject: [PATCH] build: Fix build with meson >= 47.0 - -With meson >= 47.0, building gnome-shell will fail -when --rebuild-types is used as an option for gtk-doc, -so stop using that option and bump the meson requirement. - -https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191 ---- - docs/reference/shell/meson.build | 3 +-- - docs/reference/st/meson.build | 3 +-- - meson.build | 2 +- - 3 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/docs/reference/shell/meson.build b/docs/reference/shell/meson.build -index 1469ed422..a32d6a58a 100644 ---- a/docs/reference/shell/meson.build -+++ b/docs/reference/shell/meson.build -@@ -50,8 +50,7 @@ gnome.gtkdoc('shell', - join_paths(meson.build_root(), 'src') - ], - scan_args: [ -- '--ignore-headers=' + ' '.join(private_headers + exclude_directories), -- '--rebuild-types' -+ '--ignore-headers=' + ' '.join(private_headers + exclude_directories) - ], - install: true - ) -diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build -index fe89b53d4..3e9e9ab7c 100644 ---- a/docs/reference/st/meson.build -+++ b/docs/reference/st/meson.build -@@ -17,8 +17,7 @@ gnome.gtkdoc('st', - ], - scan_args: [ - '--ignore-headers=' + ' '.join(private_headers), -- '--rebuild-sections', -- '--rebuild-types' -+ '--rebuild-sections' - ], - install: true - ) -diff --git a/meson.build b/meson.build -index 03b9d52a8..e33a76183 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,6 +1,6 @@ - project('gnome-shell', 'c', - version: '3.28.3', -- meson_version: '>= 0.42.0', -+ meson_version: '>= 0.47.0', - license: 'GPLv2+' - ) - --- -2.17.0 - diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild deleted file mode 100644 index 9931a77b08bc..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager nsplugin systemd telepathy" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( elogind systemd )" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" - -# libXfixes-5.0 needed for pointer barriers and #include -# FIXME: -# * gstreamer support is currently automagic -COMMON_DEPEND=" - >=dev-libs/libcroco-0.6.8:0.6 - >=gnome-extra/evolution-data-server-3.17.2:= - >=app-crypt/gcr-3.7.5[introspection] - >=gnome-base/gnome-desktop-3.7.90:3=[introspection] - >=dev-libs/glib-2.56.0:2 - >=dev-libs/gobject-introspection-1.49.1:= - >=dev-libs/gjs-1.47.0 - =x11-libs/gtk+-3.15.0:3[introspection] - nsplugin? ( >=dev-libs/json-glib-0.13.2 ) - >=x11-wm/mutter-3.28.0:0/2[introspection] - >=sys-auth/polkit-0.100[introspection] - >=gnome-base/gsettings-desktop-schemas-3.21.3 - >=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-0.9.8:=[introspection] - >=app-crypt/libsecret-0.18 - dev-libs/dbus-glib ) - systemd? ( >=sys-apps/systemd-31 ) - elogind? ( >=sys-auth/elogind-237 ) - - >=app-accessibility/at-spi2-atk-2.5.3 - media-libs/libcanberra[gtk3] - x11-libs/gdk-pixbuf:2[introspection] - dev-libs/libxml2:2 - >=net-libs/libsoup-2.40:2.4[introspection] - x11-libs/libX11 - - >=media-sound/pulseaudio-2[glib] - >=dev-libs/atk-2[introspection] - dev-libs/libical:= - >=x11-libs/libXfixes-5.0 - - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - media-libs/mesa -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated using: -# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq -# Each block: -# 1. Introspection stuff needed via imports.gi.* -# 2. gnome-session needed for shutdown/reboot/inhibitors/etc -# 3. Control shell settings -# 4. logind interface needed for suspending support -# 5. xdg-utils needed for xdg-open, used by extension tool -# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) -# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review -# 8. IBus is needed for nls integration -# 9. Optional telepathy chat integration -# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) -# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper -RDEPEND="${COMMON_DEPEND} - >=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 ) -" -DEPEND="${COMMON_DEPEND} - 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-28 branch on top of 3.28.3 - "${WORKDIR}"/patches/ - # Change favorites defaults, bug #479918 - "${FILESDIR}"/${PV}-defaults.patch - # Fix automagic gnome-bluetooth dep, bug #398145 - "${FILESDIR}"/${PV}-optional-bluetooth.patch - # Fix gtk-doc build with >=meson-0.47 - "${FILESDIR}"/${PV}-fix-gtk-doc-meson.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.30.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild index 49ce9e97ba32..54d8d3fd4fc6 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild @@ -28,7 +28,7 @@ COMMON_DEPEND=" >=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.47.0 + >=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] diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest index fb20c6f4ec50..f350993680c9 100644 --- a/gnome-base/gnome/Manifest +++ b/gnome-base/gnome/Manifest @@ -1,6 +1,4 @@ EBUILD gnome-3.20.0.ebuild 1456 BLAKE2B 9acd17a4f24ff1220bcb3caf32bebf2b625150e02175c60b30390d5577b000de8f97f33ec88ca690afdaad20ba921f11d0b48ae4211f825f713c7eed5a634a6f SHA512 db4545199d2f9b4e4bf0b0991ec6f21040d7191644bb1929fbe16151899c07e30d452e50c8e2732eb02674f7141fa845bfb604642c491597c452d13c4403d57f EBUILD gnome-3.24.2.ebuild 1404 BLAKE2B 29117a5b89410ca8ae065439fd532d65caba552b12dce826fa03d21db0b3e4abbda77ac5791050c5939b40dd993d616f1cb7f42d576072b7e30b2a7366207682 SHA512 a6ebd8d7b3b6099daac6d426d253a007cde83951a60db279d4b95053135d3b1c96750d59871e48906f0ce0b5ade85ddf2e840566ae330d61103c254a20abf959 -EBUILD gnome-3.26.2.ebuild 1392 BLAKE2B 143894b7cda9b8537b575df5258aa290274a4cd1a116a8d50e686b963c45371c25e5ef2a79b6157b09d89000d5fc92119aee17bd9af4a7fa064e5866f2cca273 SHA512 a4de0898490c699dd92aba111f7b47df16a04de63a8cacfb4935584acc49771648852fbe2afedf54c31709e8249dfa1cc2c627e34093ce883c4e59df9b9aacda -EBUILD gnome-3.28.2.ebuild 1389 BLAKE2B b3017d29bd6917b313231e766edb040e898ecc0a109936df1695ba0d247512eac8e6d72f6c853cb548b3a1bf6e74e88996c7c9f87b86bbb5c8b8539c95374e2d SHA512 b8a59d3f869779a4602971d751ec9e5f5f2aa36a07f72791bd33944068830c61673c087eb0524755b6110cad7acb7d8836fc37206d67cddcd34b251f37f08f2a EBUILD gnome-3.30.2.ebuild 1389 BLAKE2B 66f335a14a97fd5cd9e10906c9371d22ff99f7a43fc54809aea04728b7c453c42d7fc774620d99e908bb33857392f626cc5f4383ba0f320ca96d5003ae81e4c0 SHA512 3892fdb76a568d93b987a79b32e752e5e14a3f69d9473d824a69a818a595d751c75d8c24bc6daece53870a165e3586eeaf1b6db8ee14c4a81f4eac96462dda75 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a diff --git a/gnome-base/gnome/gnome-3.26.2.ebuild b/gnome-base/gnome/gnome-3.26.2.ebuild deleted file mode 100644 index ee23006a4774..000000000000 --- a/gnome-base/gnome/gnome-3.26.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 ~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-${PV} - - >=x11-wm/mutter-${PV} - >=gnome-base/gnome-shell-${PV}[bluetooth?] - - >=x11-themes/gnome-backgrounds-${PV} - x11-themes/sound-theme-freedesktop - - accessibility? ( - >=app-accessibility/at-spi2-atk-2.26.1 - >=app-accessibility/at-spi2-core-2.26.2 - >=app-accessibility/caribou-0.4.21 - >=app-accessibility/orca-3.26.0 - >=gnome-extra/mousetweaks-3.12.0 ) - classic? ( >=gnome-extra/gnome-shell-extensions-${PV} ) - extras? ( >=gnome-base/gnome-extra-apps-${PV} ) -" - -DEPEND="" - -PDEPEND=">=gnome-base/gvfs-1.34.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/gnome/gnome-3.28.2.ebuild b/gnome-base/gnome/gnome-3.28.2.ebuild deleted file mode 100644 index b312b0b02f4a..000000000000 --- a/gnome-base/gnome/gnome-3.28.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 ~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.28.1 - - >=x11-wm/mutter-${PV} - >=gnome-base/gnome-shell-${PV}[bluetooth?] - >=media-fonts/cantarell-0.100 - - >=x11-themes/gnome-backgrounds-3.28.0 - x11-themes/sound-theme-freedesktop - - accessibility? ( - >=app-accessibility/at-spi2-atk-2.26.2 - >=app-accessibility/at-spi2-core-2.28.0 - >=app-accessibility/orca-3.28.1 - >=gnome-extra/mousetweaks-3.12.0 ) - classic? ( >=gnome-extra/gnome-shell-extensions-3.28.1 ) - extras? ( >=gnome-base/gnome-extra-apps-${PV} ) -" - -DEPEND="" - -PDEPEND=">=gnome-base/gvfs-1.36.2[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/gvfs/Manifest b/gnome-base/gvfs/Manifest index ef4225ae0d8a..52910ba621f6 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,11 +1,7 @@ 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.34.2.1-patchset.tar.xz 2608 BLAKE2B 1041815fa35e052219df561325bab4a96e9e36c5b3afac70c6bf16f21fe3d72b70edbc59fb9df4b5b266748f6fdeb7358182bffd0eb61572d86c369a57a49bb9 SHA512 1baafda67997265ae5ad0facbdaf1d274fb400fffa3059aad40a9239b20c1362bcaa58e3a751dc575b46c5e71f94e245e625e2b12c2f178acff7d3b0dbf7c3c7 -DIST gvfs-1.34.2.1.tar.xz 1822700 BLAKE2B 2de1e86bf9dfe6567c59c7d1e2032f9e749daef0a1deb27963c0b5122be5925256c02a90dae5371bed9e037137400cca8e3461f415b3bed36de4310757bced62 SHA512 ff8d2ebff220e8432584d13640747d54c78c7350c0b8b9ed8544eb311fb4211897fb8473375b246cc1271df507f5ae2dd4edc6d5fd5d2061792377f3f37ebdb1 DIST gvfs-1.38.2.tar.xz 1202808 BLAKE2B 31150c10e042b262a55f4a072496138f47532ec55c2cae564d7c1a7a06b043bf131a91a633757fc02a0a31fc052a6ae64bd25d357cf60efa10b9490c6d1a9d84 SHA512 b6982f2c23cae057aebd00dab52b4f21f8bcef79fc5e97c098d54a9ebf997913f53146bd1760065454198c94a66f1bc1fc5325b08fea10e63a755fad87321488 EBUILD gvfs-1.32.2.ebuild 3811 BLAKE2B e0980669a87db9f15e07e81e281ecec55ce72aa98f924acf182fbf9aef851dc8b7566ae15b81f635fca1150da730aa17f1d20e5242e4116f08d16117cd80d174 SHA512 a7e156297e36658b14b9c76c2c78318ea135a4be914ff06f587cafe3cedd5b9c44d6e946117ad520a65551b15fba5fdfd65de2862f3d8ad10fd6f729f983ddb4 -EBUILD gvfs-1.34.2.1-r1.ebuild 3741 BLAKE2B cdc826af8a3ceffa2e211ae804f31b970c554aace54dcd71ef3eb197ffef40be96c68c0b7624214c6e3007c922d8396f9f8c8d75409b16f7b36081cdd8acfede SHA512 98afd5b53bf08526a43ba561b8bd27e295f4f33247b29a344a0142657a5715d0af29edd55ecccf1912985ab416e34eb837191769de84b3255058e0e1fda22fa7 -EBUILD gvfs-1.34.2.1-r2.ebuild 3767 BLAKE2B 992c78246b386873c9eed365168556a7d04ea4c56e50bc4f720a80d1a700b52e8354c09b678576fae98a202351e9354effb358985814ddb83e025bcf7099e9bc SHA512 b9d67a7275c699605a9745d49b026f0f3d9461fc9ab696e136883d3d342304a07a7a019ff36cc523acb47711ccdcbc4bb293a80f190ed355a0d53db9e82f887c EBUILD gvfs-1.38.2.ebuild 3661 BLAKE2B 5f24394400cd75afa3f819ec57595a4b0924fb40342910809e49ef1158daf218c1a814723e9bcd81a3503f17b6ed62807fd57879c1c2a1722d40139ff5385016 SHA512 e0f15a580db98d0f9e7c508d0bb3c9caf35cf9e57dfabf6ab70c35b589d0d2a24a948e1674bf941317a6a734787d42a118c1f4f85ce654f0293632654b13dc58 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7 diff --git a/gnome-base/gvfs/gvfs-1.34.2.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.34.2.1-r1.ebuild deleted file mode 100644 index 095d6bfe56d7..000000000000 --- a/gnome-base/gvfs/gvfs-1.34.2.1-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit 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 +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-fbsd ~x86-fbsd ~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.9:=[crypt,gnome-online-accounts] - >=net-libs/gnome-online-accounts-3.17.1:= ) - gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) - 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 ) - >=virtual/libgudev-147:= - virtual/libudev:= ) - udisks? ( >=sys-fs/udisks-1.97:2 ) - zeroconf? ( >=net-dns/avahi-0.6 ) -" -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/ # origin/gnome-3-26@20180912 + elogind support (requires eautoreconf) -) - -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 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.34.2.1-r2.ebuild b/gnome-base/gvfs/gvfs-1.34.2.1-r2.ebuild deleted file mode 100644 index 16bae098ddea..000000000000 --- a/gnome-base/gvfs/gvfs-1.34.2.1-r2.ebuild +++ /dev/null @@ -1,134 +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 +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-fbsd ~x86-fbsd ~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.9:=[crypt,gnome-online-accounts] - >=net-libs/gnome-online-accounts-3.17.1:= ) - gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) - 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:0= - dev-libs/libcdio-paranoia ) - >=virtual/libgudev-147:= - virtual/libudev:= ) - udisks? ( >=sys-fs/udisks-1.97:2 ) - zeroconf? ( >=net-dns/avahi-0.6 ) -" -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/ # origin/gnome-3-26@20180912 + elogind support (requires eautoreconf) -) - -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 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) -} -- cgit v1.2.3