diff options
Diffstat (limited to 'gnome-base')
50 files changed, 2044 insertions, 38 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz Binary files differindex 6981d8fc4198..a8aad447e9d4 100644 --- a/gnome-base/Manifest.gz +++ b/gnome-base/Manifest.gz diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest index a9dc8ee0b3ad..1fb9a0717216 100644 --- a/gnome-base/dconf-editor/Manifest +++ b/gnome-base/dconf-editor/Manifest @@ -1,5 +1,7 @@ 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.30.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.30.2.ebuild new file mode 100644 index 000000000000..a8ec49357250 --- /dev/null +++ b/gnome-base/dconf-editor/dconf-editor-3.30.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VALA_MIN_API_VERSION="0.40" + +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/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 96aead137b51..803cedaa2bc6 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,11 +1,18 @@ 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 -EBUILD gnome-control-center-3.24.4.ebuild 4964 BLAKE2B 6888715dafc3e6c56690687a41ad1dc7bbc41083e224023349c677d322378f830084038ee18b6628249bddc4422a834577c951fab757b32249a041f4211192de SHA512 d2510b19b0600459a86a56c6f5d0ed8fcfe35b00e9b767782ebd8ae9336c2a1be9f8345d841acfc05f28d38e226df500823f96cf3c5d6e3fa396106aba305f85 -EBUILD gnome-control-center-3.26.2-r28.ebuild 5310 BLAKE2B 2f1c9591fd74f25a78fb2ae3bcbcce6c5075852f5880f648e659e80bb75400aa2c5231056e942bf355246920af69170e042f8dd3948333bb5e486456cc957ee5 SHA512 350030f5b682f914147c5b58a258bbf2a75c003d2f2861a4da7a60fd090d7d5a1908d227e8499a5864c437f391e7d775ea61c557babbf2c4242aff89997fb548 -EBUILD gnome-control-center-3.26.2-r3.ebuild 5322 BLAKE2B f51934179a425e3ad83a09d8542d8049ae62f68a7d224969f1522957ef58fb9c04da3cb35577c507b09af02685528598dd6e413b614e37995860fcd8234794b9 SHA512 389d2c46c13d4b6295296d69d1d384531085931012f0018112a3e2376bd7129bbe982901d2da9454aa46d28ed83ca8918860375dd256e97baa887d8390822eb1 -MISC metadata.xml 592 BLAKE2B b868af571d6fb58f3a7baaa586261025de5be5a928f963f6fde8db3b6549b6dd30c0d73752e296f9ba3b128c96f3a942ed6cecc8acb98d745502483822c9866b SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104 +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 +MISC metadata.xml 675 BLAKE2B e22d57c5a893d8c2a20851671a82741ea1918a6792444898a808a2b50668fd0fc6d712025b167fff6371644e7eaa182ef4bfd0a85718f7fee57fb0d586ff62cf SHA512 debac95237dacc2b937bb9d4a75f569f10c7798434a2b22cff342d51b7c50a6a78af1aeddf0ee3274cac332b55d25b2d3da8482b49d8d355e6428aca11e1b908 diff --git a/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch b/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch new file mode 100644 index 000000000000..8b9d738c10fb --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch @@ -0,0 +1,28 @@ +From f724fb0f41672bfa5cd6fe098223acc795de90a4 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Thu, 14 Mar 2019 23:35:08 +0200 +Subject: [PATCH] build: Conditionalize printer panel tests with enable_cups + +3.30 moved various tests from being alongside the panels to a +separate toplevel tests/ subdirectory, which was missed while +porting the patchset. Fix it. +--- + tests/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 7c894e480..fb39c9f48 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -3,5 +3,7 @@ subdir('common') + #if host_is_linux + # subdir('network') + #endif +-subdir('printers') ++if enable_cups ++ subdir('printers') ++endif + subdir('info') +-- +2.17.0 + diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild index 81390ad69ec9..1bc940b88887 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild @@ -17,7 +17,6 @@ IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_ KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 # kerberos unfortunately means mit-krb5; build fails with heimdal # udev could be made optional, only conditions gsd-device-panel # (mouse, keyboards, touchscreen, etc) @@ -31,7 +30,7 @@ COMMON_DEPEND=" >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= <gnome-base/gnome-desktop-3.27.90:3 - >=gnome-base/gnome-settings-daemon-3.23.90[colord,policykit] + >=gnome-base/gnome-settings-daemon-3.23.90[colord] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 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 index 616a44779d21..62bb2625cd02 100644 --- 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 @@ -17,7 +17,6 @@ IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 # kerberos unfortunately means mit-krb5; build fails with heimdal # udev could be made optional, only conditions gsd-device-panel # (mouse, keyboards, touchscreen, etc) @@ -29,7 +28,7 @@ COMMON_DEPEND=" >=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,policykit] + >=gnome-base/gnome-settings-daemon-3.25.90[colord] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild index 9078a9e52045..3cb36611c3d0 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild @@ -17,7 +17,6 @@ IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 # kerberos unfortunately means mit-krb5; build fails with heimdal # udev could be made optional, only conditions gsd-device-panel # (mouse, keyboards, touchscreen, etc) @@ -31,7 +30,7 @@ COMMON_DEPEND=" >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= <gnome-base/gnome-desktop-3.27.90:3 - >=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit] + >=gnome-base/gnome-settings-daemon-3.25.90[colord] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild new file mode 100644 index 000000000000..e48ea0dd21f7 --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="GNOME'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 +cups debug flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" +REQUIRED_USE="flickr? ( gnome-online-accounts )" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# kerberos unfortunately means mit-krb5; build fails with heimdal +# display panel requires colord and gnome-settings-daemon[colord] +# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support +# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional) +# >=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 +# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x +# +# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 +# Also we need newer driver versions to allow wacom and libinput drivers to +# not collide +# +# system-config-printer provides org.fedoraproject.Config.Printing service and interface +# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy +RDEPEND="${COMMON_DEPEND} + || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) + x11-themes/adwaita-icon-theme + >=gnome-extra/gnome-color-manager-3.1.2 + cups? ( + app-admin/system-config-printer + net-print/cups-pk-helper ) + >=gnome-base/libgnomekbd-3 + wayland? ( dev-libs/libinput ) + !wayland? ( + >=x11-drivers/xf86-input-libinput-0.19.0 + input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) + flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] ) + + !<gnome-base/gdm-2.91.94 + !gnome-extra/gnome-media[pulseaudio] + !<gnome-extra/gnome-media-2.32.0-r300 + !<net-wireless/gnome-bluetooth-3.3.2 +" +# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel +# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login +PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" + +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + x11-base/xorg-proto + dev-libs/libxml2:2 + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + # Patches from gnome-3-28 branch on top of 3.28.2 + # Makes some panels and dependencies optional + # https://bugzilla.gnome.org/686840, 697478, 700145 + # Fix some absolute paths to be appropriate for Gentoo + "${WORKDIR}"/patches/ +) + +src_configure() { + local emesonargs=( + $(meson_use bluetooth) + $(meson_use v4l cheese) + -Dcups=$(usex cups enabled disabled) + -Ddocumentation=true # manpage + -Dgoa=$(usex gnome-online-accounts enabled disabled) + -Dgrilo=$(usex flickr enabled disabled) + $(meson_use ibus) + -Dkerberos=$(usex kerberos enabled disabled) + $(meson_use networkmanager network_manager) + $(meson_use input_devices_wacom wacom) + $(meson_use wayland) + # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir) + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild new file mode 100644 index 000000000000..7beb2fd313cc --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="GNOME'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 +cups debug flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" +REQUIRED_USE="flickr? ( gnome-online-accounts )" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# kerberos unfortunately means mit-krb5; build fails with heimdal +# display panel requires colord and gnome-settings-daemon[colord] +# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support +# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional) +# >=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 +# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x +# +# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 +# Also we need newer driver versions to allow wacom and libinput drivers to +# not collide +# +# system-config-printer provides org.fedoraproject.Config.Printing service and interface +# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy +RDEPEND="${COMMON_DEPEND} + || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) + x11-themes/adwaita-icon-theme + >=gnome-extra/gnome-color-manager-3.1.2 + cups? ( + app-admin/system-config-printer + net-print/cups-pk-helper ) + >=gnome-base/libgnomekbd-3 + wayland? ( dev-libs/libinput ) + !wayland? ( + >=x11-drivers/xf86-input-libinput-0.19.0 + input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) + flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] ) + + !<gnome-base/gdm-2.91.94 + !gnome-extra/gnome-media[pulseaudio] + !<gnome-extra/gnome-media-2.32.0-r300 + !<net-wireless/gnome-bluetooth-3.3.2 +" +# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel +# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login +PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" + +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + x11-base/xorg-proto + dev-libs/libxml2:2 + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + # Patches from gnome-3-28 branch on top of 3.28.2 + # Makes some panels and dependencies optional + # https://bugzilla.gnome.org/686840, 697478, 700145 + # Fix some absolute paths to be appropriate for Gentoo + "${WORKDIR}"/patches/ + # Extra patch to fix incomplete USE=-cups support in patchset; amend it into the cups optionality commit for next patchset + "${FILESDIR}"/${PV}-conditional-cups-tests.patch +) + +src_configure() { + local emesonargs=( + $(meson_use bluetooth) + $(meson_use v4l cheese) + -Dcups=$(usex cups enabled disabled) + -Ddocumentation=true # manpage + -Dgoa=$(usex gnome-online-accounts enabled disabled) + -Dgrilo=$(usex flickr enabled disabled) + $(meson_use ibus) + -Dkerberos=$(usex kerberos enabled disabled) + $(meson_use networkmanager network_manager) + -Dtracing=false + $(meson_use input_devices_wacom wacom) + $(meson_use wayland) + # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir) + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml index 4e40862668dd..f1ac0fd9a7be 100644 --- a/gnome-base/gnome-control-center/metadata.xml +++ b/gnome-base/gnome-control-center/metadata.xml @@ -6,11 +6,9 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> - <flag name="colord">Support color management using - <pkg>x11-misc/colord</pkg></flag> - <flag name="gnome-online-accounts">Enable configuration panel for - <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag> - <flag name="ibus">Enable support for enhanced input methods through - <pkg>app-i18n/ibus</pkg></flag> + <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag> + <flag name="flickr">Add support for using photos from flickr as desktop background</flag> + <flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag> + <flag name="ibus">Enable support for enhanced input methods through <pkg>app-i18n/ibus</pkg></flag> </use> </pkgmetadata> diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest index 000eebe40fe9..c41caa64ffa0 100644 --- a/gnome-base/gnome-core-apps/Manifest +++ b/gnome-base/gnome-core-apps/Manifest @@ -1,3 +1,5 @@ EBUILD gnome-core-apps-3.24.2.ebuild 1508 BLAKE2B d28ee34bb83608702334297815bb57bc0d7609fbd22140853c15ee620f226c932a302e9d837b3e0e434167ed6651e04cd00083fcebebd89db0028e849c2e7437 SHA512 4ef8de35566aeff15124d332e9d4a8d020782edde45a51aae4b5fc6edec90b5172feb592bf16fd80cfb81efc6687f06ca5544f0718d3a2080fa54b0529cd4b9e EBUILD gnome-core-apps-3.26.2.ebuild 1526 BLAKE2B e14d79832866d720ce2f1600e85591d7bd9aedc4bcc6c3da5b7ee7d092b310887fe453217a6ca9a177c3ba4c860c75cc24b165442a652d4361f456c8125cfece SHA512 dd42ac38215bcc970c8c0bcc84e74b4fcbd7bfbc2e54f79885629793a69ecd9582b53954c731b071e136d597322662f3cfb3fd0fee82a4b6841eba56b834e6d2 +EBUILD gnome-core-apps-3.28.2.ebuild 1517 BLAKE2B 0c64cce7e2b367402ea6409b24711ba1c926b7c9fdac5b6034799ef73a1978b5624bf1c54688ee346e482d2a6f282a96f29e8eecfcdfe913f83b0f12a21cd5b7 SHA512 21a62e49e282f8fe77f153cd54757553cd66125fb1ed92a1c13f84d58db9e3965ca691863673a8056bd3b9a7193e8f9e65a24d58f7ca3ef2a76668de5c5d2544 +EBUILD gnome-core-apps-3.30.2.ebuild 1518 BLAKE2B 703053735b12ea78d989350dbeeda969ab063f9251be79ba871ce3c96bba087e46f64bb0bc0383200b6c83ac7855fca0127bd0b458e2919a18ea224081254f71 SHA512 24f2439f778e49fe9575dd79539a434a03110ddb89fbc2dc937d41bf9a9e63765d12475bf49f46d305fadc9fb63c84f66ec046d365237c871830b9f03e011501 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 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 new file mode 100644 index 000000000000..c3b449e0e294 --- /dev/null +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.28.2.ebuild @@ -0,0 +1,51 @@ +# 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-apps/gnome-core-apps-3.30.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.30.2.ebuild new file mode 100644 index 000000000000..16753a07ba34 --- /dev/null +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.30.2.ebuild @@ -0,0 +1,51 @@ +# 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.30.1 + >=gnome-base/gnome-settings-daemon-3.30.1.2[cups?] + >=gnome-base/gnome-control-center-3.30.1[cups?] + >=gnome-extra/gnome-color-manager-3.30.0 + + >=app-crypt/gcr-3.28.0 + >=gnome-base/nautilus-${PV} + >=gnome-base/gnome-keyring-3.28.2 + >=gnome-extra/evolution-data-server-${PV} + + >=app-crypt/seahorse-3.30.1.1 + >=app-editors/gedit-${PV} + >=app-text/evince-${PV} + >=gnome-extra/gnome-contacts-3.30.1 + >=media-gfx/eog-3.28.4 + >=media-video/totem-3.30.0 + >=x11-terms/gnome-terminal-${PV} + + >=gnome-extra/gnome-user-docs-${PV} + >=gnome-extra/yelp-3.30.0 + + >=x11-themes/adwaita-icon-theme-3.30.0 + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.28.2 ) +" +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 71d9f975539a..fa44fed9b9f7 100644 --- a/gnome-base/gnome-core-libs/Manifest +++ b/gnome-base/gnome-core-libs/Manifest @@ -1,4 +1,5 @@ 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.30.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.30.2.ebuild new file mode 100644 index 000000000000..7cc7dc16405c --- /dev/null +++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.30.2.ebuild @@ -0,0 +1,42 @@ +# 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.58.1:2 + >=x11-libs/gdk-pixbuf-2.38.0:2 + >=x11-libs/pango-1.42.4 + >=x11-libs/gtk+-3.24.1:3[cups?] + >=dev-libs/atk-2.30.0 + >=gnome-base/librsvg-2.40.20 + >=gnome-base/gnome-desktop-${PV}:3 + >=x11-libs/startup-notification-0.12 + + >=gnome-base/gvfs-1.38.1 + >=gnome-base/dconf-0.30.1 + + >=media-libs/gstreamer-1.14.4:1.0 + >=media-libs/gst-plugins-base-1.14.4:1.0 + >=media-libs/gst-plugins-good-1.14.4:1.0 + + python? ( >=dev-python/pygobject-3.30.1:3 ) +" +DEPEND="" + +# >=x11-libs/libwnck-3.24.1:3 - not used by core packages anymore +# librsvg kept back on non-rust version; should move on at some point for non-exotic arches. + +S="${WORKDIR}" diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest index 5a71c0317443..ad5e0a247f7a 100644 --- a/gnome-base/gnome-extra-apps/Manifest +++ b/gnome-base/gnome-extra-apps/Manifest @@ -1,3 +1,5 @@ -EBUILD gnome-extra-apps-3.24.2.ebuild 2335 BLAKE2B 2bafe0766ef3e641f0a7281defcfdb2b75b05b222a5098a552d0a5cd9b4ba7925c82a3fa8889bca4183360a39d7a4a5840c1343e30bf92495f2a1e76b9829645 SHA512 671d41127a5144a31985b96e9768312cb4e4cdfd9a5e45269a18bd3c6d7bae4dc644b265dc358181017542131a8c5f77825cee5c884673f2ee1605b921489f95 -EBUILD gnome-extra-apps-3.26.2.ebuild 2542 BLAKE2B 14b75c7b9e77e829af96493bb4f1c725ad2c0969884a2cc645bc54ccd03460d099ee1e8ed21c56cdc131b860b22d7cdedc9f7b7b5be45019779ea71317a167c0 SHA512 9171b51521643cb8b9525b71a4f6250d371e387bc32851dd288646eea568f93eff3554d01879212e23df8b478399b458f33eaa1a04313983ecbb16d37cec9e89 +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 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 1ccdc6efeb50..30f1f7ac3157 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 @@ -40,7 +40,7 @@ RDEPEND=" >=app-dicts/gnome-dictionary-3.24.1 >=mail-client/evolution-${PV} >=net-analyzer/gnome-nettool-3.8.1 - >=gnome-extra/gnome-tweak-tool-3.24.1 + >=gnome-extra/gnome-tweaks-3.24.1 >=gnome-extra/nautilus-sendto-3.8.4 >=net-misc/vinagre-3.22.0 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 index f311f8fd00c8..ed49b6726619 100644 --- 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 @@ -41,7 +41,7 @@ RDEPEND=" >=app-dicts/gnome-dictionary-3.26.1 >=mail-client/evolution-${PV} >=net-analyzer/gnome-nettool-3.8.1 - >=gnome-extra/gnome-tweak-tool-3.26.3 + >=gnome-extra/gnome-tweaks-3.26.3 >=gnome-extra/nautilus-sendto-3.8.6 >=net-misc/vinagre-3.22.0 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 new file mode 100644 index 000000000000..02e761ad4f84 --- /dev/null +++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.28.2.ebuild @@ -0,0 +1,74 @@ +# 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 new file mode 100644 index 000000000000..a0a0a670b4dd --- /dev/null +++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.30.2.ebuild @@ -0,0 +1,74 @@ +# 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-dictionary, gucharmap, sound-juicer, vinagre, vino; replace gucharmap with gnome-characters? +# gnome-documents removed for now, as it didn't find a good place upstream and is getting dropped from default sets for distros for 3.30 (and for 3.26 it required newer tracker than we had at the time) +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV} + + >=sys-apps/baobab-3.30.0 + >=media-video/cheese-3.30.0 + >=www-client/epiphany-${PV} + >=app-arch/file-roller-3.30.1 + >=gnome-extra/gnome-calculator-3.30.1 + >=gnome-extra/gnome-calendar-3.30.0 + >=gnome-extra/gnome-characters-3.30.0 + >=sys-apps/gnome-disk-utility-${PV} + >=media-gfx/gnome-font-viewer-3.30.0 + >=media-gfx/gnome-screenshot-3.30.0 + >=gnome-extra/gnome-system-monitor-3.30.0 + >=gnome-extra/gnome-weather-3.26.0 + >=gnome-extra/gucharmap-11.0.3:2.90 + >=gnome-extra/sushi-3.30.0 + >=media-sound/sound-juicer-3.24.0 + >=net-misc/vino-3.22.0 + + >=gnome-base/dconf-editor-${PV} + >=app-dicts/gnome-dictionary-3.26.1 + >=mail-client/evolution-${PV} + >=gnome-extra/gnome-tweaks-${PV} + >=gnome-extra/nautilus-sendto-3.8.6 + >=net-misc/vinagre-3.22.0 + + games? ( + >=games-puzzle/five-or-more-3.30.0 + >=games-board/four-in-a-row-3.28.0 + >=games-board/gnome-chess-3.30.1 + >=games-puzzle/gnome-klotski-3.22.3 + >=games-board/gnome-mahjongg-3.22.0 + >=games-board/gnome-mines-3.30.1.1 + >=games-arcade/gnome-nibbles-3.24.1 + >=games-arcade/gnome-robots-3.22.3 + >=games-puzzle/gnome-sudoku-3.30.0 + >=games-puzzle/gnome-taquin-3.30.0 + >=games-puzzle/gnome-tetravex-3.22.0 + >=games-puzzle/hitori-3.22.4 + >=games-board/iagno-3.30.0 + >=games-puzzle/lightsoff-3.30.0 + >=games-puzzle/quadrapassel-3.22.0 + >=games-puzzle/swell-foop-3.30.0 + >=games-board/tali-3.22.0 + ) + share? ( >=gnome-extra/gnome-user-share-3.28.0 ) + shotwell? ( >=media-gfx/shotwell-0.30.1 ) + tracker? ( + >=app-misc/tracker-2.1.5 + >=app-misc/tracker-miners-2.1.5 + >=media-gfx/gnome-photos-3.30.1 + >=media-sound/gnome-music-3.30.2 ) +" +DEPEND="" +S=${WORKDIR} diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest index 4ccf5d2d9eaf..15f138816129 100644 --- a/gnome-base/gnome-light/Manifest +++ b/gnome-base/gnome-light/Manifest @@ -1,4 +1,6 @@ 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 new file mode 100644 index 000000000000..5e0db649307c --- /dev/null +++ b/gnome-base/gnome-light/gnome-light-3.28.2.ebuild @@ -0,0 +1,61 @@ +# 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-light/gnome-light-3.30.2.ebuild b/gnome-base/gnome-light/gnome-light-3.30.2.ebuild new file mode 100644 index 000000000000..9bb2d83141ca --- /dev/null +++ b/gnome-base/gnome-light/gnome-light-3.30.2.ebuild @@ -0,0 +1,62 @@ +# 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-core-libs-${PV}[cups?] + + >=gnome-base/gnome-session-3.30.1 + >=gnome-base/gnome-settings-daemon-3.30.1.2[cups?] + >=gnome-base/gnome-control-center-${PV}[cups?] + + >=gnome-base/nautilus-${PV} + + gnome-shell? ( + >=x11-wm/mutter-${PV} + >=dev-libs/gjs-1.54.2 + >=gnome-base/gnome-shell-${PV} + >=media-fonts/cantarell-0.111 ) + + >=x11-themes/adwaita-icon-theme-${P_RELEASE} + >=x11-themes/gnome-themes-standard-3.28 + >=x11-themes/gnome-backgrounds-${P_RELEASE} + + >=x11-terms/gnome-terminal-${PV} +" +DEPEND="" +PDEPEND=">=gnome-base/gvfs-1.38.1" +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 9ada20df96e4..b3984c2333d5 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -1,6 +1,7 @@ AUX 10-user-dirs-update-gnome-r1 299 BLAKE2B ba1537eb23474b47f69937d38cb5b9f0de56631d06b888292b96fd7179e60593c3b9c6c2da86a589a45ae35ccb0e03f169895462044b9fb3e1d600e768a65da1 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5bbb309f3dfe5af1d50283ca024a508d0d4dc92a6c5fa65de1489cad55451df3016eae3f5cc4070d16e4c78 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc AUX 3.22.3-xorg-default.patch 1929 BLAKE2B 0af17b6f73c4c431c4815dd3f1f23a7aef81727ddc179f3f8ad5aa10875562ecc6904e35ccdc55aae76dc956423bd30c4469768a5797023ab79da7e84d125599 SHA512 025ba94a21a3c42b816083e6d99c85ece695487af1153990c1fec63bbb215284efb95a2c8d505afe36b0e4575b0796ca57fe83ae715a8593c8db886b7eacfca1 +AUX 3.30.1-elogind-support.patch 2436 BLAKE2B 4813db45ddf9a8ea50a6a7288df50c94029dd065354e5f62589091439c9847166613858f98deeb81d406796c93728a17722b297ee5130fd2e1092d85040ad722 SHA512 a1aba2cbf50b58f1424d580a533a108ae52c48d3767887d7e3d922897b0979477ed3904894b12a63ae5c4b6597f46d869abb5288548ad90cbecefa0defb6eb5a AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 AUX defaults.list-r3 18178 BLAKE2B 77d04148ddb7a1ad76b4c59e3d1bd216791c88bc8b25b6f506e36000279610a8742e9a30b1cda5ad364f562e3ac043a2e887d95dfa82c1aa2f8ed2d255aeb2a7 SHA512 1c8cd1a07f0aaacaef2adf7d009a90996b177b348dd6780fc9692728424d8803e517ae4d357fa2324e447b8d082836b60565497b505d54e0559704757b6ecbf3 @@ -9,7 +10,9 @@ DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e0 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 -MISC metadata.xml 354 BLAKE2B 9a214af6e9013e16db363b70941941c5fba9283587d1d29c17f610f89996e9cb108d37f15c794c44dcdace691b063a5eeeb23cffcbe994eb7eb83af6c9ad4d1a SHA512 5113da31e1bc5b32f13c6aa18e90d5f09bd7616e6b777a160e0d7be77f4dca52e9b2dc39d6f397168470a4baed06ddf3f8e5c38e9ac83bd1c8aaa8f6dabcb695 +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/files/3.30.1-elogind-support.patch b/gnome-base/gnome-session/files/3.30.1-elogind-support.patch new file mode 100644 index 000000000000..4f1c5dab9dda --- /dev/null +++ b/gnome-base/gnome-session/files/3.30.1-elogind-support.patch @@ -0,0 +1,67 @@ +From 92072c73ab74ebe0654ac5bd4f9fd2182181ee9d Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Tue, 19 Mar 2019 11:00:21 +0200 +Subject: [PATCH] meson: Support elogind + +--- + meson.build | 12 +++++++++--- + meson_options.txt | 1 + + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index afc97457..7c32e3b9 100644 +--- a/meson.build ++++ b/meson.build +@@ -121,8 +121,10 @@ session_tracking = 'null backend' + + enable_systemd = get_option('systemd') + enable_systemd_journal = get_option('systemd_journal') ++enable_elogind = get_option('elogind') + enable_consolekit = get_option('consolekit') +-if enable_systemd or enable_consolekit ++assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once') ++if enable_systemd or enable_elogind or enable_consolekit + session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version) + + # Check for systemd +@@ -145,6 +147,10 @@ if enable_systemd or enable_consolekit + endif + + session_tracking = 'systemd' ++ elif enable_elogind ++ libelogind_dep = dependency('libelogind', version: '>= 239.4') ++ session_bin_deps += libelogind_dep ++ session_tracking = 'elogind' + endif + + # Check for ConsoleKit +@@ -154,14 +160,14 @@ if enable_systemd or enable_consolekit + + session_bin_deps += dbus_glib_dep + +- if enable_systemd ++ if enable_systemd or enable_elogind + session_tracking += ' (with fallback to ConsoleKit)' + else + session_tracking = 'ConsoleKit' + endif + endif + endif +-config_h.set('HAVE_SYSTEMD', enable_systemd) ++config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind) + config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal) + config_h.set('HAVE_CONSOLEKIT', enable_consolekit) + +diff --git a/meson_options.txt b/meson_options.txt +index 05174fec..cd85eae8 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,4 +1,5 @@ + option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags') ++option('elogind', type: 'boolean', value: true, description: 'Use elogind') + option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog') + option('systemd', type: 'boolean', value: true, description: 'Use systemd') + option('systemd_journal', type: 'boolean', value:'true', description: 'Send log to systemd-journal') +-- +2.17.0 + diff --git a/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild new file mode 100644 index 000000000000..f62cbf2858fd --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Gnome session manager" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="consolekit doc elogind systemd" +# There is a null backend available, thus ?? not ^^ +# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback +REQUIRED_USE="?? ( elogind systemd )" + +COMMON_DEPEND=" + >=dev-libs/glib-2.46.0:2 + >=x11-libs/gtk+-3.18.0:3 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + >=gnome-base/gnome-desktop-3.18:3= + >=dev-libs/json-glib-0.10 + media-libs/mesa[egl,gles2] + media-libs/libepoxy + x11-libs/libXcomposite + + systemd? ( >=sys-apps/systemd-183:0= ) + elogind? ( >=sys-auth/elogind-239.4 ) + consolekit? ( >=dev-libs/dbus-glib-0.76 ) +" + +# Pure-runtime deps from the session files should *NOT* be added here +# Otherwise, things like gdm pull in gnome-shell. +# gnome-settings-daemon is assumed to be >=3.27.90, but this is about +# removed components, so no need to strictly require it (older just +# won't have those daemons loaded by gnome-session). +# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and +# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* +# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). +# sys-apps/dbus[X] is needed for session management. +# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas. +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-settings-daemon-3.23.2 + >=gnome-base/gsettings-desktop-schemas-0.1.7 + sys-apps/dbus[X] + consolekit? ( sys-auth/consolekit ) + + x11-misc/xdg-user-dirs + x11-misc/xdg-user-dirs-gtk +" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + dev-util/gdbus-codegen + >=sys-devel/gettext-0.19.8 + x11-libs/xtrans + virtual/pkgconfig + doc? ( app-text/xmlto + app-text/docbook-xml-dtd:4.1.2 ) +" + +PATCHES=( + "${FILESDIR}"/${PV}-elogind-support.patch +) + +src_prepare() { + xdg_src_prepare + # Install USE=doc in $PF if enabled + sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die +} + +src_configure() { + local emesonargs=( + -Ddeprecation_flags=false + $(meson_use elogind) + -Dsession_selector=true # gnome-custom-session + $(meson_use systemd) + $(meson_use systemd systemd_journal) + $(meson_use consolekit) + $(meson_use doc docbook) + -Dman=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + + dodir /etc/X11/Sessions + exeinto /etc/X11/Sessions + doexe "${FILESDIR}/Gnome" + + insinto /usr/share/applications + newins "${FILESDIR}/defaults.list-r4" gnome-mimeapps.list + + dodir /etc/X11/xinit/xinitrc.d/ + exeinto /etc/X11/xinit/xinitrc.d/ + newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome + + # This should be done here as discussed in bug #270852 + newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome + + # Set XCURSOR_THEME from current dconf setting instead of installing + # default cursor symlink globally and affecting other DEs (bug #543488) + # https://bugzilla.gnome.org/show_bug.cgi?id=711703 + newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then + ewarn "If you use a custom .xinitrc for your X session," + ewarn "make sure that the commands in the xinitrc.d scripts are run." + fi + + if ! use systemd && ! use elogind && ! use consolekit; then + ewarn "You are building without systemd, elogind and/or consolekit support." + ewarn "gnome-session won't be able to correctly track and manage your session." + fi +} + +pkg_postrm() { + xdg_pkg_postinst + gnome2_schemas_update +} diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml index 506e4f9e5c55..0a5d0e69d176 100644 --- a/gnome-base/gnome-session/metadata.xml +++ b/gnome-base/gnome-session/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <use> <flag name="consolekit">Support <pkg>sys-auth/consolekit</pkg> for session tracking</flag> + <flag name="elogind">Support <pkg>sys-auth/elogind</pkg> for session tracking</flag> </use> </pkgmetadata> diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index a3a628d4ced3..f9376395c9e4 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,3 +1,4 @@ +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 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 @@ -5,7 +6,10 @@ DIST gnome-settings-daemon-3.26.2-patchset.tar.xz 42408 BLAKE2B 3b54dd1b161f4137 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.ebuild 3749 BLAKE2B 8489ced21d928ca25a467908b5a3c4f7e0e274c75a777c16175de07ae22a1aa0f5a3c4a53370989d801e89ffdd169a9d122421bc5f43732feb0b8745ede7b4c6 SHA512 8d2d7070b9e257052e2bddfda038e31c958fed6345a13eb062d58774f415ee16573ccc7fa14a8904bb92b57ed2e6d05f3c49b90e9c2f28634db721557987704c +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 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 new file mode 100644 index 000000000000..dd003d6c0694 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/3.28.1-fix-non-wayland-build.patch @@ -0,0 +1,88 @@ +From 91d5e708835b4c7810835d59b8ef5968454cfd0a Mon Sep 17 00:00:00 2001 +From: Ting-Wei Lan <lantw@src.gnome.org> +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 <marv@exherbo.org> +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/gnome-settings-daemon-3.28.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild index 0786e730078b..160587306791 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.28.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" LICENSE="GPL-2+ LGPL-2+" SLOT="0" -IUSE="+colord +cups debug elogind input_devices_wacom networkmanager policykit smartcard systemd test +udev wayland" +IUSE="+colord +cups debug elogind input_devices_wacom networkmanager smartcard systemd test +udev wayland" REQUIRED_USE=" ^^ ( elogind systemd ) input_devices_wacom? ( udev ) @@ -26,7 +26,7 @@ COMMON_DEPEND=" >=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] + >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-3.9.5:2= colord? ( >=x11-misc/colord-1.0.2:= @@ -85,6 +85,8 @@ PATCHES=( # Make colord and wacom optional # glib 2.58 compatibility fix; included in 3.29.1+ "${WORKDIR}"/patches/ + # Fix non-wayland builds; 3.32 won't have this device manager code anymore, so nothing to upstream + "${FILESDIR}"/${PV}-fix-non-wayland-build.patch ) python_check_deps() { diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2.ebuild new file mode 100644 index 000000000000..98e4f1b2b1b0 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} ) + +inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg + +DESCRIPTION="Gnome Settings Daemon" +HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +IUSE="+colord +cups debug elogind input_devices_wacom networkmanager smartcard systemd test +udev wayland" +REQUIRED_USE=" + ^^ ( elogind systemd ) + input_devices_wacom? ( udev ) + wayland? ( udev ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# >=polkit-0.114 for ITS translation rules of .policy files +COMMON_DEPEND=" + >=sci-geosciences/geocode-glib-3.10 + >=dev-libs/glib-2.53.0:2 + >=gnome-base/gnome-desktop-3.11.1:3= + >=gnome-base/gsettings-desktop-schemas-3.27.90 + >=x11-libs/gtk+-3.15.3:3[X,wayland?] + >=dev-libs/libgweather-3.9.5:2= + colord? ( + >=x11-misc/colord-1.0.2:= + >=media-libs/lcms-2.2:2 ) + media-libs/libcanberra[gtk3] + >=app-misc/geoclue-2.3.1:2.0 + >=x11-libs/libnotify-0.7.3 + >=media-sound/pulseaudio-2[glib] + >=sys-auth/polkit-0.114 + >=sys-power/upower-0.99:= + x11-libs/libX11 + x11-libs/libXtst + udev? ( 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 ) + !<gnome-base/gnome-session-3.27.90 + !<gnome-base/gdm-3.27.90 +" +# rfkill requires linux/rfkill.h, thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead +DEPEND="${COMMON_DEPEND} + sys-kernel/linux-headers + dev-util/glib-utils + dev-util/gdbus-codegen + x11-base/xorg-proto + ${PYTHON_DEPS} + test? ( + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') + gnome-base/gnome-session ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.30+ (incompatible build system python needs until then as well) +#RESTRICT="!test? ( test )" + +PATCHES=( + # Translation updates from gnome-3-30 branch + # Allow disabling udev and networkmanager on Linux + # Make colord and wacom optional + "${WORKDIR}"/patches/ +) + +python_check_deps() { + if use test; then + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && + has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss? + -Dudev_dir="$(get_udevdir)" + -Dalsa=true + $(meson_use udev gudev) + $(meson_use colord) + $(meson_use cups) + $(meson_use networkmanager network_manager) + -Drfkill=true + $(meson_use smartcard) + $(meson_use input_devices_wacom wacom) + $(meson_use wayland) + -Dexperimental_suspend_then_hibernate=false + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index 0b8fed74ca9d..fdb65e7b1b81 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -10,7 +10,10 @@ DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b815 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029 SHA512 a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4 DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade SHA512 3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8 -EBUILD gnome-shell-3.24.3.ebuild 6612 BLAKE2B 79ec20064d5dd5a4224918b2d7a4b37f7f86d26f3bc1a9bb9637b01c0e2cf6c8067fc16a75667955499b70b56af83673d8719273a7939d8fb95af9fa902abf7b SHA512 69d2e339a772a41d2ee95487597963a202ab5d3d0786a009adaac36df8ce5c1f56f0377e6b31eea5de5d264315048e2592fe81df0e7c953c9beca13290b0db2c -EBUILD gnome-shell-3.26.2-r4.ebuild 6595 BLAKE2B 24a1f07e5d224a89706bc36a8baaed1ac4e1b92f31a90a667179a5fb57b61875744e1319cf5fa030d10c15ac88291dc5ca66c9245b024fc1c305268bc38a99df SHA512 0ed0eda6f5e52c291de12d75f548efe176e7b09f7f50f88c6a2e59890e0994bdc2df9858cfaca6e7329fb0f73f618bd497006edd449e2573179567527f459780 -EBUILD gnome-shell-3.28.3.ebuild 6695 BLAKE2B cef9fc8d8a4a1cabe27771b0f8f3da35c34ef65e245039a794859a345f843e068507f1d75d3ce1e6f3df10c91de4b50be0f6c66f76be0dda3e4b2cc0056a905c SHA512 df3e4a806fa102c52703061bf897f68007cc1849e651373a231165610ce4fe7f06a3bcb35036109c9c8ca5097ad772b62ab763cf22e7dbe2988659197aad1d1f +DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 61c02e5ae87ab24f30d28865f4444f20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8 SHA512 8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531 +DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877 SHA512 5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6 +EBUILD gnome-shell-3.24.3.ebuild 6629 BLAKE2B 9442d16e86abde07688dfd2a4ac82c88063ed5a0f103b64dc0491a4dafd89cc5b5ef4cf4c25b233749afca00af191f5aa7055e3c255535c2c1eb1842c2bec166 SHA512 059cba2b4b010241c6715579904df48ad58426d2037466b3540165dd78674ef258cec2bc338881c72f4d18eb0f83c69801cc7a056dc03d46f14a9add15f4a24f +EBUILD gnome-shell-3.26.2-r4.ebuild 6615 BLAKE2B 30ea1dc614bc95f373a596c190553bab87ab2e0a491fa7e34ddceb9e831a461e6047c89ef8ef0e82473b26cbc9699d088b9afdd0abdbeda5561e0a3bf4a0f460 SHA512 24c2e0fbe7e904f55a8a089ff6faf4a1b68c9a9fa31379da79a2491fd5eb1e1f8e8161c68b49856d47366b68bfc2de329025abf3d80aed6045e62d7cdff94d0d +EBUILD gnome-shell-3.28.3.ebuild 6715 BLAKE2B f521e2b681eb3e9d9827b0b9677135ccaa61c15e3884fc5903e545351a356747ce627acb20f89958090dd60c5257dced28f408a4a9ec672f66e33667465a7707 SHA512 53eef0b66407b2a7295e3813a2daebf17c34d35ef9db1ee5bc6422a47b3934b1090bc20f1b21e28bbe7cb5ae1205a4b9b5e2ba4cbe0b462e37f98294bcfd6d92 +EBUILD gnome-shell-3.30.2.ebuild 6571 BLAKE2B e1bfece5a9448323b79815a3375e9ee4ab16d04130f4598f00cdada8ff6fde44837c44e7a193b2ed57d24c76182f75a0d666d6923b36fb72d081b9abe8eb33ee SHA512 b298210f004ebc8e1feafcd7daa56ba0c794ad460e80d1e3322ece0305a88407fe689aa81617e0fc11b1b4d221caa63e1de1fdeced56874531455b2df47ec16a MISC metadata.xml 1279 BLAKE2B 4c69dd1979038f6231f4877e5070b7b833377197e5030c97dff5d8d2e36d2dce1510254b97b4d7b9255a64c556d9795c515aea9b21091de3bde6b8499346df9b SHA512 caa5a580e349cfab441bac8f648866618b76528e5bcc0baa6cbe32853bb56786aa0b7cc309ab6515d6a298b5bcdf45ea0360a26c28e64543afb558479ff219c3 diff --git a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild index d163df856f89..4639ca5f8726 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.24.3.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 @@ -27,6 +27,7 @@ COMMON_DEPEND=" >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.47.0 + <dev-libs/gjs-1.53 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild index 6ebaf3f99c33..af185e103a1c 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,6 +29,7 @@ COMMON_DEPEND=" >=dev-libs/glib-2.53.0:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.47.0 + <dev-libs/gjs-1.53 >=x11-libs/gtk+-3.15.0:3[introspection] nsplugin? ( >=dev-libs/json-glib-0.13.2 ) >=x11-wm/mutter-3.24.0:0/1[introspection] diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild index a6c40a3bf613..9931a77b08bc 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild @@ -29,6 +29,7 @@ COMMON_DEPEND=" >=dev-libs/glib-2.56.0:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.47.0 + <dev-libs/gjs-1.53 >=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] @@ -118,7 +119,7 @@ DEPEND="${COMMON_DEPEND} " PATCHES=( - # Patches from gnome-3-26 branch on top of 3.26.2 + # Patches from gnome-3-28 branch on top of 3.28.3 "${WORKDIR}"/patches/ # Change favorites defaults, bug #479918 "${FILESDIR}"/${PV}-defaults.patch diff --git a/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild new file mode 100644 index 000000000000..49ce9e97ba32 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild @@ -0,0 +1,189 @@ +# 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 <X11/extensions/Xfixes.h> +# 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.57.2: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.30.1:0/3[introspection] + >=sys-auth/polkit-0.100[introspection] + >=gnome-base/gsettings-desktop-schemas-3.27.90 + >=x11-libs/startup-notification-0.11 + >=app-i18n/ibus-1.5.2 + bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) + >=media-libs/gstreamer-0.11.92:1.0 + networkmanager? ( + >=net-misc/networkmanager-1.10.4:=[introspection] + >=app-crypt/libsecret-0.18 + dev-libs/dbus-glib ) + systemd? ( >=sys-apps/systemd-31 ) + elogind? ( >=sys-auth/elogind-237 ) + + >=app-accessibility/at-spi2-atk-2.5.3 + media-libs/libcanberra[gtk3] + x11-libs/gdk-pixbuf:2[introspection] + dev-libs/libxml2:2 + x11-libs/libX11 + + >=media-sound/pulseaudio-2[glib] + >=dev-libs/atk-2[introspection] + dev-libs/libical:= + >=x11-libs/libXfixes-5.0 + + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + media-libs/mesa +" +# 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.30.2 + "${WORKDIR}"/patches/ + # Change favorites defaults, bug #479918 + "${FILESDIR}"/3.28.3-defaults.patch + # Fix automagic gnome-bluetooth dep, bug #398145 + "${FILESDIR}"/3.28.3-optional-bluetooth.patch +) + +src_prepare() { + 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/Manifest b/gnome-base/gnome/Manifest index 65ffc56c02e4..fb20c6f4ec50 100644 --- a/gnome-base/gnome/Manifest +++ b/gnome-base/gnome/Manifest @@ -1,4 +1,6 @@ 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.28.2.ebuild b/gnome-base/gnome/gnome-3.28.2.ebuild new file mode 100644 index 000000000000..b312b0b02f4a --- /dev/null +++ b/gnome-base/gnome/gnome-3.28.2.ebuild @@ -0,0 +1,51 @@ +# 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/gnome/gnome-3.30.2.ebuild b/gnome-base/gnome/gnome-3.30.2.ebuild new file mode 100644 index 000000000000..d0afdfbf3da2 --- /dev/null +++ b/gnome-base/gnome/gnome-3.30.2.ebuild @@ -0,0 +1,51 @@ +# 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.30.1 + + >=x11-wm/mutter-${PV} + >=gnome-base/gnome-shell-${PV}[bluetooth?] + >=media-fonts/cantarell-0.111 + + >=x11-themes/gnome-backgrounds-3.30.0 + x11-themes/sound-theme-freedesktop + + accessibility? ( + >=app-accessibility/at-spi2-atk-2.30.0 + >=app-accessibility/at-spi2-core-2.30.0 + >=app-accessibility/orca-3.30.1 + >=gnome-extra/mousetweaks-3.12.0 ) + classic? ( >=gnome-extra/gnome-shell-extensions-3.30.1 ) + extras? ( >=gnome-base/gnome-extra-apps-${PV} ) +" + +DEPEND="" + +PDEPEND=">=gnome-base/gvfs-1.38.1[udisks]" + +pkg_postinst() { + # Remember people where to find our project information + elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" + elog "for information about the project and documentation." +} diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 447c0ef451c2..ef4225ae0d8a 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -3,10 +3,9 @@ DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa 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.1-patchset.tar.xz 37140 BLAKE2B 72174e97097c7ea05569a6a4f0bc29490572bc0215b12dd83014fb742e777b786d22a7da3a0a8404635c83e3094e8f187f568b6cb480ee5b14f0cdd9e6f10d50 SHA512 b14544a0be8d534d32b633cace8dc458dfddcfa2ff6e2076bfd486eda0c5fe3bb9443ddb7b2083a776eab76e93f2266c9d35b45ac0a70a0d31878b284fb3bcd2 -DIST gvfs-1.38.1.tar.xz 1203224 BLAKE2B 42c239163f5040e30c66598afa91ba995267c746792357b93077a84da760ec1242ce7091cedb991712ccf056e8950e92108142c5c4d1b18976f6756bb6100362 SHA512 69b186c9dd2129636109dd46e7b7c34767400266af53fcd701bd1332886ae0be4bb4a72d4543873e7db0dda19f325b384219dff935f749b62cec0a6b36aa3de7 +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.1.ebuild 3798 BLAKE2B 130172e12ce63c716a3d5f8a1e5a23be73c9c3890e8d6cc18b07292ed1f4d24c6d2d3bcff0a17bf921b97d916402b8ab564e7672bc694cc0278eab88762159f8 SHA512 058ad52b93e3cf1ee35a46d37ffef66b796ce8372f0d9ac1d3e971d3a5f54e3bb1daf61013e1bbaa2bf9b68b5a5a48701912cf097cb8eecddbdbf137515ad760 +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.38.1.ebuild b/gnome-base/gvfs/gvfs-1.38.2.ebuild index b89255e7cabd..00fedf5528f5 100644 --- a/gnome-base/gvfs/gvfs-1.38.1.ebuild +++ b/gnome-base/gvfs/gvfs-1.38.2.ebuild @@ -7,7 +7,6 @@ inherit gnome.org gnome2-utils meson systemd xdg 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" @@ -70,10 +69,6 @@ DEPEND="${RDEPEND} dev-util/gdbus-codegen " -PATCHES=( - "${WORKDIR}"/patches/ # origin/gnome-3-30@20190301 -) - src_configure() { local enable_logind="false" if use systemd || use elogind; then diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 16b1d1f9750d..cb6c97f14bba 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,8 +1,18 @@ AUX 3.26.4-file-view-crash-fix.patch 3031 BLAKE2B 83214c9c55d3e3d135c3c038bfe432ff353a512a94a880ee9d449133b0423414fc9a7f22b3e1f14633789439d0e666ab6983363209279fda379530d3e1003de7 SHA512 85f696485f0f2b8171bcaeee6a19fbf1b9cb507f9ec8a69c7b08614fa98514fad7f3cb1857750d2d2300ca42b017434720d85918daaf37e3cbae496b65924aba AUX 3.26.4-optional-introspection.patch 1860 BLAKE2B c2792432024dce322b1fb6fe3411f8ae8e86b000ba31885c94570620bffc8c39bf1e51be649d2a24469a1ae57c6507ec63efe0645e506483b81b76ff7b40148a SHA512 9ee5736e9d999c1cf8f103eaffd2f6395336d23187e59d08ce7d949ee277cdaa297aef9f071d4af22c1adb2f9daed9c7920d5ccc87681df9b0ad84dcec624814 AUX 3.26.4-optional-tracker.patch 8897 BLAKE2B 7bedd3d4837d6289cfb204f14245d3a92aabe99a8a7e6fe8fa09a02e25214865f71a594d26f5cceaab375d55658902bd498caa1eafe4aee27f39222f06bb7da5 SHA512 169217ba039a23a98ac16f59ad04a9a135b3af399f668bc413df740de02827a3120c49c67f1e8964a5587bb233030995c63b2bf61003c5972e7a83b2bd61a25c +AUX 3.28.1-docs-build.patch 1049 BLAKE2B d79a2a9a91ae549386a5c484692c690301af7e181351ab4fd530947d4663d15f0cbfff1ee7f4ecdce390cdb1eb31db03d6df821ffffadb3e570f002433538c7a SHA512 069d669be97913e9177b456e9cfa67f0498ec3905a3e884f9373b375eb82b40ed43c9ca4d483d2eabd1ca91127d43dc2981234cbaac08f67e7fa124d8827a68b +AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459 +AUX 3.30.5-seccomp-sparc32.patch 675 BLAKE2B e8d9d9c4299cd700ea02656bf66f1ddec1801901161f026f78b88cc393793392c0e0af97a8de47a851545b5cd6305160233b952c1a0ba86ccc1d1f7dadf1dea0 SHA512 fe91a78d17a9142b8964d6d52778b32ac0b88e85dc0b1b05b838a1d90396f7c73927f9dce63ebe8585f8d1cdf94ebdc6a123b58196dc1248ce5aa6dce5d73990 +AUX 3.30.5-thumbnailer-updates.patch 3978 BLAKE2B 0c7c7147d5bf947617f32d6f1ec1949941f5f9cf77dd351ddeb3c41871e247eac10855b3075f81f4d3dfe0f692f76e25590d5db5d4823ec4d264b6a65ee3177e SHA512 2a14f9256c3ff5d2744038ede78fafdd27b033ee6576885faab35aff77b60c69035e3aa1400c183f9f0497b0bbb8890e3be6dfae5fa3a77df180601c185939d7 +AUX 3.30.5-thumbnailer-updates2.patch 1841 BLAKE2B 261cabfc7ee8334bbf00b469a601ba61f2ff78f3a4ed6fb860b7854c4198963769df5673cb5cdf2753fbfeeb540aa31f7fd29deda0431075747860068b468dff SHA512 44011606a10bb6d8f45cbc2b20b802ea347d930c44959de33bc0f395dd050e01884ec1b6a85b899b1b30aa6fde07fff8d6ff4dcb4d1a7fe86d27a9721668e8ab DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07 DIST nautilus-3.26.4.tar.xz 3267652 BLAKE2B 56986b8d87afc0ea7ce6f1f56ae06c7cfb05d060414aad428145a6c2cb631b9d4ebbeaefabb0f0ceeb5f930ae94737f8dfcabb300554a59c2b7d5a53d1ee3cd1 SHA512 2a50a2a9ae6ffbe4b706d46fb47e5f54f42e645189b3548d1904c3ddf882ef4a94819740c6821fe50c662a9013ab43bb9b7b3dbdfc779ecc82f16170b4867973 +DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48 +DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13 +DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf EBUILD nautilus-3.24.2.1-r2.ebuild 2834 BLAKE2B 49e34f2586cdbdd09880865fe0118665e00b0438c76f31109a5901f0a8ea8f41272facbc3e1384cd313e261f361df5248a5f2844269eb1f6db6e1c1e86bd29f7 SHA512 c082f2a82cd948edfe20c2cb31b868eeb01ca9ac8e96226abaed3d22b52f58f877b27f031127c285fcdc59a78cf65f33b0c6e815d2b72792dc7ea1f256422d44 EBUILD nautilus-3.26.4-r2.ebuild 2780 BLAKE2B 1cac10c09ebc7039477779bc1e94b5f0de938772d6b0f45a9dd86cd01c6694bc7619ed136ae19eba7f828000a46c434c881c70c469c8d38d3a99fe629be44a94 SHA512 d87e1f98052e47ce4ac107dcec984be45e655c5944043c54444bebfaf98fb2a6495a5b81e6a57652f86e5b64c279ebb9f7a0e7faa01a29fc827ba58afad8b409 +EBUILD nautilus-3.28.1.ebuild 2656 BLAKE2B cd1f74358d8e23af670c498ad510c27e261423ef560b59559be4ceb79745b0db16f61da3580edae7998ca88eb7983401ba656c0a105aca362770f6ad2a08c206 SHA512 6ab0cbc44f446eb9e82d9046aaaee77f1bb34768c2583ed5143fd17f12af7d2f46027f08732f9483fce151091d6cf167e13879e301360056ded4a2326bb9c4d5 +EBUILD nautilus-3.30.5.ebuild 2776 BLAKE2B a8a8b73f4c6151b09cb03a9a0be1064b3388f087967d747a2ef7cd4a2f3da0b5ccdc97212daa77444573959fc79ad8c913875f079e4b30b123461a37c51c5a95 SHA512 67ad73530b9bcc01da31c92991ad8f1308e25332d6a1174f37566b806e1f6ccee1a7fe934cbc93a088b47af00251098859803a7e972fa06ff8fe8ab64e7f0445 MISC metadata.xml 795 BLAKE2B 5932c49c4317d89bb5bbc9754909397129147647a203cb5ee6e2d984850fbe87fa567f7e77b8b8afb329b4ea8d1c29413d1e51afa24d8f9ad8ada9efec1e21e5 SHA512 22363d80a08d2422ca7e454caf87dceb0ec7cfa6461467f3857c28e53cab914466c85a9fbabfa7d811009cbd3be2243cfb07462f49c434f345bf4c1999de1668 diff --git a/gnome-base/nautilus/files/3.28.1-docs-build.patch b/gnome-base/nautilus/files/3.28.1-docs-build.patch new file mode 100644 index 000000000000..a2cb07aa23e3 --- /dev/null +++ b/gnome-base/nautilus/files/3.28.1-docs-build.patch @@ -0,0 +1,42 @@ +From eaf8435005e2637ce76690c71f729e6b3685d973 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Tue, 5 Mar 2019 19:22:58 +0200 +Subject: [PATCH] build: Always install man page + +It's already generated and shouldn't be thrown in the same pot as +full gtk-doc generation. It should be either a separate `man` option, +or just always installed. +--- + docs/meson.build | 4 +++- + meson.build | 4 +--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/docs/meson.build b/docs/meson.build +index b039cb631..2b1800be6 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -1,3 +1,5 @@ + install_man('nautilus.1') + +-subdir('reference') ++if get_option('docs') ++ subdir('reference') ++endif +diff --git a/meson.build b/meson.build +index 4b64239ac..88fe73237 100644 +--- a/meson.build ++++ b/meson.build +@@ -152,9 +152,7 @@ if get_option('tests') != 'none' + endif + subdir('data') + subdir('po') +-if get_option('docs') +- subdir('docs') +-endif ++subdir('docs') + if get_option('extensions') + subdir('extensions') + endif +-- +2.17.0 + diff --git a/gnome-base/nautilus/files/3.30.5-docs-build.patch b/gnome-base/nautilus/files/3.30.5-docs-build.patch new file mode 100644 index 000000000000..65ac29109e8f --- /dev/null +++ b/gnome-base/nautilus/files/3.30.5-docs-build.patch @@ -0,0 +1,42 @@ +From a62478c8e55bc6b1cd685f0c8c2094e1ed244c69 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Mon, 11 Mar 2019 20:52:53 +0200 +Subject: [PATCH] build: Always install man page + +It's already generated and shouldn't be thrown in the same pot as +full gtk-doc generation. It should be either a separate `man` option, +or just always installed. +--- + docs/meson.build | 4 +++- + meson.build | 4 +--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/docs/meson.build b/docs/meson.build +index b039cb631..2b1800be6 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -1,3 +1,5 @@ + install_man('nautilus.1') + +-subdir('reference') ++if get_option('docs') ++ subdir('reference') ++endif +diff --git a/meson.build b/meson.build +index 996360a62..50479f5f0 100644 +--- a/meson.build ++++ b/meson.build +@@ -222,9 +222,7 @@ subdirs = [ + # Conditional building # + ######################## + +-if get_option('docs') +- subdirs += 'docs' +-endif ++subdirs += 'docs' + if get_option('tests') != 'none' + subdirs += 'test' + endif +-- +2.17.0 + diff --git a/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch b/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch new file mode 100644 index 000000000000..f67695b7f1d0 --- /dev/null +++ b/gnome-base/nautilus/files/3.30.5-seccomp-sparc32.patch @@ -0,0 +1,27 @@ +From 3b0fd7dd26fa5af0b310650b2974d800ace80802 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 15 Feb 2019 21:34:34 +0200 +Subject: [PATCH 2/2] meson.build: Add 32-bit sparc to seccomp unsupported list + +32-bit sparc doesn't support seccomp either. + +(cherry picked from commit 44b49e6ca02add9592abac03a8578b9eea1a5088) +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 50479f5f0..91915b31a 100644 +--- a/meson.build ++++ b/meson.build +@@ -72,6 +72,7 @@ unsupported_cpus = [ + 'parisc', + 'parisc64', + 'sh4', ++ 'sparc', + 'sparc64', + ] + system_supports_seccomp = host_system == 'linux' +-- +2.17.0 + diff --git a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch new file mode 100644 index 000000000000..84d0bfc1d5af --- /dev/null +++ b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates.patch @@ -0,0 +1,113 @@ +From 2e36d4bacc3cffebe62161adc375bb9ec64099f5 Mon Sep 17 00:00:00 2001 +From: Timothy OBrien <obrien.timothy.a@gmail.com> +Date: Fri, 18 Jan 2019 19:42:46 +1100 +Subject: [PATCH 1/2] gnome-desktop: update to latest version of upstream + thumbnail code + +The thumbnail code in gnome-desktop had recent bug fixes that needed to be carried across to the Nautilus implementation. Issues for the three related upstream fixes can be found at: https://gitlab.gnome.org/GNOME/gnome-desktop/issues/4 | https://gitlab.gnome.org/GNOME/gnome-desktop/issues/89 | https://gitlab.gnome.org/GNOME/gnome-desktop/issues/87 + +This patch includes the latest thumbnail code from the gnome-desktop repository to include the fixes. + +Fixes #836 + +(cherry picked from commit e88b2dc8783833c4263ad5d84567a67dbc7bc6de) +--- + .../gnome-desktop-thumbnail-script.c | 54 +++++++++++++++++-- + src/gnome-desktop/gnome-desktop-thumbnail.c | 4 +- + 2 files changed, 52 insertions(+), 6 deletions(-) + +diff --git a/src/gnome-desktop/gnome-desktop-thumbnail-script.c b/src/gnome-desktop/gnome-desktop-thumbnail-script.c +index 14e2fed3a..525766388 100644 +--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c ++++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c +@@ -506,22 +506,68 @@ setup_seccomp (GPtrArray *argv_array, + #endif + + #ifdef HAVE_BWRAP ++static gboolean ++path_is_usrmerged (const char *dir) ++{ ++ /* does /dir point to /usr/dir? */ ++ g_autofree char *target = NULL; ++ GStatBuf stat_buf_src, stat_buf_target; ++ ++ if (g_stat (dir, &stat_buf_src) < 0) ++ return FALSE; ++ ++ target = g_strdup_printf ("/usr/%s", dir); ++ ++ if (g_stat (target, &stat_buf_target) < 0) ++ return FALSE; ++ ++ return (stat_buf_src.st_dev == stat_buf_target.st_dev) && ++ (stat_buf_src.st_ino == stat_buf_target.st_ino); ++} ++ + static gboolean + add_bwrap (GPtrArray *array, + ScriptExec *script) + { ++ const char * const usrmerged_dirs[] = { "bin", "lib64", "lib", "sbin" }; ++ int i; ++ + g_return_val_if_fail (script->outdir != NULL, FALSE); + g_return_val_if_fail (script->s_infile != NULL, FALSE); + + add_args (array, + "bwrap", + "--ro-bind", "/usr", "/usr", +- "--ro-bind", "/lib", "/lib", +- "--ro-bind", "/lib64", "/lib64", ++ "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", ++ NULL); ++ ++ /* These directories might be symlinks into /usr/... */ ++ for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++) ++ { ++ g_autofree char *absolute_dir = g_strdup_printf ("/%s", usrmerged_dirs[i]); ++ ++ if (!g_file_test (absolute_dir, G_FILE_TEST_EXISTS)) ++ continue; ++ ++ if (path_is_usrmerged (absolute_dir)) ++ { ++ g_autofree char *symlink_target = g_strdup_printf ("/usr/%s", absolute_dir); ++ ++ add_args (array, ++ "--symlink", symlink_target, absolute_dir, ++ NULL); ++ } ++ else ++ { ++ add_args (array, ++ "--ro-bind", absolute_dir, absolute_dir, ++ NULL); ++ } ++ } ++ ++ add_args (array, + "--proc", "/proc", + "--dev", "/dev", +- "--symlink", "usr/bin", "/bin", +- "--symlink", "usr/sbin", "/sbin", + "--chdir", "/", + "--setenv", "GIO_USE_VFS", "local", + "--unshare-all", +diff --git a/src/gnome-desktop/gnome-desktop-thumbnail.c b/src/gnome-desktop/gnome-desktop-thumbnail.c +index b31bad58d..f48fd461a 100644 +--- a/src/gnome-desktop/gnome-desktop-thumbnail.c ++++ b/src/gnome-desktop/gnome-desktop-thumbnail.c +@@ -967,8 +967,8 @@ get_preview_thumbnail (const char *uri, + if (file_info == NULL) + return NULL; + +- object = g_file_info_get_attribute_object (file_info, +- G_FILE_ATTRIBUTE_PREVIEW_ICON); ++ object = g_object_ref (g_file_info_get_attribute_object (file_info, ++ G_FILE_ATTRIBUTE_PREVIEW_ICON)); + g_object_unref (file_info); + + if (!object) +-- +2.17.0 + diff --git a/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch new file mode 100644 index 000000000000..884deb420911 --- /dev/null +++ b/gnome-base/nautilus/files/3.30.5-thumbnailer-updates2.patch @@ -0,0 +1,46 @@ +From 87aa2520989bafbd861a03a32d6fdb0d2620faf5 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Mon, 11 Mar 2019 23:23:11 +0200 +Subject: [PATCH] Sync gnome-desktop code + +Brings in fontconfig cache bind mount and a small memory fix; cache path hardcoded to Gentoo for now +--- + src/gnome-desktop/gnome-desktop-thumbnail-script.c | 4 ++++ + src/gnome-desktop/gnome-desktop-thumbnail.c | 6 ++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/gnome-desktop/gnome-desktop-thumbnail-script.c b/src/gnome-desktop/gnome-desktop-thumbnail-script.c +index 525766388..0331cb3c7 100644 +--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c ++++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c +@@ -565,6 +565,10 @@ add_bwrap (GPtrArray *array, + } + } + ++ /* fontconfig cache if necessary */ ++ if (!g_str_has_prefix ("/var/cache/fontconfig", "/usr/")) ++ add_args (array, "--ro-bind-try", "/var/cache/fontconfig", "/var/cache/fontconfig", NULL); ++ + add_args (array, + "--proc", "/proc", + "--dev", "/dev", +diff --git a/src/gnome-desktop/gnome-desktop-thumbnail.c b/src/gnome-desktop/gnome-desktop-thumbnail.c +index f48fd461a..566fbeb84 100644 +--- a/src/gnome-desktop/gnome-desktop-thumbnail.c ++++ b/src/gnome-desktop/gnome-desktop-thumbnail.c +@@ -967,8 +967,10 @@ get_preview_thumbnail (const char *uri, + if (file_info == NULL) + return NULL; + +- object = g_object_ref (g_file_info_get_attribute_object (file_info, +- G_FILE_ATTRIBUTE_PREVIEW_ICON)); ++ object = g_file_info_get_attribute_object (file_info, ++ G_FILE_ATTRIBUTE_PREVIEW_ICON); ++ if (object) ++ g_object_ref (object); + g_object_unref (file_info); + + if (!object) +-- +2.17.0 + diff --git a/gnome-base/nautilus/nautilus-3.28.1.ebuild b/gnome-base/nautilus/nautilus-3.28.1.ebuild new file mode 100644 index 000000000000..40dd98c4c84d --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.28.1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg + +DESCRIPTION="Default file manager for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" + +LICENSE="GPL-3+ LGPL-2.1+" +SLOT="0" +IUSE="gnome gtk-doc +introspection packagekit +previewer selinux sendto" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +COMMON_DEPEND=" + >=dev-libs/glib-2.55.1:2 + >=media-libs/gexiv2-0.10.0 + >=app-arch/gnome-autoar-0.2.1 + >=gnome-base/gnome-desktop-3.0.0:3= + >=x11-libs/pango-1.28.3 + >=x11-libs/gtk+-3.22.26:3[X,introspection?] + selinux? ( >=sys-libs/libselinux-2.0 ) + >=app-misc/tracker-2.0:= + x11-libs/libX11 + >=dev-libs/libxml2-2.7.8:2 + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${COMMON_DEPEND} + >=dev-util/gdbus-codegen-2.51.2 + dev-util/glib-utils + gtk-doc? ( + >=dev-util/gtk-doc-1.10 + app-text/docbook-xml-dtd:4.1.2 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + packagekit? ( app-admin/packagekit-base ) + sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) +" + +PDEPEND=" + gnome? ( x11-themes/adwaita-icon-theme ) + previewer? ( >=gnome-extra/sushi-0.1.9 ) + sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) + >=gnome-base/gvfs-1.14[gtk(+)] +" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34 + +PATCHES=( + "${WORKDIR}"/patches # gnome-3-28 + optional introspection + "${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc +) + +src_prepare() { + if use previewer; then + DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. + To activate the previewer, select a file and press space; to + close the previewer, press space again." + fi + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc docs) + $(meson_use introspection) + -Dprofiling=false + -Dextensions=true # image file properties, sendto support + $(meson_use packagekit) + $(meson_use selinux) + -Dtests=$(usex test all none) + -Dprofile=default + ) + meson_src_configure +} + +src_install() { + use previewer && readme.gentoo_create_doc + meson_src_install +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if use previewer; then + readme.gentoo_print_elog + else + elog "To preview media files, emerge nautilus with USE=previewer" + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/nautilus/nautilus-3.30.5.ebuild b/gnome-base/nautilus/nautilus-3.30.5.ebuild new file mode 100644 index 000000000000..dfd5201b5fc3 --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.30.5.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg + +DESCRIPTION="Default file manager for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" + +LICENSE="GPL-3+ LGPL-2.1+" +SLOT="0" +IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +COMMON_DEPEND=" + >=dev-libs/glib-2.55.1:2 + >=media-libs/gexiv2-0.10.0 + >=app-arch/gnome-autoar-0.2.1 + gnome-base/gsettings-desktop-schemas + >=x11-libs/gtk+-3.22.27:3[X,introspection?] + seccomp? ( sys-libs/libseccomp ) + >=x11-libs/pango-1.28.3 + selinux? ( >=sys-libs/libselinux-2.0 ) + >=app-misc/tracker-2.0:= + x11-libs/libX11 + >=dev-libs/libxml2-2.7.8:2 + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${COMMON_DEPEND} + >=dev-util/gdbus-codegen-2.51.2 + dev-util/glib-utils + gtk-doc? ( + >=dev-util/gtk-doc-1.10 + app-text/docbook-xml-dtd:4.1.2 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + packagekit? ( app-admin/packagekit-base ) + seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) + sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) +" + +PDEPEND=" + gnome? ( x11-themes/adwaita-icon-theme ) + previewer? ( >=gnome-extra/sushi-0.1.9 ) + sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) + >=gnome-base/gvfs-1.14[gtk(+)] +" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34 + +PATCHES=( + "${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc + "${FILESDIR}"/${PV}-thumbnailer-updates{,2}.patch # syncs with gnome-desktop; fixes the ld.so.cache for us + "${FILESDIR}"/${PV}-seccomp-sparc32.patch # 32-bit sparc doesn't have seccomp either +) + +src_prepare() { + if use previewer; then + DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. + To activate the previewer, select a file and press space; to + close the previewer, press space again." + fi + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc docs) + -Dextensions=true # image file properties, sendto support + $(meson_use introspection) + $(meson_use packagekit) + $(meson_use selinux) + -Dprofiling=false + -Dtests=$(usex test all none) + ) + meson_src_configure +} + +src_install() { + use previewer && readme.gentoo_create_doc + meson_src_install +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if use previewer; then + readme.gentoo_print_elog + else + elog "To preview media files, emerge nautilus with USE=previewer" + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} |