diff options
Diffstat (limited to 'gnome-base')
72 files changed, 3434 insertions, 323 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz Binary files differindex 90c3cd442f5d..a3f58410d66f 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 01d4d223786e..c167d575807b 100644 --- a/gnome-base/dconf-editor/Manifest +++ b/gnome-base/dconf-editor/Manifest @@ -1,3 +1,5 @@ DIST dconf-editor-3.34.4.tar.xz 568388 BLAKE2B 9b67ab82e01b551b898e7fd19a8990bf7f2acbf4dd9f80ad58226f82743fe96e856c0a0647be854141f25a3339d062da8eaba3c6b2fcdc6fe99718d25ce6b6b7 SHA512 8ac9be21838d66b57bcf8bcf14b7835398ebe2478bd851f8299c43427ccc7953f545dc0fa8f10dc2c5e837b9dcec4f503bc25ffd8c633066f5326873e3c4ef3f +DIST dconf-editor-3.36.4.tar.xz 583084 BLAKE2B 7d7f5164a4917d13372a2bcf7f9fe7b82d630693601bba33da1c4f3afffa58e4589ff90c3e5ca3039351a681eac6584b335171f4dce9d0bfedaed52cc25d505c SHA512 a24fa44830fb0e83834cf912267de6597c1d6bf02e063af4255409d3c9a135fae409116d91751d00ee8d2319e7130606f007af76d3ec9f1380cda98ab2329eff EBUILD dconf-editor-3.34.4.ebuild 813 BLAKE2B e65391c443fecf58357d0a5e4af977e1dc6f62112bb19304613a6c34f41277962c1141053dfbb2fb5f9f0911e119c1238a1a0d8249763164f058e5334de161e9 SHA512 ac96d459b704a45e856a9a1cab563a00996079cf004f197b4b5aad65d3e64f1587918844ea87a8f0642322d8566838b686eab6af309aabf84160ba313be96a22 +EBUILD dconf-editor-3.36.4.ebuild 815 BLAKE2B d1cca311a344ba79f7a4f74a65e01ddc31fb5d6116e2d30459dd42d702b3fc769aa77f94f34fccf06d8fc18c52994b662e6e5d2472066acd9e7308456c00c972 SHA512 828b65a4d05469af3b279638fe0d0b1d48b8d4eecb45e311a69cb5fd5f795255a432349d7f0e8d009087888cf44ad30224f1215b7356f316ea19a4cb39226ee7 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/dconf-editor/dconf-editor-3.36.4.ebuild b/gnome-base/dconf-editor/dconf-editor-3.36.4.ebuild new file mode 100644 index 000000000000..21fa99568f71 --- /dev/null +++ b/gnome-base/dconf-editor/dconf-editor-3.36.4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" + +RDEPEND=" + >=gnome-base/dconf-0.26.1 + >=dev-libs/glib-2.55.1:2 + >=x11-libs/gtk+-3.22.27:3 +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(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_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest index 2621f3c8a4ba..88d4e129b37b 100644 --- a/gnome-base/dconf/Manifest +++ b/gnome-base/dconf/Manifest @@ -1,8 +1,8 @@ AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a08f4977c856a94321b616e5135b3618477a44812a7429148018c915d716f35c6296e3c72c247970adedc9331af7bfdc6 SHA512 a4b9a1c6b6f16a4f5ea7a250d0a2949c1906813cefc985706575865abc03dc715f6d283887b081bc906a7a439fff0ef4fac57b3de3a4ea40ba2dc19e51db4664 -DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0 DIST dconf-0.34.0.tar.xz 112876 BLAKE2B 6890cd82a3ba81eac8c72dda93ebf1b82f3002b735bf2e059ba07a2f0f3817978a9e4f5dd37a9efab728fc2a4e20c34c519f9eeb3915d705ff8a3c4a65f9ab41 SHA512 8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 -EBUILD dconf-0.32.0-r2.ebuild 2190 BLAKE2B 0986b0dd27d8b5ba3e52e294fa9e7e790ce808b3596f024d62112e89270c55bf6dc22585115cd3d58a9d4459a3cd006c1cc38371100b866d92771733d5d89bc7 SHA512 3d089f03f7cff19d6bd49fefbac7238f23852dd5286fe41056df9df66e600b8aa0808572721fc92eab2e9152187634beba9bfbb91bbdcad5f5d3e2368e495754 -EBUILD dconf-0.34.0.ebuild 2193 BLAKE2B 95d0cb6215cf5dc6dd8191255f6eccca73a132b8ac7f3d7e8cf1ce47dd9fcbc2b73b66fa07589ab3eb64f4db884b2e525b507bfea049a52ff8af226a7231ecbc SHA512 f09632debd5baed6af367b42d5cc935ba3c49e63dbd5081a0abe4b1caccd22f202acffd13f3bbe8fae7cfb4e1c95e67f616eeff34d138c4a227fc463213ad608 +DIST dconf-0.36.0.tar.xz 114828 BLAKE2B 033cb2e095d9dac72bd07c5fa8280a3e1012aac6c1b0657d5455c2a519617be9112acca702ec4078554a814f36d12ee8e25201cc5b8aed2d33a32ef14e2f6fa5 SHA512 fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d +EBUILD dconf-0.34.0.ebuild 2192 BLAKE2B 74e61c5af928ef2effa2d23593105fa50e0487b3d842b39a66c210a1b06b194d34b95d03cfa536764971b29e5cc139776641f77accb85f8f3be5ccad478c59a1 SHA512 d474a1b2ec9f6d30579c853bdf9a7e53ee19913553a4c0d62adf586de5633552966e9567439f2769f7c671b87286c5eef613241d64d0d4caff624344b19d9902 +EBUILD dconf-0.36.0.ebuild 2105 BLAKE2B 16528c7e2df5b0ff7f8c85e55292acbf08669a71f63100eb8a49234b978cd2d62a1cff62f0feae9659e80625be2c2e6d0885edefa1fa7b00a12c34566f310ec8 SHA512 a1b8a9e92c24c790c66eef0e35c29136c71b0f073cece569519714aae3f32b5f96105baaa3f19a2d226423fb02bf7c5f0f5fbb22781acb1692211d1f55a8cea3 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/dconf/dconf-0.34.0.ebuild b/gnome-base/dconf/dconf-0.34.0.ebuild index 3840c821289b..f8c053be7442 100644 --- a/gnome-base/dconf/dconf-0.34.0.ebuild +++ b/gnome-base/dconf/dconf-0.34.0.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux" IUSE="gtk-doc" RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass diff --git a/gnome-base/dconf/dconf-0.32.0-r2.ebuild b/gnome-base/dconf/dconf-0.36.0.ebuild index 6d8ce55d9a8d..37e1aae85828 100644 --- a/gnome-base/dconf/dconf-0.32.0-r2.ebuild +++ b/gnome-base/dconf/dconf-0.36.0.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux" IUSE="gtk-doc" RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass @@ -30,8 +30,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/0.30.1-bash-completion-dir.patch - "${FILESDIR}"/${PV}-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep - "${FILESDIR}"/${PV}-meson-0.52-compat.patch # https://gitlab.gnome.org/GNOME/dconf/issues/59 + "${FILESDIR}"/0.32.0-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep ) src_configure() { diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest index 449fa89b6e80..7a7bae1af070 100644 --- a/gnome-base/gconf/Manifest +++ b/gnome-base/gconf/Manifest @@ -2,7 +2,9 @@ AUX gconf-2.24.0-no-gconfd.patch 787 BLAKE2B d37a7b8c4833ba32406dea408e6c1ab6568 AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 BLAKE2B 004abc644ba4ef6f839ba6179152d2de7d3b709aff8aca37609c1da5d2fa6fb20c54faad0895d5bcb972c8826a58743c01a87ccf54c450fe1734f81219a9c126 SHA512 c0576004aa8c8b64750037183a5d3df5b4d8ba520c83f33a906a8549139e2167d08c1bcc56cbdfe202bb078a703bd561680af63588f7ee4eb42ad6077182a3fa AUX gconf-3.2.6-gsettings-data-convert-paths.patch 1370 BLAKE2B 9fdb3c665c8515cace2325479735fec4b024adea8f2ab1fb89e76ef594eeebda897a3d3f52c8e7c48a21d03e2097211d90ed45887c6542ca6cc93a22ae8e6a15 SHA512 f4d7cc2261f82f7a28e574ec3b732a56bb3f067048312e318f8d23df93046489fdd5ad39d669cf0d9ada6cc07617524511c537a4f2fd0a37cd03788e84b9803b AUX gconf-3.2.6-mconvert-crasher.patch 1514 BLAKE2B 3e48d07777268faa3a1c98f168d33baded66df06185e8e1c77ae8f66f0c689c5a358018d1d3c060e5a4796c3f692acf346141db87f3cb6784ddabbe461432a69 SHA512 8b6885098b63077610b929c3b958efc04599a1f891a0d7b5f042f2638dbae7b3c67b97e7f4e34c439e55ff8c5df3bcc7c6edc56f11cd6506a4b28c2338c8511b +AUX gconf-3.2.6-python3.patch 6699 BLAKE2B 20e24d3f55ccc3455a62fd72fcb054c6fd33308bda419f21426417dd4f9a79581cc5cd03449bad9063e4e927875ed020a99254609517b3c86ebb1b65f268d3d2 SHA512 def5cd74ec7b9d06dc1ccd05364bfa500f8d9685ea3016f219c53df925b09f68dfaf547277dd0dfb9eed266be4de650875611a09a84bc0db3d0a7b907c7beb73 AUX gconf-3.2.6-spew-console-error.patch 2594 BLAKE2B 6a6f27024289b1c578f6718c184e7604f0f1dc285ea58a8095fac06f5fa38273329c8b2535b4de8c17c8359f09f82aa474fa5ebcef739b0e2dd6e7d6fb7726d7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602 DIST GConf-3.2.6.tar.xz 1559904 BLAKE2B dc71bfc6e334b0a3545b6009fc1a592f3ba6adb1471aacc98aaa1ded9e89676f97415c26a3d17e297a846a7efca7ee695107c136ea28b2431f90dc966a3d64cc SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58 EBUILD gconf-3.2.6-r4.ebuild 3617 BLAKE2B bb8a10f13cd7598daa7418e3f8324a6ba0c2fac9dd9aa292e0a3723bde5ae33aa368013924589fff534e0a15f079a7c2fff43854c17880d20b7d5929fa0c511c SHA512 7a572f25580c947e4d7a7e114c2c1b21b1a937d44e498ffea1ce42c110a5a38ff6aedd373f88ee9e711d9e56f3b4b0d361c2af264c25bd39a65d1fb4aa28652f +EBUILD gconf-3.2.6-r5.ebuild 3841 BLAKE2B da4e07d79a3c644bb41d1c4696cf3b29be12179350303cacf7f92e8878e3d224fc75deb5b366baa93e21c7155a847265a97819aac4de37b0ea589767be506a38 SHA512 3fb906136252cbbcd8fa6d36c6fbe3d2397ecc2fd0b7bfcda2a46b2c169cbc331bcb847909d22cdf9d686afb35c298a62891f898f6c01cb40548a6493eddd875 MISC metadata.xml 430 BLAKE2B e2fce04aae8a1df05cb55972ab86e903186e034c0c48115f29d754f215e0be20a9b204aa2be12ed045b3dfc2010eea78be83252a3b86aa7cbbb8cde9b7433923 SHA512 820c350a185014ad888ba9cb43afb5ae7f21a0000a224d68461abbee4efefcbd972db79d7086b8f7f023de0828fa6f01a32502cbf74439160003fad146d33ca4 diff --git a/gnome-base/gconf/files/gconf-3.2.6-python3.patch b/gnome-base/gconf/files/gconf-3.2.6-python3.patch new file mode 100644 index 000000000000..d1504cc0e235 --- /dev/null +++ b/gnome-base/gconf/files/gconf-3.2.6-python3.patch @@ -0,0 +1,164 @@ +From dbd4f1bc1992c2942538980e76a50c8b8a758d70 Mon Sep 17 00:00:00 2001 +From: Takao Fujiwara <tfujiwar@redhat.com> +Date: Fri, 11 Dec 2015 18:29:49 +0900 +Subject: [PATCH] gsettings-schema-convert: Support python3 + +https://bugzilla.gnome.org/show_bug.cgi?id=759334 +--- + gsettings/gsettings-schema-convert | 43 ++++++++++++++++++++------------------ + 1 file changed, 23 insertions(+), 20 deletions(-) + +diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert +index 913cc83..6ccf8c5 100755 +--- a/gsettings/gsettings-schema-convert ++++ b/gsettings/gsettings-schema-convert +@@ -25,6 +25,9 @@ + # TODO: we don't support migrating a pair from a gconf schema. It has yet to be + # seen in real-world usage, though. + ++from __future__ import print_function ++ ++import codecs + import os + import sys + +@@ -398,7 +401,7 @@ class SimpleSchemaParser: + + def _word_to_token(self, word): + lower = word.lower() +- if lower and lower in self.allowed_tokens.keys(): ++ if lower and lower in list(self.allowed_tokens.keys()): + return lower + raise GSettingsSchemaConvertException('\'%s\' is not a valid token.' % lower) + +@@ -594,7 +597,7 @@ class SimpleSchemaParser: + self.object_stack.append(new_object) + + def parse(self): +- f = open(self.file, 'r') ++ f = codecs.open(self.file, 'r', encoding='utf-8') + lines = [ line[:-1] for line in f.readlines() ] + f.close() + +@@ -603,7 +606,7 @@ class SimpleSchemaParser: + for line in lines: + current_line_nb += 1 + self.parse_line(line) +- except GSettingsSchemaConvertException, e: ++ except GSettingsSchemaConvertException as e: + raise GSettingsSchemaConvertException('%s:%s: %s' % (os.path.basename(self.file), current_line_nb, e)) + + return self.root +@@ -711,7 +714,7 @@ class XMLSchemaParser: + schema = self._parse_schema(schema_node) + + for (child_schema, child_name) in schema._children: +- if parent.has_key(child_schema): ++ if child_schema in parent: + raise GSettingsSchemaConvertException('Child \'%s\' is declared by two different schemas: \'%s\' and \'%s\'.' % (child_schema, parent[child_schema], schema.id)) + parent[child_schema] = schema + +@@ -719,7 +722,7 @@ class XMLSchemaParser: + + # now let's move all schemas where they should leave + for schema in schemas: +- if parent.has_key(schema.id): ++ if schema.id in parent: + parent_schema = parent[schema.id] + + # check that the paths of parent and child are supported by +@@ -1054,31 +1057,31 @@ def main(args): + (options, args) = parser.parse_args() + + if len(args) < 1: +- print >> sys.stderr, 'Need a filename to work on.' ++ print('Need a filename to work on.', file=sys.stderr) + return 1 + elif len(args) > 1: +- print >> sys.stderr, 'Too many arguments.' ++ print('Too many arguments.', file=sys.stderr) + return 1 + + if options.simple and options.xml: +- print >> sys.stderr, 'Too many output formats requested.' ++ print('Too many output formats requested.', file=sys.stderr) + return 1 + + if not options.gconf and options.gettext_domain: +- print >> sys.stderr, 'Default gettext domain can only be specified when converting a gconf schema.' ++ print('Default gettext domain can only be specified when converting a gconf schema.', file=sys.stderr) + return 1 + + if not options.gconf and options.schema_id: +- print >> sys.stderr, 'Default schema ID can only be specified when converting a gconf schema.' ++ print('Default schema ID can only be specified when converting a gconf schema.', file=sys.stderr) + return 1 + + if not options.gconf and options.keep_underscores: +- print >> sys.stderr, 'The --keep-underscores option can only be specified when converting a gconf schema.' ++ print('The --keep-underscores option can only be specified when converting a gconf schema.', file=sys.stderr) + return 1 + + argfile = os.path.expanduser(args[0]) + if not os.path.exists(argfile): +- print >> sys.stderr, '\'%s\' does not exist.' % argfile ++ print('\'%s\' does not exist.' % argfile, file=sys.stderr) + return 1 + + if options.output: +@@ -1095,7 +1098,7 @@ def main(args): + try: + parser = GConfSchemaParser(argfile, options.gettext_domain, options.schema_id, options.keep_underscores) + schema_root = parser.parse() +- except SyntaxError, e: ++ except SyntaxError as e: + raise GSettingsSchemaConvertException('\'%s\' does not look like a valid gconf schema file: %s' % (argfile, e)) + else: + # autodetect if file is XML or not +@@ -1104,7 +1107,7 @@ def main(args): + schema_root = parser.parse() + if not options.simple and not options.xml: + options.simple = True +- except SyntaxError, e: ++ except SyntaxError as e: + parser = SimpleSchemaParser(argfile) + schema_root = parser.parse() + if not options.simple and not options.xml: +@@ -1113,10 +1116,10 @@ def main(args): + if options.xml: + node = schema_root.get_xml_node() + try: +- output = ET.tostring(node, pretty_print = True) ++ output = ET.tostring(node, pretty_print = True, encoding="unicode") + except TypeError: + # pretty_print only works with lxml +- output = ET.tostring(node) ++ output = ET.tostring(node, encoding="unicode") + else: + output = schema_root.get_simple_string() + +@@ -1124,17 +1127,17 @@ def main(args): + sys.stdout.write(output) + else: + try: +- fout = open(options.output, 'w') ++ fout = codecs.open(options.output, 'w', encoding='utf-8') + fout.write(output) + fout.close() +- except GSettingsSchemaConvertException, e: ++ except GSettingsSchemaConvertException as e: + fout.close() + if os.path.exists(options.output): + os.unlink(options.output) + raise e + +- except GSettingsSchemaConvertException, e: +- print >> sys.stderr, '%s' % e ++ except GSettingsSchemaConvertException as e: ++ print('%s' % e, file=sys.stderr) + return 1 + + return 0 +-- +2.4.3 + diff --git a/gnome-base/gconf/gconf-3.2.6-r5.ebuild b/gnome-base/gconf/gconf-3.2.6-r5.ebuild new file mode 100644 index 000000000000..5459cfbdca64 --- /dev/null +++ b/gnome-base/gconf/gconf-3.2.6-r5.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +GNOME_ORG_MODULE="GConf" +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_REQ_USE="xml" + +inherit gnome2 multilib-minimal python-single-r1 + +DESCRIPTION="GNOME configuration system and daemon" +HOMEPAGE="https://projects.gnome.org/gconf/" + +LICENSE="LGPL-2+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" +IUSE="debug +introspection ldap policykit" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=dev-libs/dbus-glib-0.100.2:=[${MULTILIB_USEDEP}] + >=sys-apps/dbus-1.6.18-r1:=[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) + ldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] ) + policykit? ( sys-auth/polkit:= ) +" +DEPEND="${RDEPEND} + dev-libs/libxslt + dev-util/glib-utils + dev-util/gtk-doc-am + >=dev-util/intltool-0.35 + virtual/pkgconfig +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +pkg_setup() { + kill_gconf + python-single-r1_pkg_setup +} + +src_prepare() { + # Do not start gconfd when installing schemas, fix bug #238276, upstream #631983 + eapply "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch" + + # Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985 + eapply "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch" + + # From 'master' + # mconvert: enable recursive scheme lookup and fix a crasher + eapply "${FILESDIR}/${P}-mconvert-crasher.patch" + + # dbus: Don't spew to console when unable to connect to dbus daemon + eapply "${FILESDIR}/${P}-spew-console-error.patch" + + # gsettings-data-convert: Warn (and fix) invalid schema paths + eapply "${FILESDIR}/${P}-gsettings-data-convert-paths.patch" + + # gsettings-data-convert: Migrate from Python 2 to 3. + eapply "${FILESDIR}/${P}-python3.patch" + + gnome2_src_prepare +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --disable-static \ + --enable-gsettings-backend \ + --with-gtk=3.0 \ + --disable-orbit \ + $(use_enable debug) \ + $(multilib_native_use_enable introspection) \ + $(use_with ldap openldap) \ + $(multilib_native_use_enable policykit defaults-service) + + if multilib_is_native_abi; then + ln -s "${S}"/doc/gconf/html doc/gconf/html || die + fi +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + python_fix_shebang "${ED}"/usr/bin/gsettings-schema-convert + + keepdir /etc/gconf/gconf.xml.mandatory + keepdir /etc/gconf/gconf.xml.defaults + # Make sure this directory exists, bug #268070, upstream #572027 + keepdir /etc/gconf/gconf.xml.system + + echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf + echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf + doenvd 50gconf + dodir /root/.gconfd +} + +pkg_preinst() { + kill_gconf + gnome2_pkg_preinst +} + +pkg_postinst() { + kill_gconf + + gnome2_pkg_postinst + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + multilib_foreach_abi multilib_pkg_postinst + + # change the permissions to avoid some gconf bugs + einfo "changing permissions for gconf dirs" + find "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \; + + einfo "changing permissions for gconf files" + find "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \; +} + +pkg_postrm() { + gnome2_pkg_postrm + + multilib_pkg_postrm() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + multilib_foreach_abi multilib_pkg_postrm +} + +kill_gconf() { + # Avoid harmless error message. See bug #523868. + mkdir -p "${HOME}"/.config || die + + # This function will kill all running gconfd-2 that could be causing troubles + if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ] + then + "${EPREFIX}"/usr/bin/gconftool-2 --shutdown + fi + + return 0 +} diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index a2563f0ed3d0..0c09160bb61e 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -7,6 +7,10 @@ AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e4 AUX gdm-CanGraphical-wait.patch 5534 BLAKE2B 3be217b156ab6d486d7df98885934c5d1bedd6219a25a83cba687aa1ed59f6d0f2a16694a47050313e601355696095ccc738ac639f5958d9619db81d34efe068 SHA512 2152e800051473b8fd230c4b325d72229cfe91dce3e90ad6d8ace8e3278483ab05ce683e61c183f7c83e293873f69715740b1eccfdb34d6775140c635c73b5dd AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b DIST gdm-3.34.1.tar.xz 1244960 BLAKE2B c6e53b37baa75f202725b21b58e22cc84d44d241cc3fa10dd466e1a766ce4081bf436e965dcd38f0c009b5145813c95d77c76ca31ef837e8d0251c6d65d06ca9 SHA512 71b71699e8e31643080d2af5dc54381592c0c6a2f7adbb0434a9957c8e59c67a20afaf48dce57139453157572c5bae617134420f36e8da68fbc74e95746d26fb +DIST gdm-3.36.2.tar.xz 1214564 BLAKE2B e456ac171dcd2918d5c93a556741e62c29ce1611c318c2220093b3359649e1cd9d18bdc592e994b0f50f0b99892658f970eba939aeaf281f6f6eb773d4a97944 SHA512 5c02f00ce20a5b7b426043ab26640dd0a54a57bbff7eb2e449195bc3d6e36ad464487424fdc5be72fc542265bff6877317e693f6221c95a987f86c7a5dc6893e +DIST gdm-3.36.3.tar.xz 1218972 BLAKE2B 8e4d3dcd1dc84de276a6426feae206d43cfcbd8c8ffa24325f0dcc1bc2b180d9dbee20849b8e3157d299017ad91b433be54a78eafc7319171806ec6c6348bb1f SHA512 21c3bba0ce5142362e3c86ccb05fc234d9356db295ed63f3c383bd7cc2b7a464bdcec08e472d31a339b5ffbfeaed4db72ebbdeae2e7a71effdeef8c52b53830b DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 EBUILD gdm-3.34.1.ebuild 7687 BLAKE2B 184f7e6088b72f974c07f82ea049a6d8c91d2312dafe67753694e1b9e1fee08162396d7aeb12691eee345bafe32aaecedaef1bf5350d6e20fc88628cfcfedfaa SHA512 507d1b05567c0ec34dc51c2f65cab1e4bdf63f8d33a79433c298e3aa33dd08e6daeff024777d311a31ea6283aa8ea737a06a9e0467dafe8574a46cea8ac051a9 +EBUILD gdm-3.36.2.ebuild 7889 BLAKE2B 4d5c40a3ce81d61ac6afbf5d62a8f3f149247d6ed1297bac01bd6bcbb0d9ef019452499a0fe7a580494263408c962bc1cf75088043710f1719ff6854f780a81c SHA512 33db551ec84c33a93bd1ea1a320d76b288be4c1c5299463bc0083f00e9ab23cc0089a377770f1bf6337a0445e5b8a1b27ae0ad28acad085528a2e5d1f6c5fe6d +EBUILD gdm-3.36.3.ebuild 7850 BLAKE2B d65984956fff82c3b507e434ca7a872db14fa50e1cc0520f062e20f303232137a43c47e29c39a8b6016d1175fe1a59d7e17c0bbcae582d4ec0a736e4a1534712 SHA512 6f4d21bf90e972864e65db12775d1c20931ecd7bfaa592392cc46dc5d301697a4b36a06699332976748d916c8b5259c060fe60762e508f98de49f0aba3a9776e MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d diff --git a/gnome-base/gdm/gdm-3.36.2.ebuild b/gnome-base/gdm/gdm-3.36.2.ebuild new file mode 100644 index 000000000000..1b9c4a9aea48 --- /dev/null +++ b/gnome-base/gdm/gdm-3.36.2.ebuild @@ -0,0 +1,248 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user + +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" +HOMEPAGE="https://wiki.gnome.org/Projects/GDM" + +SRC_URI="${SRC_URI} + branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" + +LICENSE=" + GPL-2+ + branding? ( CC-BY-SA-4.0 ) +" + +SLOT="0" + +IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama" +RESTRICT="!test? ( test )" +REQUIRED_USE="^^ ( elogind systemd )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring) +# dbus-run-session used at runtime +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.44:2 + dev-libs/libgudev + >=x11-libs/gtk+-2.91.1:3 + >=gnome-base/dconf-0.20 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + >=media-libs/fontconfig-2.5.0:1.0 + >=media-libs/libcanberra-0.4[gtk3] + sys-apps/dbus + >=sys-apps/accountsservice-0.6.35 + + x11-base/xorg-server + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libxcb + >=x11-misc/xdg-utils-1.0.2-r3 + + sys-libs/pam + sys-apps/keyutils:= + elogind? ( >=sys-auth/elogind-239.3[pam] ) + systemd? ( >=sys-apps/systemd-186:0=[pam] ) + + sys-auth/pambase[elogind?,systemd?] + + audit? ( sys-process/audit ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) +" +# XXX: These deps are from session and desktop files in data/ directory +# fprintd is used via dbus by gdm-fingerprint-extension +# gnome-session-3.6 needed to avoid freezing with orca +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-session-3.6 + >=gnome-base/gnome-shell-3.1.90 + x11-apps/xhost + + accessibility? ( + >=app-accessibility/orca-3.10 + gnome-extra/mousetweaks ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) + + !gnome-extra/fast-user-switch-applet +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + x11-base/xorg-proto + test? ( >=dev-libs/check-0.9.4 ) + app-text/yelp-tools +" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup) + +DOC_CONTENTS=" + To make GDM start at boot with systemd, run:\n + # systemctl enable gdm.service\n + \n + To make GDM start at boot with OpenRC, edit /etc/conf.d to have + DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n + # rc-update add xdm + \n + For passwordless login to unlock your keyring, you need to install + sys-auth/pambase with USE=gnome-keyring and set an empty password + on your keyring. Use app-crypt/seahorse for that.\n + \n + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 + for smartcard support +" + +pkg_setup() { + enewgroup gdm + enewgroup video # Just in case it hasn't been created yet + enewuser gdm -1 -1 /var/lib/gdm gdm,video + + # For compatibility with certain versions of nvidia-drivers, etc., need to + # ensure that gdm user is in the video group + if ! egetent group video | grep -q gdm; then + # FIXME XXX: is this at all portable, ldap-safe, etc.? + # XXX: egetent does not have a 1-argument form, so we can't use it to + # get the list of gdm's groups + local g=$(groups gdm) + elog "Adding user gdm to video group" + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" + fi +} + +src_prepare() { + # ssh-agent handling must be done at xinitrc.d, bug #220603 + eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # Gentoo does not have a fingerprint-auth pam stack + eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" + + # Support pam_elogind.so in gdm-launch-environment.pam + eapply "${FILESDIR}/pam-elogind.patch" + + # Wait 10 seconds for a DRM master with systemd. Workaround for gdm not waiting for CanGraphical=yes property on the seat. Bug #613222 + eapply "${FILESDIR}/gdm-CanGraphical-wait.patch" # needs eautoreconf + + # Show logo when branding is enabled + use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch" + + gnome2_src_prepare +} + +src_configure() { + # PAM is the only auth scheme supported + # even though configure lists shadow and crypt + # they don't have any corresponding code. + # --with-at-spi-registryd-directory= needs to be passed explicitly because + # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 + # Xevie is obsolete, bug #482304 + + # --with-initial-vt=7 conflicts with plymouth, bug #453392 + # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which + # saves on memory. However this means if we don't start on VT1, gdm doesn't start up + # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1, + # so lets try always having it in VT1 and see if that is an issue for people before + # hacking up workarounds for the initial start case. + # ! use plymouth && myconf="${myconf} --with-initial-vt=7" + local myconf=( + --enable-gdm-xsession + --enable-user-display-server + --with-run-dir=/run/gdm + --localstatedir="${EPREFIX}"/var + --disable-static + --with-xdmcp=yes + --enable-authentication-scheme=pam + --with-default-pam-config=exherbo + --with-pam-mod-dir=$(getpam_mod_dir) + --with-udevdir=$(get_udevdir) + --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec + --without-xevie + $(use_enable systemd systemd-journal) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_with audit libaudit) + $(use_enable ipv6) + $(use_with plymouth) + $(use_with selinux) + $(use_with tcpd tcp-wrappers) + $(use_enable wayland wayland-support) + $(use_with xinerama) + ) + + if use elogind; then + myconf+=( + --with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility + SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null` + SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null` + ) + fi + + gnome2_src_configure "${myconf[@]}" +} + +src_install() { + gnome2_src_install + + if ! use accessibility ; then + rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die + fi + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}/49-keychain-r1" 49-keychain + newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent + + # gdm user's home directory + keepdir /var/lib/gdm + fowners gdm:gdm /var/lib/gdm + + if ! use bluetooth-sound ; then + # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10 + # bug #679526 + insinto /var/lib/gdm/.config/pulse + doins "${FILESDIR}"/default.pa + fi + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + local d ret + + # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm + ret=0 + ebegin "Fixing "${EROOT}"var/lib/gdm ownership" + chown --no-dereference gdm:gdm "${EROOT}var/lib/gdm" || ret=1 + for d in "${EROOT}var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do + [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1 + done + eend ${ret} + + systemd_reenable gdm.service + readme.gentoo_print_elog +} diff --git a/gnome-base/gdm/gdm-3.36.3.ebuild b/gnome-base/gdm/gdm-3.36.3.ebuild new file mode 100644 index 000000000000..12a42230f315 --- /dev/null +++ b/gnome-base/gdm/gdm-3.36.3.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user + +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" +HOMEPAGE="https://wiki.gnome.org/Projects/GDM" + +SRC_URI="${SRC_URI} + branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" + +LICENSE=" + GPL-2+ + branding? ( CC-BY-SA-4.0 ) +" + +SLOT="0" + +IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama" +RESTRICT="!test? ( test )" +REQUIRED_USE="^^ ( elogind systemd )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring) +# dbus-run-session used at runtime +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.44:2 + dev-libs/libgudev + >=x11-libs/gtk+-2.91.1:3 + >=gnome-base/dconf-0.20 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + >=media-libs/fontconfig-2.5.0:1.0 + >=media-libs/libcanberra-0.4[gtk3] + sys-apps/dbus + >=sys-apps/accountsservice-0.6.35 + + x11-base/xorg-server + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libxcb + >=x11-misc/xdg-utils-1.0.2-r3 + + sys-libs/pam + sys-apps/keyutils:= + elogind? ( >=sys-auth/elogind-239.3[pam] ) + systemd? ( >=sys-apps/systemd-186:0=[pam] ) + + sys-auth/pambase[elogind?,systemd?] + + audit? ( sys-process/audit ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) +" +# XXX: These deps are from session and desktop files in data/ directory +# fprintd is used via dbus by gdm-fingerprint-extension +# gnome-session-3.6 needed to avoid freezing with orca +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-session-3.6 + >=gnome-base/gnome-shell-3.1.90 + x11-apps/xhost + + accessibility? ( + >=app-accessibility/orca-3.10 + gnome-extra/mousetweaks ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + x11-base/xorg-proto + test? ( >=dev-libs/check-0.9.4 ) + app-text/yelp-tools +" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup) + +DOC_CONTENTS=" + To make GDM start at boot with systemd, run:\n + # systemctl enable gdm.service\n + \n + To make GDM start at boot with OpenRC, edit /etc/conf.d to have + DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n + # rc-update add xdm + \n + For passwordless login to unlock your keyring, you need to install + sys-auth/pambase with USE=gnome-keyring and set an empty password + on your keyring. Use app-crypt/seahorse for that.\n + \n + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 + for smartcard support +" + +pkg_setup() { + enewgroup gdm + enewgroup video # Just in case it hasn't been created yet + enewuser gdm -1 -1 /var/lib/gdm gdm,video + + # For compatibility with certain versions of nvidia-drivers, etc., need to + # ensure that gdm user is in the video group + if ! egetent group video | grep -q gdm; then + # FIXME XXX: is this at all portable, ldap-safe, etc.? + # XXX: egetent does not have a 1-argument form, so we can't use it to + # get the list of gdm's groups + local g=$(groups gdm) + elog "Adding user gdm to video group" + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" + fi +} + +src_prepare() { + # ssh-agent handling must be done at xinitrc.d, bug #220603 + eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # Gentoo does not have a fingerprint-auth pam stack + eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" + + # Support pam_elogind.so in gdm-launch-environment.pam + eapply "${FILESDIR}/pam-elogind.patch" + + # Wait 10 seconds for a DRM master with systemd. Workaround for gdm not waiting for CanGraphical=yes property on the seat. Bug #613222 + eapply "${FILESDIR}/gdm-CanGraphical-wait.patch" # needs eautoreconf + + # Show logo when branding is enabled + use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch" + + gnome2_src_prepare +} + +src_configure() { + # PAM is the only auth scheme supported + # even though configure lists shadow and crypt + # they don't have any corresponding code. + # --with-at-spi-registryd-directory= needs to be passed explicitly because + # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 + # Xevie is obsolete, bug #482304 + + # --with-initial-vt=7 conflicts with plymouth, bug #453392 + # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which + # saves on memory. However this means if we don't start on VT1, gdm doesn't start up + # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1, + # so lets try always having it in VT1 and see if that is an issue for people before + # hacking up workarounds for the initial start case. + # ! use plymouth && myconf="${myconf} --with-initial-vt=7" + local myconf=( + --enable-gdm-xsession + --enable-user-display-server + --with-run-dir=/run/gdm + --localstatedir="${EPREFIX}"/var + --disable-static + --with-xdmcp=yes + --enable-authentication-scheme=pam + --with-default-pam-config=exherbo + --with-pam-mod-dir=$(getpam_mod_dir) + --with-udevdir=$(get_udevdir) + --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec + --without-xevie + $(use_enable systemd systemd-journal) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_with audit libaudit) + $(use_enable ipv6) + $(use_with plymouth) + $(use_with selinux) + $(use_with tcpd tcp-wrappers) + $(use_enable wayland wayland-support) + $(use_with xinerama) + ) + + if use elogind; then + myconf+=( + --with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility + SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null` + SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null` + ) + fi + + gnome2_src_configure "${myconf[@]}" +} + +src_install() { + gnome2_src_install + + if ! use accessibility ; then + rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die + fi + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}/49-keychain-r1" 49-keychain + newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent + + # gdm user's home directory + keepdir /var/lib/gdm + fowners gdm:gdm /var/lib/gdm + + if ! use bluetooth-sound ; then + # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10 + # bug #679526 + insinto /var/lib/gdm/.config/pulse + doins "${FILESDIR}"/default.pa + fi + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + local d ret + + # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm + ret=0 + ebegin "Fixing "${EROOT}"var/lib/gdm ownership" + chown --no-dereference gdm:gdm "${EROOT}var/lib/gdm" || ret=1 + for d in "${EROOT}var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do + [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1 + done + eend ${ret} + + systemd_reenable gdm.service + readme.gentoo_print_elog +} diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest index 5ed494498952..1d0470f2242b 100644 --- a/gnome-base/gnome-applets/Manifest +++ b/gnome-base/gnome-applets/Manifest @@ -1,3 +1,5 @@ DIST gnome-applets-3.34.0.tar.xz 8626548 BLAKE2B 0591269015570da4e7ab9a7a4568a032faa6209378736de57dc54cb395b545bd029a52f7ba6de39aee8f23c255ae3c24fa6defc33e971d270e6fc0e301add12f SHA512 5d16ca9d1f6c65fa59246a860f0d5723e77bf800c9362a254a8435750e52c4beb0e65aa8994e5578cfa1db7130dc92eaf4cb477ab401da402d31ea7f5aac1b51 +DIST gnome-applets-3.36.4.tar.xz 8638044 BLAKE2B 1ccf045c568ca2d4280eeeebbaec67b63f9c2f1edd3248ef89ff93ef7d468e6a581f3c678e93ff45662368b9ecd189aa38da2ca91a7b14ed3e7b2bd6aac8971f SHA512 6fd8f891358f02f40c8d6548b1680139f18cbbcd20d773798a998246b6431692ce8550e8652eaff09bde3651a4e5449779a0dc85b897345a22c17be2e386d2c7 EBUILD gnome-applets-3.34.0.ebuild 1466 BLAKE2B 86174b0142926612639bf20646cb2f3b15c6a7a93b2cdaa528cbd64610e86af16b41d01d207bbb1a22ad69a3da91ef42b54c40b7121e1aefd0f9bfec496da839 SHA512 4c13bb75f266191821a4cc4af76f231d8cb910ce9f9ad999746c5e0f9ce77373724c8fdc79f63becf5b74fd07a588f84db24081c0cbfc4d189c4c34f19751f21 +EBUILD gnome-applets-3.36.4.ebuild 1441 BLAKE2B 67e91aee32ed9150486f1752191491ceb569807cc111a953c88e87af7b6875e64906a1a1e033839422ce2ec033d8673863dc6c01d7d0499f68e41b3d50a7d6a9 SHA512 19f95d6aa983f7ed091ae0715a5198919a3630fef2400b3adb52e8be8fc85096a8a277b6e6265e4b4ac42ce437a898ea0444110ee1e3abd60ea9413cee28b784 MISC metadata.xml 327 BLAKE2B 3067a9007002523f34c1a64a1ac7c54c974c814adcc951d35cc3d9f6940b1feecbaf458603e0fadd7c812c94958feff3a7835ac93746270496f68ffaab2df222 SHA512 614f3b213955d128a1e6b7424477a2bf4b01b5ed1272d2493d97b17ef806dd39a6f3326112736785cab07d206a01a3121bf5902154b5c1016b7ca254a75910a9 diff --git a/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild b/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild new file mode 100644 index 000000000000..91a8bbf9357f --- /dev/null +++ b/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Applets for the GNOME Flashback Panel" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/" + +LICENSE="GPL-2+ FDL-1.1" +SLOT="0" +IUSE="ipv6 tracker upower" +KEYWORDS="~amd64" + +# FIXME: automagic wireless-tools +# TODO: gucharmap could be optional, but no knob +# TODO: libgweather could be optional, but no knob +RDEPEND=" + >=x11-libs/gtk+-3.20.0:3[X] + >=dev-libs/glib-2.44.0:2 + >=gnome-base/gnome-panel-3.24.1 + >=gnome-base/libgtop-2.11.92:= + >=x11-libs/libwnck-3.14.1:3 + >=x11-libs/libnotify-0.7 + upower? ( >=sys-power/upower-0.99.8:= ) + >=x11-themes/adwaita-icon-theme-3.14.0 + >=dev-libs/libxml2-2.5.0:2 + >=dev-libs/libgweather-3.28.0:2= + >=gnome-extra/gucharmap-2.33.0:2.90 + >=sys-auth/polkit-0.97 + x11-libs/libX11 + tracker? ( app-misc/tracker:0/2.0 ) +" +# app-text/docbook-sgml-utils for jw binary +DEPEND="${RDEPEND} + app-text/docbook-sgml-utils + app-text/docbook-xml-dtd:4.1.2 + dev-libs/libxslt + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/intltool-0.35.0 + dev-util/itstool + sys-devel/gettext + x11-base/xorg-proto + virtual/pkgconfig +" # yelp-tools and autoconf-archive for eautoreconf + +src_configure() { + gnome2_src_configure \ + --disable-static \ + $(use_with upower) \ + --disable-battstat \ + --disable-cpufreq \ + $(use_enable tracker tracker-search-bar) \ + $(use_enable ipv6) +} diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index e27f7d5cf18a..bd645de4553c 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,5 +1,8 @@ AUX gnome-control-center-3.32.2-fix-gcc10-fno-common.patch 706 BLAKE2B c53a8ba8e45682fb6af8114154724453bdaae589184b6b1eab85b8db33e8169e69b5cf1055c53857a20682e177a212640d60050351fd267346fa797eff0c2c13 SHA512 76c01a7f72230b7aad7b21dba9f58063a0ce93a945ac5a3c19a5a7c9af6dcb8225d3143b099e9ee6938b11107a511b1b1b580558ec57aa9c973e7cad0b26f1d0 DIST gnome-control-center-3.34.5-patchset.tar.xz 7500 BLAKE2B 6ec377725fa81a2d49eb0496b31adf7a303505b4478781dd3d4f2c0b204996ae94e3bb5b9b43c324d8e317d66646ee28fa2e471ff884b709c03419fd0243f342 SHA512 c658f0515a7b72c78c3ec6c78a1586169d21f01a40211e14d9e70fade3d5a18e29639c2aa5ef37dc6c741df9f9b7478cb221c83e3f1b4e4876e6b854e38ff524 DIST gnome-control-center-3.34.5.tar.xz 6234916 BLAKE2B 9c41ee8f24a66ff66173587f0f75bb743434f21315281db11577bed2c4770c9da5606df37020d4951b7e542171298abceef65ba02e66519737aeb30bb6bd3861 SHA512 564cf514345c45c39003e309d9d93a862cfe801e84968412f6c69031745df0683716423de2d85cde166fc9eb256a45be713e7eb62c8ac3e8e4a59e91ab160156 -EBUILD gnome-control-center-3.34.5-r1.ebuild 6363 BLAKE2B 26e1ac365f102ec02539c2072fb4c5d44b5378173952924df45bbc6bdf820c2212fb892db24604eb4e21baa643494f237f1ffcce36158c89036a20f5a3dff003 SHA512 a59f3e0640738b61ca45d0181adc7d378d89c5b259ef0d7cbebda03303f5b566aca29eb80240869c651e5bfda7eab40027b2bd5a6d395a0d21bf387dbe20b319 +DIST gnome-control-center-3.36.4-patchset.tar.xz 12320 BLAKE2B a387d793186c898a14d54060214fbd075389afe402b1ad937a00295eed339a529863752324ba26f691ad468f214acda60be5bc23167d95fdf842f26a24442e55 SHA512 6f11425f13590e7850114613efa82e8762bd62687839c9374d2618ab81a08f1abb871d2a8f452811e46fa53af7007167f7b9ca68e0822daee22e9de33e0be94b +DIST gnome-control-center-3.36.4.tar.xz 6304992 BLAKE2B 7c52faf2a9a0f642f24f59e2035ae57e7816d69c8ee639cde76db7d69f8063c9eff2e068b95710d13316c267b5cf6c6647cb1359ac592968b1c5021730081130 SHA512 e6c398256215a139042e5bb0db7c83fc0e39f99ab893760e37ba303ec4c932a37da352b92487ed1bdc61f2e8f61352c752b48ab549269e3f84e21a71cdf32abf +EBUILD gnome-control-center-3.34.5-r1.ebuild 6397 BLAKE2B 6fd09e823aeb0cf1a4885cc65d4b1a95faa52cb39713aa93bae1581328866d4dc3a107d5dd88068dfe2b22f485bd430746187e5f5d08aa7dde3c5cbe1535d8ad SHA512 82832674dd8f9db8fe838b41f09c1912586fc23d957ac7a60454cd7e2f32da45972b1d6f50b4038b60044061d42039e87aee44229e74fb69b1e48fb69c4034dc +EBUILD gnome-control-center-3.36.4.ebuild 6338 BLAKE2B 54b6dbdbea5ac517bf971b22aed0b1b9c1012c9a0677993b219088ddd3bb8a09cf57e89606da0431cc8d0379267791a40dfd80b2f2dd4fc4a2fd079ccd39783a SHA512 1c3598b253f946d92137d0097dd8f395123def3648208820b6eb235c6601989ee2da0b730d2696acc93675e72645e48db549de30b54d1091e4778ea8b2a7239a MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.34.5-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.34.5-r1.ebuild index a70dfacba460..531f4008a06e 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.34.5-r1.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.34.5-r1.ebuild @@ -35,6 +35,7 @@ DEPEND=" >=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-desktop-3.35.4 >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-3.31.0 dev-libs/libxml2:2 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.36.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.36.4.ebuild new file mode 100644 index 000000000000..f604537b2e27 --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-3.36.4.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit gnome.org gnome2-utils meson python-any-r1 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 elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + flickr? ( gnome-online-accounts ) + ^^ ( elogind systemd ) +" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" + +# 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) +# 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 +DEPEND=" + >=gui-libs/libhandy-0.0.9:0.0= + 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.56.0:2 + >=gnome-base/gnome-desktop-3.27.90:3= + >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?] + >=gnome-base/gsettings-desktop-schemas-3.31.0 + dev-libs/libxml2:2 + >=sys-auth/polkit-0.114 + >=sys-power/upower-0.99.8:= + >=dev-libs/libgudev-232 + x11-libs/libX11 + >=x11-libs/libXi-1.2 + media-libs/libepoxy + 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? ( + >=media-video/cheese-3.28.0 ) + ibus? ( >=app-i18n/ibus-1.5.2 ) + networkmanager? ( + >=net-libs/libnma-1.8.0 + >=net-misc/networkmanager-1.12.0:=[modemmanager] + >=net-misc/modemmanager-0.7.990 ) + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) + input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) + 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= + >=sys-fs/udisks-2.1.8:2 + app-crypt/libsecret + media-libs/gsound + >=dev-libs/libpwquality-1.2.2 +" +# systemd/elogind USE flagged because package manager will potentially try to satisfy a +# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed. +# libgnomekbd needed only for gkbd-keyboard-display tool +# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel +# <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="${DEPEND} + systemd? ( >=sys-apps/systemd-31 ) + elogind? ( app-admin/openrc-settingsd + sys-auth/elogind ) + 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 + networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor + +BDEPEND=" + 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 + test? ( $(python_gen_any_dep ' + dev-python/dbusmock[${PYTHON_USEDEP}] + ') ) +" + +PATCHES=( + # Patches from gnome-3-36 branch on top of 3.36.4 + # Makes some panels and dependencies optional + # https://bugzilla.gnome.org/686840, 697478, 700145 + # Fix some absolute paths to be appropriate for Gentoo + "${WORKDIR}"/patches/ +) + +python_check_deps() { + use test && \ + has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + xdg_src_prepare + # Mark python tests with shebang executable, so that meson will launch them directly, instead + # of via its own python-single-r1 version, which might not match what we get from python_check_deps + chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die +} + +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) + -Dprivileged_group=wheel + -Dsnap=false + $(meson_use test tests) + $(meson_use debug tracing) + $(meson_use input_devices_wacom wacom) + #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code + # 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-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest index 666dcb9f76f4..c9d01958b2bc 100644 --- a/gnome-base/gnome-core-apps/Manifest +++ b/gnome-base/gnome-core-apps/Manifest @@ -1,2 +1,3 @@ -EBUILD gnome-core-apps-3.34.4.ebuild 1658 BLAKE2B bac78a85a54c48bc642fef0ef77b24f6f53a4c1424f0ced9efea39c8aefa3bca6ca0963225187d6c6b332a8f72dd851065b5da9f897fe3fa4a8602afba8d8f75 SHA512 98a6f83b8afe74a6b287e07612c166552d8dff54392f4f6072657b4d8a512e7f8674bb2a89232f7ce9be3a4d46f3bc8a2f66d9854d0ac10d1a276e1418172393 +EBUILD gnome-core-apps-3.34.4.ebuild 1653 BLAKE2B 6b8c22a53bfedc16e329549ae6fbc30a8b31ad6fcea7173e4f433d1b2be4d18b6fc2058b0d39384cb6e85c657acb441616121a6ebe0749f5f9946e6220286529 SHA512 bfb58731a1d5d3742738accf92db638a527f66c51ac20d5fc5cb3e1a99a924cafe661a52ef0689a3627873c690350e96875ff580b87ff1a20dd944f8edc15b28 +EBUILD gnome-core-apps-3.36.5.ebuild 1579 BLAKE2B 3842163c95b9c28da526c652ed9837a31335fa4f52b0fa9203e3d3c2f7495ac337d9bad2d46033b03af3218944e8a0902003545ba4f44c1eccf338c49e2834d3 SHA512 e4156ab6302f4681536ed6e1a55a9aae99a47a94f4123503b084509ed375cc3d4156feb970669c2ba9a1fed889431c86a9abc0eeb1ffbe5f7e78dbe62abe903c MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild index d3f10edf2128..62443e787a84 100644 --- a/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.34.4.ebuild @@ -11,7 +11,7 @@ IUSE="+bluetooth cups" # when unmasking for an arch # double check none of the deps are still masked ! -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" # gnome-color-manager min version enforced here due to control-center pulling it in RDEPEND=" diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild new file mode 100644 index 000000000000..d03437b836fe --- /dev/null +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~arm64 ~x86" + +# gnome-color-manager min version enforced here due to control-center pulling it in +# tepl min version for gedit deptree +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV}[cups?] + + >=gnome-base/gnome-session-3.36.0 + >=gnome-base/gnome-settings-daemon-3.36.1[cups?] + >=gnome-base/gnome-control-center-3.36.4[cups?] + >=gnome-extra/gnome-color-manager-3.36.0 + + >=app-crypt/gcr-3.36.0 + >=gnome-base/nautilus-3.36.3 + >=gnome-base/gnome-keyring-3.36.0 + >=gnome-extra/evolution-data-server-${PV} + + >=app-crypt/seahorse-3.36.2 + >=gui-libs/tepl-4.4.0 + >=app-editors/gedit-3.36.2 + >=app-text/evince-3.36.7 + >=gnome-extra/gnome-contacts-3.36.2 + >=media-gfx/eog-3.36.3 + >=media-video/totem-3.34.1 + >=x11-terms/gnome-terminal-3.36.2 + + >=gnome-extra/gnome-user-docs-3.36.2 + >=gnome-extra/yelp-3.36.0 + + >=x11-themes/adwaita-icon-theme-3.36.1 + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.34.1 ) +" +DEPEND="" +BDEPEND="" + +# 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 c358f8848b17..df59dfbce6cb 100644 --- a/gnome-base/gnome-core-libs/Manifest +++ b/gnome-base/gnome-core-libs/Manifest @@ -1,2 +1,4 @@ EBUILD gnome-core-libs-3.34.4.ebuild 1236 BLAKE2B 0490f724def9c59fabb7cca7b607c76c592525cee6b292c54940843df8512ff4d79c9735dc725e8ab13bbbbc9c0aae1ceb43eebb561f3dc593730fff7c7044f9 SHA512 4fa521a55bff944fbfb4c4794906c1c9ec17f1627422337ef8b39ab8fa450e72c8d86c953c37552920343ca93f701a03ee0ced8095d0b672de2ec9c8ba4116dc +EBUILD gnome-core-libs-3.36.4.ebuild 1200 BLAKE2B 253e0eb8d7b0423cb355782c60aaa290aa705c9967e36fa56eae2b7efee18347fb55e2940e2e3c9e2382c9fd283d28f6b23aa15d5f1cb1b0673bbe993c7ed6d5 SHA512 853ec992b8dd413136b9df8f771d396a004616f1697a306f2f1576f9d41798999ebeb120cc68ffcf0a222f619ed72b1b7cdfda4a6fa2dac41a48c8651b80deaa +EBUILD gnome-core-libs-3.36.5.ebuild 1081 BLAKE2B 37dc3f6162945c3961e3706a5ff8ee33ab075698162c80f87227f9f8997c7171b454061233cda506e19955ba038e0a3271c9f1bd6448043a2e155ff4bd5e0dcd SHA512 57ccb1603c423791e668fade7d15c17c6ac2d4ba2f81c32e0c7a35399ff5a8b47e6b170acdea13e8536b40a3a6f50c1af5ddf5525f80a170bb5f287944a5dadb MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.36.4.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.36.4.ebuild new file mode 100644 index 000000000000..670bb8c4194c --- /dev/null +++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.36.4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Sub-meta package for the core libraries of GNOME 3" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="3.0" +IUSE="cups python" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# Note to developers: +# This is a wrapper for the core libraries used by GNOME 3 +RDEPEND=" + >=dev-libs/glib-2.64.4:2 + >=x11-libs/gdk-pixbuf-2.40.0:2 + >=x11-libs/pango-1.42.4 + >=x11-libs/gtk+-3.24.21:3[cups?] + >=dev-libs/atk-2.34.1 + >=gnome-base/librsvg-2.40.21 + >=gnome-base/gnome-desktop-${PV}:3 + + >=gnome-base/gvfs-1.44.1 + >=gnome-base/dconf-0.36.0 + + >=media-libs/gstreamer-1.16.2:1.0 + >=media-libs/gst-plugins-base-1.16.2:1.0 + >=media-libs/gst-plugins-good-1.16.2:1.0 + + python? ( >=dev-python/pygobject-3.36.1:3 ) +" +DEPEND="" +BDEPEND="" + +# >=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. +# pango kept at 1.42 for now due to bitmap fonts and incompatibilities + +S="${WORKDIR}" diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.36.5.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.36.5.ebuild new file mode 100644 index 000000000000..dfc8fe410a40 --- /dev/null +++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.36.5.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# Note to developers: +# This is a wrapper for the core libraries used by GNOME 3 +RDEPEND=" + >=dev-libs/glib-2.64.4:2 + >=x11-libs/gdk-pixbuf-2.40.0:2 + >=x11-libs/pango-1.42.4 + >=x11-libs/gtk+-3.24.22:3[cups?] + >=dev-libs/atk-2.34.1 + >=gnome-base/librsvg-2.48.8 + >=gnome-base/gnome-desktop-${PV}:3 + + >=gnome-base/gvfs-1.44.1 + >=gnome-base/dconf-0.36.0 + + >=media-libs/gstreamer-1.16.2:1.0 + >=media-libs/gst-plugins-base-1.16.2:1.0 + >=media-libs/gst-plugins-good-1.16.2:1.0 + + python? ( >=dev-python/pygobject-3.36.1:3 ) +" +DEPEND="" +BDEPEND="" + +# >=x11-libs/libwnck-3.24.1:3 - not used by core packages anymore +# pango kept at 1.42 for now due to bitmap fonts and incompatibilities + +S="${WORKDIR}" diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest index c5d9c25a9d40..a686f8936e37 100644 --- a/gnome-base/gnome-desktop/Manifest +++ b/gnome-base/gnome-desktop/Manifest @@ -1,6 +1,8 @@ AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18 -DIST gnome-desktop-3.34.5.tar.xz 718008 BLAKE2B a09daf4f575b26774beeef8e9edb4ed757ead7c0155aab4d7c132bf503d29096c40b06d52aa261594c6db367ac7a638c33de4445748ab3d94a095c23f8ddd705 SHA512 bc59b420d5698b15697404efcf452e830933efa23b6dba9011eade1c7521dbd4fb6f6e6e2be822d231611b2133e36f2ec42ed49ecabd175127366e0e7d59955c DIST gnome-desktop-3.34.7.tar.xz 718220 BLAKE2B 89bfd00a356cd47d865aa4df1079b37b08c6a85f4380b5424181ce247248c7f11f0ca135858afb0c00fc4ff47175ff2acbb0b67cebe75e0b0a9f27263f0a9d69 SHA512 efc466d2a7a8a142e76a07c8cb75bad51aafbb2e70432e339713965890e6a83554a5f77ef6cdb6aa9e3ebace4883fb6d3d06004d7a2446d6960319cacbec7639 -EBUILD gnome-desktop-3.34.5.ebuild 2022 BLAKE2B 67eb2266a63db598d5fa7fe26a7f8ca9206335685c310d821da32c5bd47319aafd703e4f12353310776098734eb5496e3842c20ed3dff55213843ed3eb1037b1 SHA512 0a32a031cb21a1b977997aa498edae51979674b01f15cf79f8876e3dca0e6498280eab2242a0fd948b1a7443239fc87d69113ca6b3b8b103f32dab5bba889301 +DIST gnome-desktop-3.36.4.tar.xz 736324 BLAKE2B 68abef71e1732f72eabc6cac83b513af30d8cd39f92baaa57757bb818f8309a82a1ed8dcecef6015d6b8fb08f24e2ab041ccb796955c599a4cf43c412dd0c147 SHA512 06683df9a774487f386cf5aece586fb9666fdebfe5c9ea247e6ab91f6f281ca0241b13e9eb4e0eda1fb856b9cf1109fea859964998df2e2b06c8861efc76316f +DIST gnome-desktop-3.36.5.tar.xz 738956 BLAKE2B 6c419df487e908f57a1dc8798a8dfe8b574d8c5c9aa5d83e45aed233ba856ba398367a990aa83fb1b8966aad02c868cd0e41805908863ea8fef24cc3ade3687c SHA512 0b5ad42c0832d58552270e9e24dabf56668c4fbb84d07812e4a2a34cff0a67344a7c8ee963a53a703b2e4bb28c67035bf2ce854ea271194511dc66e051481b1b EBUILD gnome-desktop-3.34.7.ebuild 2022 BLAKE2B 67eb2266a63db598d5fa7fe26a7f8ca9206335685c310d821da32c5bd47319aafd703e4f12353310776098734eb5496e3842c20ed3dff55213843ed3eb1037b1 SHA512 0a32a031cb21a1b977997aa498edae51979674b01f15cf79f8876e3dca0e6498280eab2242a0fd948b1a7443239fc87d69113ca6b3b8b103f32dab5bba889301 +EBUILD gnome-desktop-3.36.4.ebuild 2025 BLAKE2B 5ea77d5672464d313a241a3d74f047935d40857c95a90eea21c1f4005f28a90e58000d0448ccef3c5718551f339138ba456bcb4e25804e21cdc7acba66da2ec5 SHA512 a37c5dde9f212becf1661b65364a97b9ed4bfe194cc651e208bd152addf7eee42b6ddc5d83bf7c4cfefdd205e5fb7723b03047e14e13a44a1f50e22b77ba1a52 +EBUILD gnome-desktop-3.36.5.ebuild 2025 BLAKE2B 5ea77d5672464d313a241a3d74f047935d40857c95a90eea21c1f4005f28a90e58000d0448ccef3c5718551f339138ba456bcb4e25804e21cdc7acba66da2ec5 SHA512 a37c5dde9f212becf1661b65364a97b9ed4bfe194cc651e208bd152addf7eee42b6ddc5d83bf7c4cfefdd205e5fb7723b03047e14e13a44a1f50e22b77ba1a52 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.36.4.ebuild index 665870f47137..e7951e7ba9c2 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.36.4.ebuild @@ -8,9 +8,9 @@ DESCRIPTION="Library with common API for various GNOME modules" HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/" LICENSE="GPL-2+ LGPL-2+ FDL-1.1+" -SLOT="3/18" # subslot = libgnome-desktop-3 soname version +SLOT="3/19" # subslot = libgnome-desktop-3 soname version IUSE="debug gtk-doc +introspection seccomp systemd udev" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" # cairo[X] needed for gnome-bg COMMON_DEPEND=" diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.36.5.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.36.5.ebuild new file mode 100644 index 000000000000..e7951e7ba9c2 --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-3.36.5.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome.org gnome2-utils meson virtualx xdg + +DESCRIPTION="Library with common API for various GNOME modules" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/" + +LICENSE="GPL-2+ LGPL-2+ FDL-1.1+" +SLOT="3/19" # subslot = libgnome-desktop-3 soname version +IUSE="debug gtk-doc +introspection seccomp systemd udev" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" + +# cairo[X] needed for gnome-bg +COMMON_DEPEND=" + >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] + >=x11-libs/gtk+-3.3.6:3[X,introspection?] + >=dev-libs/glib-2.53.0:2 + >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] + x11-misc/xkeyboard-config + app-text/iso-codes + x11-libs/libX11 + systemd? ( sys-apps/systemd:= ) + udev? ( + sys-apps/hwids + virtual/libudev:= ) + seccomp? ( sys-libs/libseccomp ) + + x11-libs/cairo:=[X] + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${COMMON_DEPEND} + media-libs/fontconfig +" +RDEPEND="${COMMON_DEPEND} + seccomp? ( sys-apps/bubblewrap ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + gtk-doc? ( >=dev-util/gtk-doc-1.14 ) + dev-util/itstool + >=sys-devel/gettext-0.19.8 + x11-base/xorg-proto + virtual/pkgconfig +" +# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto + +PATCHES=( + "${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option +) + +src_prepare() { + # Don't build manual test programs that will never get run + sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + -Dgnome_distributor=Gentoo + -Ddate_in_gnome_version=true + -Ddesktop_docs=true + $(meson_use debug debug_tools) + $(meson_use introspection) + $(meson_feature udev) + $(meson_feature systemd) + $(meson_use gtk-doc gtk_doc) + -Dinstalled_tests=false + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest index 4ac1ed815bdc..d9f200f6c183 100644 --- a/gnome-base/gnome-extra-apps/Manifest +++ b/gnome-base/gnome-extra-apps/Manifest @@ -1,2 +1,3 @@ EBUILD gnome-extra-apps-3.34.4.ebuild 2485 BLAKE2B d02b57fb3bdc7cfa997b06ab050a64d5b0ba1218da687239f20ca866886ac6198edb9ae80cb0cd3d636a1d2fda1e0c8437750f5115c4010011826a28cea99b6c SHA512 19eb1293c7de6ab282b6342d74f6b7886ed394795debe18e4984480523aff899f702044281241a84e0e840ca37df8cd7c704f0f22438353d0c2ab6dc59ae456e +EBUILD gnome-extra-apps-3.36.5.ebuild 2555 BLAKE2B 1ae8a4e234cb4edc8d5b72006cf69dffb45105744ba4262f4e90126658cc4053e5e5e4c44aec2c18406f3c9328e2f9bb36aa0a665dd62ad96f6409f4f264bdca SHA512 13962e414d87014ddcb09ffd859c55a7e699ff3f28faad8715a5246b03c641d46854135e1d48e598977df041de086c3a45964598d0ea4e1eefc0f031e868fbaa MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild new file mode 100644 index 000000000000..9e2e476537f8 --- /dev/null +++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Sub-meta package for the applications of GNOME 3" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="3.0" +IUSE="+games share +shotwell +tracker" + +KEYWORDS="~amd64 ~arm64 ~x86" + +# Note to developers: +# This is a wrapper for the extra apps integrated with GNOME 3 +# Keep pkg order within a USE flag as upstream releng versions file +# TODO: Should we keep these here: gnome-dictionary, gucharmap, sound-juicer, vinagre; replace gucharmap with gnome-characters? +# TODO: Add gnome-remote-desktop as replacement for vino that was removed from meta in 3.36? +# 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.34.1 + >=media-video/cheese-3.34.0 + >=www-client/epiphany-3.36.4 + >=app-arch/file-roller-3.36.3 + >=gnome-extra/gnome-calculator-3.36.0 + >=gnome-extra/gnome-calendar-3.36.2 + >=gnome-extra/gnome-characters-3.34.0 + >=sys-apps/gnome-disk-utility-3.36.3 + >=media-gfx/gnome-font-viewer-3.34.0 + >=media-gfx/gnome-screenshot-3.36.0 + >=gnome-extra/gnome-system-monitor-3.36.1 + >=gnome-extra/gnome-weather-3.36.1 + >=gnome-extra/gucharmap-12.0.1:2.90 + >=gnome-extra/sushi-3.34.0 + >=media-sound/sound-juicer-3.24.0 + + >=gnome-base/dconf-editor-3.34.4 + >=app-dicts/gnome-dictionary-3.26.1 + >=mail-client/evolution-${PV} + >=gnome-extra/gnome-tweaks-3.34.0 + >=gnome-extra/nautilus-sendto-3.8.6 + >=net-misc/vinagre-3.22.0 + + games? ( + >=games-puzzle/five-or-more-3.32.2 + >=games-board/four-in-a-row-3.36.4 + >=games-board/gnome-chess-3.36.1 + >=games-puzzle/gnome-klotski-3.36.3 + >=games-board/gnome-mahjongg-3.36.2 + >=games-board/gnome-mines-3.36.1 + >=games-arcade/gnome-nibbles-3.36.1 + >=games-arcade/gnome-robots-3.36.1 + >=games-puzzle/gnome-sudoku-3.36.0 + >=games-puzzle/gnome-taquin-3.36.4 + >=games-puzzle/gnome-tetravex-3.36.4 + >=games-puzzle/hitori-3.36.0 + >=games-board/iagno-3.36.4 + >=games-puzzle/lightsoff-3.36.0 + >=games-puzzle/quadrapassel-3.36.05 + >=games-puzzle/swell-foop-3.34.1 + >=games-board/tali-3.36.4 + ) + share? ( >=gnome-extra/gnome-user-share-3.34.0 ) + shotwell? ( >=media-gfx/shotwell-0.30.10 ) + tracker? ( + >=app-misc/tracker-2.3.4 + >=app-misc/tracker-miners-2.3.3 + >=media-gfx/gnome-photos-3.34.2 + >=media-sound/gnome-music-3.36.4.1 ) +" +DEPEND="" +BDEPEND="" +S=${WORKDIR} diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest index 2c5ac1fc2e61..4df286c72e6e 100644 --- a/gnome-base/gnome-flashback/Manifest +++ b/gnome-base/gnome-flashback/Manifest @@ -1,3 +1,7 @@ DIST gnome-flashback-3.34.2.tar.xz 727812 BLAKE2B dd5fd4ff9f612d464f750343c17f0216366dfc6b9c7d892724e3b78ebf96b492a6192e32edb6c5f7c92c997a1d3325fea2b7e06874a3f03f1e5ea0965c63eba8 SHA512 9c2cfdcd0f896b56c6aff529c372b697fdd52db2660ba658aaef5ff7110a71b756ec708eebd260718ddd1c77df858bd00100070a1a32e282808bac519abb867d -EBUILD gnome-flashback-3.34.2.ebuild 1203 BLAKE2B 0e8fbf5c86770c4de7ec38a9d3a30115674410e26dfe8132b6c51eea3f64a2e4faeeaf34e268e45cc5a33876d8fb8a5f42810dc64a672a928914cb8bcb149026 SHA512 df60e2bfc5120ff7166bddc36485a9bace1b2a99b6de02df37f88d01482113ae74c26883b7da89e55f1b11ae081fddf9476e8630f53445970ecb05705bb9365a +DIST gnome-flashback-3.36.3.tar.xz 825812 BLAKE2B f758e719e06572ebf008eea7eda6965f6572c3a666dc70b39fcaa4e59e814297fa671449c1aa8617fca799e51407e9acc637644c8fbe50f571fb75f250d0a7fb SHA512 b0217ab72538983150f37c12ba0e78da0d9aa7a74075af0bd71390be9cc0686480dc831696f3febf4fed0bb1332547a494e5efb33c86b6879c46bc0443c53138 +DIST gnome-flashback-3.36.4.tar.xz 826568 BLAKE2B 6625b3a2d90649b9476d6340295b3cf8960f76908c23d75fe7b2a886d1a5c6a587bc8cb31ab866a40f2250b67d154a080f27534aaa11e822d901fc1cac0687af SHA512 6c1b910872530a86d6fb477ad55c8c44cbe5ef958073e2c675d95b9b4dbf9aab0d0a3b3cdae2daebbe3dad8a83c53ffe0604e12282864bfdee33402e119eff32 +EBUILD gnome-flashback-3.34.2.ebuild 1237 BLAKE2B 60396f8b0ce608f9a47d8cf1b2deca3ec38969de165fdb3ece914fe8824049e82cad7076d2f38f83c770373c02cbef9206a457f030757a5f5ca88961072c1b58 SHA512 d101581f4aa180c26295546f6b280205493ac9d70a46544f03a955bbe211e37062af695e854c9421b56be365eac6257affacb14c5d63e17f0e52d420ceace92c +EBUILD gnome-flashback-3.36.3.ebuild 2539 BLAKE2B 9d4ea6cf2ca7510059d849323715f429d1a0c48b1d080957f2dc61bff9e6ef51f704bc8a2d5a4e61e71f184d6802bbe75ed1d63b5b4308612435f1cde957e6f2 SHA512 7228f42e85045fbe7a2d554c6eac86cdcf742d00fc4eae8a566b8e109f5c6a5fe4cc493900c53abcfd94bea68eb9b675ffee8f3f27f5a72f6ff75c6957de473f +EBUILD gnome-flashback-3.36.4.ebuild 2539 BLAKE2B 57690d6422bb9d398886c307c17444abf86341afacc59d9b2de3f5ae9fa4d5ef08a05ca2740aaf2ae3b707671370ca75cf4f832229022c26caefa304fca9a790 SHA512 f088673b962c860eff0371f9c5a7f5e59989ae39d1808f39c4284eeee036728678136e7671108ca473314226dfdef0b9074ec059d013e4e63c46962495b0e96c MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild index 88af27a5a768..f287574ee194 100644 --- a/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild +++ b/gnome-base/gnome-flashback/gnome-flashback-3.34.2.ebuild @@ -16,6 +16,7 @@ RDEPEND=" >=x11-libs/gdk-pixbuf-2.32.2:2 >=x11-libs/gtk+-3.22.0:3[X] >=gnome-base/gnome-desktop-3.12.0:3= + <gnome-base/gnome-desktop-3.35.4 >=media-libs/libcanberra-0.13[gtk3] >=dev-libs/glib-2.44.0:2 >=gnome-base/gsettings-desktop-schemas-3.31.0 diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.36.3.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.36.3.ebuild new file mode 100644 index 000000000000..f9f6fc5247ce --- /dev/null +++ b/gnome-base/gnome-flashback/gnome-flashback-3.36.3.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="GNOME Flashback session" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="elogind systemd" +REQUIRED_USE="^^ ( elogind systemd )" +KEYWORDS="~amd64" + +RDEPEND=" + >=x11-libs/gdk-pixbuf-2.32.2:2 + >=x11-libs/gtk+-3.22.0:3[X] + >=gnome-base/gnome-desktop-3.12.0:3= + >=gnome-base/gnome-panel-3.35.2 + >=media-libs/libcanberra-0.13[gtk3] + >=dev-libs/glib-2.44.0:2 + >=gnome-base/gsettings-desktop-schemas-3.31.0 + >=sys-auth/polkit-0.97 + >=app-i18n/ibus-1.5.2 + >=sys-power/upower-0.99.0:= + >=x11-libs/libXrandr-1.5.0 + >=x11-libs/libXxf86vm-1.1.4 + x11-libs/libxcb + x11-libs/libX11 + gnome-base/gdm + elogind? ( >=sys-auth/elogind-230 ) + systemd? ( >=sys-apps/systemd-230:= ) + net-wireless/gnome-bluetooth + x11-libs/libXext + >=x11-libs/libXi-1.6.0 + x11-libs/pango + x11-libs/libxkbfile + x11-misc/xkeyboard-config + x11-libs/libXfixes + media-sound/pulseaudio[glib] + sys-libs/pam +" +DEPEND="${RDEPEND} + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + x11-base/xorg-proto + virtual/pkgconfig +" # autoconf-archive for eautoreconf +RDEPEND="${RDEPEND} + x11-wm/metacity + gnome-base/gnome-panel + gnome-base/gnome-settings-daemon +" + +src_configure() { + local myconf=( + --disable-static + --without-compiz-session + $(use_enable systemd systemd-session) + ) + + # Below elogind DESKTOP_* and SCREENSAVER_* pkg-config calls need to match up with + # what upstream has each version (libsystemd replaced with libelogind). Explicit + # per-version die to force a manual recheck. Only update the explicit version if the + # "PKG_CHECK_MODULES([MENU/SCREENSAVER], ...)" blocks did not change; otherwise adjust + # elogind conditional block below accordingly first. + if ver_test ${PV} -ne 3.36.3; then + die "Maintainer has not checked over packages MENU pkg-config deps for elogind support" + fi + + if use elogind; then + myconf+=( + DESKTOP_CFLAGS=`pkg-config --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null` + DESKTOP_LIBS=`pkg-config --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null` + SCREENSAVER_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null` + SCREENSAVER_LIBS=`pkg-config --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null` + ) + fi + + gnome2_src_configure "${myconf[@]}" +} diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild new file mode 100644 index 000000000000..033c47fe3410 --- /dev/null +++ b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="GNOME Flashback session" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="elogind systemd" +REQUIRED_USE="^^ ( elogind systemd )" +KEYWORDS="~amd64" + +RDEPEND=" + >=x11-libs/gdk-pixbuf-2.32.2:2 + >=x11-libs/gtk+-3.22.0:3[X] + >=gnome-base/gnome-desktop-3.12.0:3= + >=gnome-base/gnome-panel-3.35.2 + >=media-libs/libcanberra-0.13[gtk3] + >=dev-libs/glib-2.44.0:2 + >=gnome-base/gsettings-desktop-schemas-3.31.0 + >=sys-auth/polkit-0.97 + >=app-i18n/ibus-1.5.2 + >=sys-power/upower-0.99.0:= + >=x11-libs/libXrandr-1.5.0 + >=x11-libs/libXxf86vm-1.1.4 + x11-libs/libxcb + x11-libs/libX11 + gnome-base/gdm + elogind? ( >=sys-auth/elogind-230 ) + systemd? ( >=sys-apps/systemd-230:= ) + net-wireless/gnome-bluetooth + x11-libs/libXext + >=x11-libs/libXi-1.6.0 + x11-libs/pango + x11-libs/libxkbfile + x11-misc/xkeyboard-config + x11-libs/libXfixes + media-sound/pulseaudio[glib] + sys-libs/pam +" +DEPEND="${RDEPEND} + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + x11-base/xorg-proto + virtual/pkgconfig +" # autoconf-archive for eautoreconf +RDEPEND="${RDEPEND} + x11-wm/metacity + gnome-base/gnome-panel + gnome-base/gnome-settings-daemon +" + +src_configure() { + local myconf=( + --disable-static + --without-compiz-session + $(use_enable systemd systemd-session) + ) + + # Below elogind DESKTOP_* and SCREENSAVER_* pkg-config calls need to match up with + # what upstream has each version (libsystemd replaced with libelogind). Explicit + # per-version die to force a manual recheck. Only update the explicit version if the + # "PKG_CHECK_MODULES([MENU/SCREENSAVER], ...)" blocks did not change; otherwise adjust + # elogind conditional block below accordingly first. + if ver_test ${PV} -ne 3.36.4; then + die "Maintainer has not checked over packages MENU pkg-config deps for elogind support" + fi + + if use elogind; then + myconf+=( + DESKTOP_CFLAGS=`pkg-config --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null` + DESKTOP_LIBS=`pkg-config --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null` + SCREENSAVER_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null` + SCREENSAVER_LIBS=`pkg-config --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null` + ) + fi + + gnome2_src_configure "${myconf[@]}" +} diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest index 660d7e8dbf70..ee419002bbf0 100644 --- a/gnome-base/gnome-keyring/Manifest +++ b/gnome-base/gnome-keyring/Manifest @@ -1,9 +1,5 @@ -AUX 3.31.91-fix-musl.patch 779 BLAKE2B 72dc9001d17dcec1a2612a19e0edb358398a36dc3bffb8b56f9dc911c3061d37c82a1c58ee94fabaa1ed97464769cce9aa36bd3d835eb557b31e7a89cadd083f SHA512 aa75b3017418d164e5f7014346b6916e618b05b7f444114859a1a914544a28f85eccaaf88e8bdd7defd7175f31e56b9cf203019d151493a2f262c4913b248775 -AUX 3.31.91-race-fix1.patch 1503 BLAKE2B cd90c630835f5e5c85ec6fc432ea10cc17aeec6bf7edbd42a6fecccc2426c4ee54135394f71d8ac8cfcd84062a465baf91dd85c29decd4e9db5c8bf39a719d8d SHA512 64ba00999370283d33f998ee6ed5f26cfaa685ea53a169a3bb0a1a28fe7229331ab388ef86fa3322deb3e454d850bb82c390686fad51cd69dc5005deac8dfb9a -AUX 3.31.91-race-fix2.patch 3510 BLAKE2B 706a88941bb9beb46209e45cbfbf72e4f8b7a5fb0abaffe55b213dd7d86584d03c50bf317fd5e266e540a9fcf454c44468ab4c03808e15702a301ba9388083e0 SHA512 8e90901cfae13793972eb4be903995ff11bde6d78a0c72db4ecde0dcf76b44496d398cd14c60f689d7720d0356abd85b4ccc523a5b57cede3e97cba394d223d8 -AUX 3.31.91-ssh-tests-fix.patch 3854 BLAKE2B 2cf3f6fc133960f0b4e7d07b0358a3075dd8289b1960164f613ec6aef4d6807302a7424fd770b2f399add63a1d1a32539264ee8625f271f00f557c17c09626fb SHA512 29b50f3530c29b158d65dadfdbac8a45fdf06e22b0f6e8de0596aca78e4e410ca99cadf0aeb7a6b23b6d7c1df1e40ae179fe380c5a3a9d89f7425a222d1ca444 -DIST gnome-keyring-3.31.91.tar.xz 1365052 BLAKE2B fed6ac7bb5a509e268180d047cd5df1564d5a90672f5240fa98773f43d9ca7eb63c598d81c4a9de8e988ee5886679bceeb4be1c43acce876680aeb3df4385856 SHA512 c66ad13fd84764f01e75de2d6142ecb42954d6111f86738c27e7b5b94e702be2af5af7f83ba4e4b9aae58cfa04f3973e272c8177179d1f8a54f63c037aea0210 DIST gnome-keyring-3.34.0.tar.xz 1333768 BLAKE2B 0237eb7ac0b7146d096c58cac4c788a92680f1a6dd321949f295935bde206263e5ee1762c9d393dfbc10322d018e835333c823d11e8af5dc01434555886626dd SHA512 09f84bdf5ea415a55baf6a57dba2889cdf592005d273335029107ea3f83152447b3263cd190810930aae41af22dd508e765e649da3c8a9afa127db1d298bb72a -EBUILD gnome-keyring-3.31.91-r1.ebuild 2383 BLAKE2B f2ddee230bedd954e6a10cadc22a385de8997f0f5d06083fce839587b315fd22192431dc9d0615d91b0a489bcd1f0ec59ffd5ddf0bbae5d149f6af3b3ca8b7bf SHA512 bfd026302224beba75a9147d9ecf2024ea7c6d59247e9719f936d0c86381b70775a1380cf3dc6b65844d6e440d32473cc6d553742b8cb0596e7a8ca632dcc46d -EBUILD gnome-keyring-3.34.0.ebuild 2156 BLAKE2B 6c195760ab52085ff4024683db08e40818f1013ced4e2c55750758e9b64c3f29d4ca88f4e77964db2fc64b8992a4cad74fe19f9c1724df4ac87fdf62de530aef SHA512 dabc257b626e45dd695ef166c32f25c5feefed9126eadb86c8463e580f7f3d5acaf3654e6c11efb569a5b0d9bd7011a00b80ca1e88fd55b2a0d2923813c3edfa +DIST gnome-keyring-3.36.0.tar.xz 1345360 BLAKE2B f37454e0e42dcc1fe7e29e95dcb8ca7bc2db10e6b262b796421b4fd38b87fe9128a4c2f129d28d14716a2f9a7d60061d4b345e9564e73a0587faf24a7d2b1194 SHA512 e5aed36ad109cbd2dcb534843f8565829366acc955cadc6e9bbe87ebbb6a8a907211aa3a42f7f26148ac69726af2f9238965707d1259319435bd20aa8c4859ed +EBUILD gnome-keyring-3.34.0.ebuild 2155 BLAKE2B 33f4ac2bf571ec23b33fa77706df8a077418abd1bafcbe3fb9e25dabf6d65b6db65423573bbcd801055827c70eacf8006b2835b04b8977cdf216a37539e18f1c SHA512 0a3ea6878b52ac8a5b837909b4e6874613bb8fc7cb6a52c3d86a30bf549ad88b5e494f3923cb3cddb44ba04bc12e9778076592a555285700b6d5826aee48139d +EBUILD gnome-keyring-3.36.0.ebuild 2162 BLAKE2B 0d2e6f13aa3da3e8be1216ff94a8b755e733e41012076994d7c4e93f2d848c9eab15bf8e0d20b00119d302bbb11fc0e57086e7b24059531447c19888a57e2e5e SHA512 b6451f6d8890cf877f7ab6bcef31b04400d5f40b58a15fc763c73b315b8e52bbc4d101347fc40f68fe18149b7cb79e0a189a7b79e9d148a1d81eae53475d84d1 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a diff --git a/gnome-base/gnome-keyring/files/3.31.91-fix-musl.patch b/gnome-base/gnome-keyring/files/3.31.91-fix-musl.patch deleted file mode 100644 index 85aebcd30012..000000000000 --- a/gnome-base/gnome-keyring/files/3.31.91-fix-musl.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7a8b7d2ebfbb831840e6d58dbb1109f4c31d6ba4 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno <dueno@src.gnome.org> -Date: Fri, 10 May 2019 15:47:33 +0200 -Subject: [PATCH] rpc-layer: fix build with musl-libc - -The recent POSIX suggests to include <sys/select.h> for select(). - -Reported by Anthony G. Basile. ---- - pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c b/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c -index 5024e1e1..b3fb6707 100644 ---- a/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c -+++ b/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c -@@ -34,6 +34,7 @@ - - #include <dlfcn.h> - #include <pthread.h> -+#include <sys/select.h> - - #define SOCKET_PATH "/tmp/gkm-rpc-daemon.sock" - --- -2.20.1 - diff --git a/gnome-base/gnome-keyring/files/3.31.91-race-fix1.patch b/gnome-base/gnome-keyring/files/3.31.91-race-fix1.patch deleted file mode 100644 index d965fd712770..000000000000 --- a/gnome-base/gnome-keyring/files/3.31.91-race-fix1.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8a948b3ac17f7d1b0ff31b0cf22e655054eb5c6b Mon Sep 17 00:00:00 2001 -From: Benjamin Berg <bberg@redhat.com> -Date: Tue, 14 May 2019 17:36:56 +0200 -Subject: [PATCH 1/2] dbus-environment: Log Setenv call failure after - initialization - -When the GNOME session is already initialized at the point that Setenv -is called, then an error is returned. Hidding this error makes it hard -to understand why the environment was not setup if things failed. ---- - daemon/dbus/gkd-dbus-environment.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/daemon/dbus/gkd-dbus-environment.c b/daemon/dbus/gkd-dbus-environment.c -index 93e2b878..051de953 100644 ---- a/daemon/dbus/gkd-dbus-environment.c -+++ b/daemon/dbus/gkd-dbus-environment.c -@@ -49,15 +49,11 @@ on_setenv_reply (GObject *source, - res = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error); - - if (error != NULL) { -- gchar *dbus_error; -- dbus_error = g_dbus_error_get_remote_error (error); -- if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN) || -- g_strcmp0 (dbus_error, "org.gnome.SessionManager.NotInInitialization") == 0) -+ if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)) - g_debug ("couldn't set environment variable in session: %s", error->message); - else - g_message ("couldn't set environment variable in session: %s", error->message); - g_error_free (error); -- g_free (dbus_error); - } - - g_clear_pointer (&res, g_variant_unref); --- -2.20.1 - diff --git a/gnome-base/gnome-keyring/files/3.31.91-race-fix2.patch b/gnome-base/gnome-keyring/files/3.31.91-race-fix2.patch deleted file mode 100644 index c51ffbef44ad..000000000000 --- a/gnome-base/gnome-keyring/files/3.31.91-race-fix2.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 5d088356a9473c06564bd2cef18ca370437a17bc Mon Sep 17 00:00:00 2001 -From: Benjamin Berg <bberg@redhat.com> -Date: Tue, 14 May 2019 17:42:29 +0200 -Subject: [PATCH 2/2] dbus-environment: Make Setenv request synchronuous - -Currently there is a potential race condition where the Setenv request -races further session startup. i.e. the clients that are started with ---start on login may quit before the Setenv DBus call is delivered. This -opens a theoretical race condition where gnome-session is already past -the initialization phase when it serves the Setenv request. ---- - daemon/dbus/gkd-dbus-environment.c | 62 +++++++++++++++--------------- - 1 file changed, 30 insertions(+), 32 deletions(-) - -diff --git a/daemon/dbus/gkd-dbus-environment.c b/daemon/dbus/gkd-dbus-environment.c -index 051de953..acf398b9 100644 ---- a/daemon/dbus/gkd-dbus-environment.c -+++ b/daemon/dbus/gkd-dbus-environment.c -@@ -38,32 +38,13 @@ gkd_dbus_environment_cleanup (GDBusConnection *conn) - /* Nothing to do here */ - } - --static void --on_setenv_reply (GObject *source, -- GAsyncResult *result, -- gpointer user_data) --{ -- GError *error = NULL; -- GVariant *res; -- -- res = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error); -- -- if (error != NULL) { -- if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)) -- g_debug ("couldn't set environment variable in session: %s", error->message); -- else -- g_message ("couldn't set environment variable in session: %s", error->message); -- g_error_free (error); -- } -- -- g_clear_pointer (&res, g_variant_unref); --} -- - static void - setenv_request (GDBusConnection *conn, const gchar *env) - { - const gchar *value; - gchar *name; -+ GVariant *res; -+ GError *error = NULL; - - /* Find the value part of the environment variable */ - value = strchr (env, '='); -@@ -73,19 +54,36 @@ setenv_request (GDBusConnection *conn, const gchar *env) - name = g_strndup (env, value - env); - ++value; - -- g_dbus_connection_call (conn, -- SERVICE_SESSION_MANAGER, -- PATH_SESSION_MANAGER, -- IFACE_SESSION_MANAGER, -- "Setenv", -- g_variant_new ("(ss)", -- name, -- value), -- NULL, G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- on_setenv_reply, NULL); -+ /* Note: This call does not neccessarily need to be a sync call. However -+ * under certain conditions the process will quit immediately -+ * after emitting the call. This ensures that we wait long enough -+ * for the message to be sent out (could also be done using -+ * g_dbus_connection_flush() in the exit handler when called with -+ * --start) and also ensures that gnome-session has processed the -+ * DBus message before possibly thinking that the startup of -+ * gnome-keyring has finished and continuing with forking the -+ * shell. */ -+ res = g_dbus_connection_call_sync (conn, -+ SERVICE_SESSION_MANAGER, -+ PATH_SESSION_MANAGER, -+ IFACE_SESSION_MANAGER, -+ "Setenv", -+ g_variant_new ("(ss)", -+ name, -+ value), -+ NULL, G_DBUS_CALL_FLAGS_NONE, -+ -1, NULL, &error); -+ -+ if (error != NULL) { -+ if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)) -+ g_debug ("couldn't set environment variable in session: %s", error->message); -+ else -+ g_message ("couldn't set environment variable in session: %s", error->message); -+ g_error_free (error); -+ } - - g_free (name); -+ g_clear_pointer (&res, g_variant_unref); - } - - static void --- -2.20.1 - diff --git a/gnome-base/gnome-keyring/files/3.31.91-ssh-tests-fix.patch b/gnome-base/gnome-keyring/files/3.31.91-ssh-tests-fix.patch deleted file mode 100644 index f5344d349fee..000000000000 --- a/gnome-base/gnome-keyring/files/3.31.91-ssh-tests-fix.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 91bc9368ca2eedef0dec3f5aa81f641ced07a9b6 Mon Sep 17 00:00:00 2001 -From: Simon McVittie <smcv@debian.org> -Date: Sat, 9 Mar 2019 17:56:55 +0000 -Subject: [PATCH] test-gkd-ssh-agent-service: Avoid race condition with server - thread - -These tests create a server thread in setup() and join it in teardown(), -but there are various race conditions between them that can cause the -test to hang. These are particularly reproducible when building on a -single-CPU machine or VM, and particularly in the startup_shutdown -test (which doesn't do anything, so it runs teardown() immediately -after setup()). - -It's possible to get this preemption pattern: - - ___ Main thread ___ ___ Server thread ___ - g_thread_new() (starts) - g_cond_wait() (blocks) - ... - g_cond_signal() - (gets preempted here) - exit setup() - enter teardown() - g_main_loop_quit() - g_main_loop_run() - -which means g_main_loop_run() will never terminate, because it wasn't -running yet when the main thread told the GMainLoop to quit, and the -main thread won't tell it to quit again. - -One way to solve this would be for the server thread to signal -test->cond from an idle callback instead of directly from -server_thread(), to guarantee that the GMainLoop is already running. -However, it seems easier to reason about if we avoid GMainLoop and -iterate the main context directly. - -Signed-off-by: Simon McVittie <smcv@debian.org> -Bug-Debian: https://bugs.debian.org/909416 ---- - daemon/ssh-agent/test-gkd-ssh-agent-service.c | 23 +++++++++---------- - 1 file changed, 11 insertions(+), 12 deletions(-) - -diff --git a/daemon/ssh-agent/test-gkd-ssh-agent-service.c b/daemon/ssh-agent/test-gkd-ssh-agent-service.c -index 9a9ead99..5c7a6179 100644 ---- a/daemon/ssh-agent/test-gkd-ssh-agent-service.c -+++ b/daemon/ssh-agent/test-gkd-ssh-agent-service.c -@@ -38,7 +38,8 @@ typedef struct { - EggBuffer req; - EggBuffer resp; - GkdSshAgentService *service; -- GMainLoop *loop; -+ GMainContext *server_thread_context; -+ volatile gint server_thread_stop; - GSocketConnection *connection; - GThread *thread; - GMutex lock; -@@ -49,13 +50,9 @@ static gpointer - server_thread (gpointer data) - { - Test *test = data; -- GMainContext *context; - gboolean ret; - -- context = g_main_context_new (); -- test->loop = g_main_loop_new (context, FALSE); -- -- g_main_context_push_thread_default (context); -+ g_main_context_push_thread_default (test->server_thread_context); - - ret = gkd_ssh_agent_service_start (test->service); - g_assert_true (ret); -@@ -64,12 +61,10 @@ server_thread (gpointer data) - g_cond_signal (&test->cond); - g_mutex_unlock (&test->lock); - -- g_main_loop_run (test->loop); -+ while (g_atomic_int_get (&test->server_thread_stop) == 0) -+ g_main_context_iteration (test->server_thread_context, TRUE); - -- g_main_context_pop_thread_default (context); -- -- g_main_context_unref (context); -- g_main_loop_unref (test->loop); -+ g_main_context_pop_thread_default (test->server_thread_context); - - return NULL; - } -@@ -139,6 +134,7 @@ setup (Test *test, gconstpointer unused) - - g_mutex_init (&test->lock); - g_cond_init (&test->cond); -+ test->server_thread_context = g_main_context_new (); - - test->thread = g_thread_new ("ssh-agent", server_thread, test); - -@@ -151,9 +147,12 @@ setup (Test *test, gconstpointer unused) - static void - teardown (Test *test, gconstpointer unused) - { -- g_main_loop_quit (test->loop); -+ g_atomic_int_set (&test->server_thread_stop, 1); -+ g_main_context_wakeup (test->server_thread_context); - g_thread_join (test->thread); - -+ g_main_context_unref (test->server_thread_context); -+ - g_clear_object (&test->connection); - - gkd_ssh_agent_service_stop (test->service); --- -2.20.1 - diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild index 3cf79815c5f4..1b51ccc219c5 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2+" SLOT="0" IUSE="+caps pam selinux +ssh-agent test" RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 RDEPEND=" diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild index 32f17ef73c92..6cc05b7b3b51 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2+" SLOT="0" IUSE="+caps pam selinux +ssh-agent test" RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 RDEPEND=" @@ -38,12 +38,6 @@ DEPEND="${RDEPEND} " PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512 -PATCHES=( - "${FILESDIR}"/${PV}-race-fix{1,2}.patch # fix race issues on start, where sometimes keyring doesn't work after login; from origin/master - "${FILESDIR}"/${PV}-ssh-tests-fix.patch - "${FILESDIR}"/${PV}-fix-musl.patch -) - pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest index 382b321c8877..ac703925a9ee 100644 --- a/gnome-base/gnome-light/Manifest +++ b/gnome-base/gnome-light/Manifest @@ -1,2 +1,3 @@ EBUILD gnome-light-3.34.4.ebuild 2060 BLAKE2B 1b60f2198f285e4c5bf9682aec0cf2bffcd95e349c0e24cc82b1b3f16be506c4322c1acf1d5d63c53b6256f5f4bb256da67133f53ce0affbb49ed30b97b2cbbb SHA512 5593d45f556ad1761cc8039c0b2a412485f1bd5eeec4df6bbd69afe11e3215a7d6adc52aad0757f4c6fdab49568ebf1a7d882f48cf4191f7dbe2f46b443bf7fa +EBUILD gnome-light-3.36.5.ebuild 1972 BLAKE2B 01ea614087906c40900dbea6692b0689a32e6e19b65e1abb0d593c762b5a2a0b9cf8cb085a9421aeb41694631da72775ef562c45f48ce5e4d2ceefd7e689a717 SHA512 52b32c5e225a4de4ef9be2bc4360bda328142745382702aca20bf3a8604e7e9bd844a82132e2e4b29802369e6e77fdea729f77677d87bc6fe87ef9e342fa9331 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047 diff --git a/gnome-base/gnome-light/gnome-light-3.36.5.ebuild b/gnome-base/gnome-light/gnome-light-3.36.5.ebuild new file mode 100644 index 000000000000..c3b29d3732c8 --- /dev/null +++ b/gnome-base/gnome-light/gnome-light-3.36.5.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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" + +KEYWORDS="~amd64 ~arm ~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.36.0 + >=gnome-base/gnome-settings-daemon-3.36.1[cups?] + >=gnome-base/gnome-control-center-3.36.4[cups?] + + >=gnome-base/nautilus-3.36.3 + + gnome-shell? ( + >=x11-wm/mutter-${PV} + >=dev-libs/gjs-1.64.4 + >=gnome-base/gnome-shell-${PV} + >=media-fonts/cantarell-0.201 ) + + >=x11-themes/adwaita-icon-theme-3.36.1 + >=x11-themes/gnome-themes-standard-3.28 + >=x11-themes/gnome-backgrounds-${P_RELEASE} + + >=x11-terms/gnome-terminal-3.36.2 +" +# adwaita-icon-theme kept back on purpose due to brokenness without rust librsvg, +# in the hope that the old icon package version is good enough for everything too +# until librsvg gets updated. This dep should be raised to 3.34 with 3.34.5 meta. +DEPEND="" +PDEPEND=">=gnome-base/gvfs-1.44.1" +BDEPEND="" +S="${WORKDIR}" + +pkg_pretend() { + if ! use gnome-shell; then + # Users probably want to use gnome-flashback, 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-menus/Manifest b/gnome-base/gnome-menus/Manifest index a6a4252d1a96..0ddb7d5d7a76 100644 --- a/gnome-base/gnome-menus/Manifest +++ b/gnome-base/gnome-menus/Manifest @@ -1,3 +1,5 @@ DIST gnome-menus-3.32.0.tar.xz 499680 BLAKE2B ee43c2be29f6d3f5eaf5369c3b3809fc2728564321853a6dd23df1d81138868f9be2f57d0bcd0eb69a509e224f77dc357a8c71afe569bfb1bbdb13ce3b80636f SHA512 8a429e092b1e4a1a794473d7cae611684321e797792e1063911ddcbb496140033838b348bc209b4c0566a13233cfa1144cae7a188a483abf34c5af6feb44a884 +DIST gnome-menus-3.36.0.tar.xz 502324 BLAKE2B 8bf1b0d4ac30a1e7f4c4e1b14ad3e2f718e974ec58fe8e8ab3c0d030c1cd1841a9cceb86d8909c0d0dcf128f19aecdd64350840f0cb25ed7cacdc2c95786f118 SHA512 e830e66639c2b6aebecf572188208d33b1515270e69af3f2c6f7a640d305a7b9c2bce10e5f520b3da1dea681b194fd14c551468ea5747aa333e649b5c46774e4 EBUILD gnome-menus-3.32.0.ebuild 914 BLAKE2B 99e48b0fd083fe6ae66e88a13065fed889595c08aedcbb3282e7c7cc4d4ae038186381755f17152e5e6389b8b12eac925274ba15aa5f0bb2c4379e87d6def0d5 SHA512 7b4e35a489dd31878e00c57b74eff5cc27ac62aed511c1b700b3a57e22730d5b5efaf91c06e1a7e74799c6c9f365a8e28cb0b298179f636a113851119418317b +EBUILD gnome-menus-3.36.0.ebuild 905 BLAKE2B edf5f17d43e79a0a39dccda061e6300bb349ca7be7d41c1fecd3eaa91a086924b901358f0ba9c7bcd6651c02396f2630ccfa33a6030e3164b4db35826b86d843 SHA512 b1aab3e11d0d51b984e27c67322a7a8437ad38cdf32a6e5a566c7f0d6fa7b322400d30839254e79521242c184cb8fad4726c93288e1d3497b4f7134164383557 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild new file mode 100644 index 000000000000..ad1ecffb8521 --- /dev/null +++ b/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit gnome2 + +DESCRIPTION="Library and layout configuration for the Desktop Menu fd.o specification" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + +IUSE="+introspection test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.29.15:2 + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) +" +DEPEND="${RDEPEND} + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig + test? ( dev-libs/gjs ) +" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +src_configure() { + # Do NOT compile with --disable-debug/--enable-debug=no + # It disables api usage checks + gnome2_src_configure \ + $(use_enable introspection) \ + --disable-static +} diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest index 94d16f095fe2..6ce705430b83 100644 --- a/gnome-base/gnome-panel/Manifest +++ b/gnome-base/gnome-panel/Manifest @@ -1,3 +1,5 @@ DIST gnome-panel-3.34.1.tar.xz 3072196 BLAKE2B 23fdfc0b78e13169ec6af92ee386ae3997536199c6f13406523e2deb6b696b90828ce614fc06115a83fdb6ec76fc14e0518f4eb839eabfbf29507d6fd4b2ab3d SHA512 6d43285cda00b2e9415cf11f47a51a00941ed294edefb411f7b40003ece814ac08da9d2ccfb167a0a91c7abb9eb17a7f70970ac4eb585ce665cca5fcfbddcf03 +DIST gnome-panel-3.36.2.tar.xz 3033016 BLAKE2B faf5b81c07eccca9d78ed56be9e124e8f909bb577739810a059135cd6afc9cd293b5a023a129063c48168029a1f9a2dd6fd9c714f80e0c566f820291dd15217f SHA512 cbd7eaf1778dd3f6751c020540c243b02787feb5781195fd5db008fc66683ea5330d89ab0f2c740020695c4da7856b5678491ec3e711d6ce41e884a0374e937b EBUILD gnome-panel-3.34.1.ebuild 2039 BLAKE2B 5bf63597da3c5e9f14bcfc399527c8f4b7a920f8aa5334cab00e9c893685bf152a6a47d5b4342181f7d695b9caec35d209da9a48cb0027e0f93013a49bcfab3f SHA512 a317f14f4559c6e99a6a691958f6753dd78bfe8a3c42313e678ef9ea51868f548aecde0b398b5491e5b8e320988bc8d30af2994cf9022c3176d65fcbe4231fa0 +EBUILD gnome-panel-3.36.2.ebuild 2011 BLAKE2B b6f82a356aa2255d88bfd1c439ae050fef9808f5b5e9688cb576f233e7cef483f23ff5de8bb5c8dd7a6186379ba6a242da71d0e7aa16485226ab284c08f6acd0 SHA512 7f0f79524bd02cb31cd1409e87102d0eb68b347c9e901c8039bbd98220a91eb11ec4ad6f2ab14cdedd6415f61a29408724b1bda94d045979fcde82f8fcc1b362 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild b/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild new file mode 100644 index 000000000000..a2d70aaaaf63 --- /dev/null +++ b/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eapi7-ver gnome2 + +DESCRIPTION="The GNOME Flashback Panel" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/" + +LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+" +SLOT="0" +IUSE="eds elogind systemd" +REQUIRED_USE="^^ ( elogind systemd )" +KEYWORDS="~amd64" + +RDEPEND=" + >=gnome-base/gnome-desktop-2.91.0:3= + >=x11-libs/gdk-pixbuf-2.26.0:2 + >=x11-libs/pango-1.15.4 + >=dev-libs/glib-2.45.3:2 + >=x11-libs/gtk+-3.22.0:3[X] + >=x11-libs/libwnck-3.4.6:3 + >=gnome-base/gnome-menus-3.7.90:3 + eds? ( >=gnome-extra/evolution-data-server-3.33.2:= + ) + elogind? ( >=sys-auth/elogind-230 ) + systemd? ( >=sys-apps/systemd-230:= ) + >=x11-libs/cairo-1.0.0[X,glib] + >=dev-libs/libgweather-3.28.0:2= + >=gnome-base/dconf-0.13.4 + >=x11-libs/libXrandr-1.3.0 + gnome-base/gdm + x11-libs/libX11 + x11-libs/libXi + sys-auth/polkit + x11-libs/libXi +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + x11-base/xorg-proto +" # yelp-tools and autoconf-archive for eautoreconf + +src_configure() { + local myconf=( + --disable-static + $(use_enable eds) + ) + + # Below elogind MENU_* pkg-config calls need to match up with what upstream has + # each version (libsystemd replaced with libelogind). Explicit per-version die + # to force a manual recheck. Only update the explicit version if the + # "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust + # elogind conditional block below accordingly first. + if ver_test ${PV} -ne 3.36.2; then + die "Maintainer has not checked over packages MENU pkg-config deps for elogind support" + fi + + if use elogind; then + myconf+=( + MENU_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind 2>/dev/null` + MENU_LIBS=`pkg-config --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind 2>/dev/null` + ) + fi + + gnome2_src_configure "${myconf[@]}" +} diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index 2081497ee3e9..f201d34a596a 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -3,7 +3,12 @@ AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5b AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 AUX defaults.list-r4 18853 BLAKE2B abf7b422bf6e0e7dc04e26416d54018f3fb04ff6b4bfe8aed122e3b918cf840e5b8df8bb68c5ebb5ffed9d95b530581e10c03f7b4454ffe23fd8993253ce2898 SHA512 1d282ab6a139f6e0f0309263ca736dc2eeca0490f25a740583a24cd4f84a21531aaa0bd916d0809844e928029a434acdb3922305ce1253241ff62938c13c4eae +AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac DIST gnome-session-3.34.2-patchset.tar.xz 10196 BLAKE2B f79331c554b3004dc92d6b9d78ecb9575ad9ff071ef443ba4dca47e358e1c9bc2ecad3a43298bec7ad9e33aa85cb3fbc400f0a8739e6b1b1ebcfe3b8fd590ee5 SHA512 50d0d99bc594abdd05b2351c00db7f170282459360aaac0148a224d7e30e99283588596e84ff82bffab647cfd6a01a306a5c951da77d68e50ad8e146d3aae62a DIST gnome-session-3.34.2.tar.xz 474692 BLAKE2B 5b928a4632966bc12ff94ae76079cd39352dc7008e9a1044ccc63e1ba588d26a6a5812a69a995f86cef6f9f2f18ae2865793dd28335218308ada85969966fb75 SHA512 23388420ee117596b73ac057d2376857db726fb727fdeff4e4f420e7742622e81baef439adb04d8659a6979e5b7043c72ea334c1179974950476489a8c397182 +DIST gnome-session-3.36.0-patchset.tar.xz 22624 BLAKE2B 33518973a5e7c810b9aef165bcd62d41641908fa329dcefc784073966514aad5aa8919037722043c6cb0ddca86b4c2444b614d773aa777d737d49fdb3acad8e5 SHA512 c80ae41bcaa876ebb2c2d2a47d7bbcb58a3fe417ce0727e1aa3f384c4ae848bd3f1e27bd706af478f8e93c921efef578085d2c999efd06fd8d7c8704e170a56a +DIST gnome-session-3.36.0.tar.xz 475492 BLAKE2B b539c4646b746198aceba65708f758fc875614d342b66f8b12643a7235dcc043b78d7e2502ca9f45159f5b4080528ff8b92c98b67acb77fe7f71386ec282b773 SHA512 234456e8617524a3b95afb505246823ced4eca3ca009d48fc0bde70f8c620814495b04509c134bfb72760619990cc7cb7363ba13f0d90d9f038e8a43eadb6e9d EBUILD gnome-session-3.34.2.ebuild 3992 BLAKE2B 0c65c6a8ec8e14cc03a78ead0e84a676e024d42bddb23911847e84de81d9234a1b3b8110ba054f3d6889f13f0932c8b553bf18584b0a7dd6bc49b386fe108a9a SHA512 809e0a482a8149151393f7ece8b544505f4d14a00e703831173eaa6182ae8baf9092acb7232f05dbf9b3e7f7753a6d97594f3d8787c1e2436452962f89e5caa1 +EBUILD gnome-session-3.36.0-r1.ebuild 3885 BLAKE2B 263413e56538345d94380af49071c4952a71642c1cb495b4bd1ac90c60bf5eedf77d2dfccf84bac257ae319f0f66aa84fe6c524b48f15fc4ca5be5accb715aac SHA512 3a7af1c219976a05014122557adb6bd33300408125e24e463317c1154cef96d476c7c47b7d7dd32bcde699af7f543415b22f66a08528768e3b4be854666ea7c6 +EBUILD gnome-session-3.36.0.ebuild 3885 BLAKE2B 4e1160342b21bd78bc65b47780e9f62053b28e1628e7cf5a737b3147a4a5aad5eebc69a90104e73f0f95f3e00aefac3273810dfa5340aae0d94cd33830201758 SHA512 0770a77d8ec4abe3b615c68fb4a02074a6ef77900e063cfba4a6cd9eaaecf3888752fe1764dc90a035a7c563e1865d19b82815d134f14a217b5870818d956331 MISC metadata.xml 440 BLAKE2B 83fb0d37323db0c6105b3c231b6ecb7c4344bcd40577f23581af437fb4c4c330a77d2b8b19c9c69a5b586fd4638e55a9153014c32214547bf2437da7c3a161e6 SHA512 93f57253eccec50c77ad84960af623482bb34ad7d1f00463b29ccb54c3f034b95aa1a489acbf5075aa97e37e9303c2973e126cb201c15b2785416d882810378b diff --git a/gnome-base/gnome-session/files/defaults.list-r5 b/gnome-base/gnome-session/files/defaults.list-r5 new file mode 100644 index 000000000000..9ec18d1b8a63 --- /dev/null +++ b/gnome-base/gnome-session/files/defaults.list-r5 @@ -0,0 +1,336 @@ +[Default Applications] +application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/x-abiword=abiword.desktop; +text/abiword=abiword.desktop; +text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop; +text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop; +text/x-abiword=abiword.desktop; +text/x-xml-abiword=abiword.desktop; +x-content/blank-bd=brasero.desktop;org.gnome.Nautilus.desktop; +x-content/blank-dvd=brasero.desktop;org.gnome.Nautilus.desktop; +x-content/blank-cd=brasero.desktop;org.gnome.Nautilus.desktop; +x-content/blank-hddvd=brasero.desktop;org.gnome.Nautilus.desktop; +application/x-dia-diagram=dia.desktop; +image/bmp=org.gnome.eog.desktop; +image/gif=org.gnome.eog.desktop; +image/jpeg=org.gnome.eog.desktop; +image/jpg=org.gnome.eog.desktop; +image/pjpeg=org.gnome.eog.desktop; +image/png=org.gnome.eog.desktop; +image/svg+xml=org.gnome.eog.desktop; +image/svg+xml-compressed=org.gnome.eog.desktop; +image/x-bmp=org.gnome.eog.desktop; +image/x-gray=org.gnome.eog.desktop; +image/x-icb=org.gnome.eog.desktop; +image/x-ico=org.gnome.eog.desktop; +image/x-pcx=org.gnome.eog.desktop; +image/x-png=org.gnome.eog.desktop; +image/x-portable-anymap=org.gnome.eog.desktop; +image/x-portable-bitmap=org.gnome.eog.desktop; +image/x-portable-graymap=org.gnome.eog.desktop; +image/x-portable-pixmap=org.gnome.eog.desktop; +image/x-xbitmap=org.gnome.eog.desktop; +image/x-xpixmap=org.gnome.eog.desktop; +image/vnd.wap.wbmp=org.gnome.eog.desktop; +image/g3fax=gimp.desktop;zzz-gimp.desktop; +image/x-compressed-xcf=gimp.desktop;zzz-gimp.desktop; +image/x-fits=gimp.desktop;zzz-gimp.desktop; +image/x-icon=gimp.desktop;zzz-gimp.desktop; +image/x-psd=gimp.desktop;zzz-gimp.desktop; +image/x-sgi=gimp.desktop;zzz-gimp.desktop; +image/x-sun-raster=gimp.desktop;zzz-gimp.desktop; +image/x-tga=gimp.desktop;zzz-gimp.desktop; +image/x-xcf=gimp.desktop;zzz-gimp.desktop; +image/x-xwindowdump=gimp.desktop;zzz-gimp.desktop; +application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop; +text/html=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop; +application/pdf=org.gnome.Evince.desktop;evince.desktop; +application/x-bzpdf=org.gnome.Evince.desktop;evince.desktop; +application/x-gzpdf=org.gnome.Evince.desktop;evince.desktop; +application/postscript=org.gnome.Evince.desktop;evince.desktop; +application/x-bzpostscript=org.gnome.Evince.desktop;evince.desktop; +application/x-gzpostscript=org.gnome.Evince.desktop;evince.desktop; +image/x-eps=org.gnome.Evince.desktop;evince.desktop; +image/x-bzeps=org.gnome.Evince.desktop;evince.desktop; +image/x-gzeps=org.gnome.Evince.desktop;evince.desktop; +application/x-dvi=org.gnome.Evince.desktop;evince.desktop; +application/x-bzdvi=org.gnome.Evince.desktop;evince.desktop; +application/x-gzdvi=org.gnome.Evince.desktop;evince.desktop; +image/vnd.djvu=org.gnome.Evince.desktop;evince.desktop; +image/tiff=org.gnome.Evince.desktop;evince.desktop; +application/x-cbr=org.gnome.Evince.desktop;evince.desktop; +application/x-cbz=org.gnome.Evince.desktop;evince.desktop; +application/x-cb7=org.gnome.Evince.desktop;evince.desktop; +application/x-7z-compressed=org.gnome.FileRoller.desktop; +application/x-7z-compressed-tar=org.gnome.FileRoller.desktop; +application/x-ace=org.gnome.FileRoller.desktop; +application/x-alz=org.gnome.FileRoller.desktop; +application/x-ar=org.gnome.FileRoller.desktop; +application/x-arj=org.gnome.FileRoller.desktop; +application/x-bzip=org.gnome.FileRoller.desktop; +application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop; +application/x-bzip1=org.gnome.FileRoller.desktop; +application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop; +application/x-cabinet=org.gnome.FileRoller.desktop; +application/x-cd-image=org.gnome.FileRoller.desktop; +application/x-compress=org.gnome.FileRoller.desktop; +application/x-compressed-tar=org.gnome.FileRoller.desktop; +application/x-cpio=org.gnome.FileRoller.desktop; +application/x-deb=org.gnome.FileRoller.desktop; +application/x-ear=org.gnome.FileRoller.desktop; +application/x-gtar=org.gnome.FileRoller.desktop; +application/x-gzip=org.gnome.FileRoller.desktop; +application/x-java-archive=org.gnome.FileRoller.desktop; +application/x-lha=org.gnome.FileRoller.desktop; +application/x-lhz=org.gnome.FileRoller.desktop; +application/x-lzip=org.gnome.FileRoller.desktop; +application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop; +application/x-lzma=org.gnome.FileRoller.desktop; +application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop; +application/x-lzop=org.gnome.FileRoller.desktop; +application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop; +application/x-rar=org.gnome.FileRoller.desktop; +application/x-rar-compressed=org.gnome.FileRoller.desktop; +application/x-rpm=org.gnome.FileRoller.desktop; +application/x-rzip=org.gnome.FileRoller.desktop; +application/x-tar=org.gnome.FileRoller.desktop; +application/x-tarz=org.gnome.FileRoller.desktop; +application/x-source-rpm=org.gnome.FileRoller.desktop; +application/x-stuffit=org.gnome.FileRoller.desktop; +application/x-war=org.gnome.FileRoller.desktop; +application/x-xz=org.gnome.FileRoller.desktop; +application/x-xz-compressed-tar=org.gnome.FileRoller.desktop; +application/x-zip=org.gnome.FileRoller.desktop; +application/x-zip-compressed=org.gnome.FileRoller.desktop; +application/x-zoo=org.gnome.FileRoller.desktop; +application/zip=org.gnome.FileRoller.desktop; +multipart/x-zip=org.gnome.FileRoller.desktop; +text/plain=org.gnome.gedit.desktop; +text/css=org.gnome.gedit.desktop; +text/javascript=org.gnome.gedit.desktop; +text/markdown=org.gnome.gedit.desktop; +text/mathml=org.gnome.gedit.desktop; +text/x-csrc=org.gnome.gedit.desktop; +text/x-chdr=org.gnome.gedit.desktop; +text/x-dtd=org.gnome.gedit.desktop; +text/x-java=org.gnome.gedit.desktop; +text/x-javascript=org.gnome.gedit.desktop; +text/x-patch=org.gnome.gedit.desktop; +text/x-perl=org.gnome.gedit.destkop +text/x-php=org.gnome.gedit.destkop +text/x-python=org.gnome.gedit.destkop +text/x-sql=org.gnome.gedit.desktop; +text/xml=org.gnome.gedit.desktop; +application/javascript=org.gnome.gedit.destkop +application/x-cgi=org.gnome.gedit.desktop; +application/x-javascript=org.gnome.gedit.desktop; +application/x-perl=org.gnome.gedit.desktop; +application/x-php=org.gnome.gedit.desktop; +application/x-python=org.gnome.gedit.desktop; +application/xml=org.gnome.gedit.desktop; +application/xml-dtd=org.gnome.gedit.desktop; +application/x-font-ttf=org.gnome.font-viewer.desktop; +application/x-font-pcf=org.gnome.font-viewer.desktop; +application/x-font-type1=org.gnome.font-viewer.desktop; +application/x-font-otf=org.gnome.font-viewer.desktop; +application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-applix-spreadsheet=gnumeric.desktop; +application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-gnumeric=gnumeric.desktop; +application/x-mps=gnumeric.desktop; +application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-oleo=gnumeric.desktop; +application/x-planperfect=gnumeric.desktop; +application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-sc=gnumeric.desktop; +application/x-sylk=gnumeric.desktop; +application/x-xbase=gnumeric.desktop; +application/x-xls=gnumeric.desktop; +application/xls=gnumeric.desktop; +text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +zz-application/zz-winassoc-xls=gnumeric.desktop; +x-content/software=nautilus-autorun-software.desktop; +x-content/unix-software=nautilus-autorun-software.desktop; +x-directory/gnome-default-handler=org.gnome.Nautilus.desktop; +x-directory/normal=org.gnome.Nautilus.desktop; +inode/directory=org.gnome.Nautilus.desktop; +application/x-gnome-saved-search=org.gnome.Nautilus.desktop; +application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop; +application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop; +application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop; +application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop; +application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop; +application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop; +application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop; +application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop; +application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop; +x-content/audio-player=rhythmbox.desktop; +x-content/audio-cdda=org.gnome.SoundJuicer.desktop; +application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop; +application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop; +application/mxf=org.gnome.Totem.desktop; +application/ogg=org.gnome.Totem.desktop; +application/ram=org.gnome.Totem.desktop; +application/sdp=org.gnome.Totem.desktop; +application/smil=org.gnome.Totem.desktop; +application/smil+xml=org.gnome.Totem.desktop; +application/vnd.ms-wpl=org.gnome.Totem.desktop; +application/vnd.rn-realmedia=org.gnome.Totem.desktop; +application/x-extension-m4a=org.gnome.Totem.desktop; +application/x-extension-mp4=org.gnome.Totem.desktop; +application/x-flac=org.gnome.Totem.desktop; +application/x-flash-video=org.gnome.Totem.desktop; +application/x-matroska=org.gnome.Totem.desktop; +application/x-netshow-channel=org.gnome.Totem.desktop; +application/x-ogg=org.gnome.Totem.desktop; +application/x-quicktime-media-link=org.gnome.Totem.desktop; +application/x-quicktimeplayer=org.gnome.Totem.desktop; +application/x-shorten=org.gnome.Totem.desktop; +application/x-smil=org.gnome.Totem.desktop; +application/xspf+xml=org.gnome.Totem.desktop; +audio/3gpp=org.gnome.Totem.desktop; +audio/ac3=org.gnome.Totem.desktop; +audio/AMR=org.gnome.Totem.desktop; +audio/AMR-WB=org.gnome.Totem.desktop; +audio/basic=org.gnome.Totem.desktop; +audio/midi=org.gnome.Totem.desktop; +audio/mp4=org.gnome.Totem.desktop; +audio/mpeg=org.gnome.Totem.desktop; +audio/mpegurl=org.gnome.Totem.desktop; +audio/ogg=org.gnome.Totem.desktop; +audio/prs.sid=org.gnome.Totem.desktop; +audio/vnd.rn-realaudio=org.gnome.Totem.desktop; +audio/x-ape=org.gnome.Totem.desktop; +audio/x-flac=org.gnome.Totem.desktop; +audio/x-gsm=org.gnome.Totem.desktop; +audio/x-it=org.gnome.Totem.desktop; +audio/x-m4a=org.gnome.Totem.desktop; +audio/x-matroska=org.gnome.Totem.desktop; +audio/x-mod=org.gnome.Totem.desktop; +audio/x-mp3=org.gnome.Totem.desktop; +audio/x-mpeg=org.gnome.Totem.desktop; +audio/x-mpegurl=org.gnome.Totem.desktop; +audio/x-ms-asf=org.gnome.Totem.desktop; +audio/x-ms-asx=org.gnome.Totem.desktop; +audio/x-ms-wax=org.gnome.Totem.desktop; +audio/x-ms-wma=org.gnome.Totem.desktop; +audio/x-musepack=org.gnome.Totem.desktop; +audio/x-pn-aiff=org.gnome.Totem.desktop; +audio/x-pn-au=org.gnome.Totem.desktop; +audio/x-pn-realaudio=org.gnome.Totem.desktop; +audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop; +audio/x-pn-wav=org.gnome.Totem.desktop; +audio/x-pn-windows-acm=org.gnome.Totem.desktop; +audio/x-realaudio=org.gnome.Totem.desktop; +audio/x-real-audio=org.gnome.Totem.desktop; +audio/x-sbc=org.gnome.Totem.desktop; +audio/x-scpls=org.gnome.Totem.desktop; +audio/x-speex=org.gnome.Totem.desktop; +audio/x-tta=org.gnome.Totem.desktop; +audio/x-vorbis=org.gnome.Totem.desktop; +audio/x-vorbis+ogg=org.gnome.Totem.desktop; +audio/x-wav=org.gnome.Totem.desktop; +audio/x-wavpack=org.gnome.Totem.desktop; +audio/x-xm=org.gnome.Totem.desktop; +image/vnd.rn-realpix=org.gnome.Totem.desktop; +image/x-pict=org.gnome.Totem.desktop; +misc/ultravox=org.gnome.Totem.desktop; +text/google-video-pointer=org.gnome.Totem.desktop; +text/x-google-video-pointer=org.gnome.Totem.desktop; +video/3gpp=org.gnome.Totem.desktop; +video/dv=org.gnome.Totem.desktop; +video/fli=org.gnome.Totem.desktop; +video/flv=org.gnome.Totem.desktop; +video/mp2t=org.gnome.Totem.desktop; +video/mp4=org.gnome.Totem.desktop; +video/mp4v-es=org.gnome.Totem.desktop; +video/mpeg=org.gnome.Totem.desktop; +video/msvideo=org.gnome.Totem.desktop; +video/ogg=org.gnome.Totem.desktop; +video/quicktime=org.gnome.Totem.desktop; +video/vivo=org.gnome.Totem.desktop; +video/vnd.divx=org.gnome.Totem.desktop; +video/vnd.rn-realvideo=org.gnome.Totem.desktop; +video/vnd.vivo=org.gnome.Totem.desktop; +video/webm=org.gnome.Totem.desktop; +video/x-anim=org.gnome.Totem.desktop; +video/x-avi=org.gnome.Totem.desktop; +video/x-flc=org.gnome.Totem.desktop; +video/x-fli=org.gnome.Totem.desktop; +video/x-flic=org.gnome.Totem.desktop; +video/x-flv=org.gnome.Totem.desktop; +video/x-m4v=org.gnome.Totem.desktop; +video/x-matroska=org.gnome.Totem.desktop; +video/x-mpeg=org.gnome.Totem.desktop; +video/x-ms-asf=org.gnome.Totem.desktop; +video/x-ms-asx=org.gnome.Totem.desktop; +video/x-msvideo=org.gnome.Totem.desktop; +video/x-ms-wm=org.gnome.Totem.desktop; +video/x-ms-wmv=org.gnome.Totem.desktop; +video/x-ms-wmx=org.gnome.Totem.desktop; +video/x-ms-wvx=org.gnome.Totem.desktop; +video/x-nsv=org.gnome.Totem.desktop; +video/x-ogm+ogg=org.gnome.Totem.desktop; +video/x-theora+ogg=org.gnome.Totem.desktop; +video/x-totem-stream=org.gnome.Totem.desktop; +x-content/video-dvd=org.gnome.Totem.desktop; +x-content/video-vcd=org.gnome.Totem.desktop; +x-content/video-svcd=org.gnome.Totem.desktop; +x-scheme-handler/ghelp=yelp.desktop; +x-scheme-handler/help=yelp.desktop; +x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop; +x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop; +x-scheme-handler/mailto=org.gnome.Evolution.desktop;evolution.desktop; diff --git a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild new file mode 100644 index 000000000000..3e4be186878c --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Gnome session manager" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="consolekit doc elogind systemd" +# There is a null backend available, thus ?? not ^^ +# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback +REQUIRED_USE="?? ( elogind systemd )" + +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.34.2:3= + >=dev-libs/json-glib-0.10 + media-libs/mesa[egl,gles2,X(+)] + media-libs/libepoxy + x11-libs/libXcomposite + + systemd? ( >=sys-apps/systemd-183:0= ) + elogind? ( >=sys-auth/elogind-239.4 ) + consolekit? ( >=dev-libs/dbus-glib-0.76 ) +" + +# Pure-runtime deps from the session files should *NOT* be added here. +# >=gnome-settings-daemon-3.35.91 for UsbProtection required component. +# 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="${DEPEND} + >=gnome-base/gnome-settings-daemon-3.35.91 + >=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 +" +BDEPEND=" + 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=( + # Various patches from master (no 3-36 branch yet) + elogind support + "${WORKDIR}"/patches/ +) + +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) + -Dsystemd_session=$(usex systemd default disable) + $(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-r5" 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/gnome-session-3.36.0.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0.ebuild new file mode 100644 index 000000000000..4f42ede4e067 --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-3.36.0.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Gnome session manager" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="consolekit doc elogind systemd" +# There is a null backend available, thus ?? not ^^ +# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback +REQUIRED_USE="?? ( elogind systemd )" + +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.34.2:3= + >=dev-libs/json-glib-0.10 + media-libs/mesa[egl,gles2,X(+)] + media-libs/libepoxy + x11-libs/libXcomposite + + systemd? ( >=sys-apps/systemd-183:0= ) + elogind? ( >=sys-auth/elogind-239.4 ) + consolekit? ( >=dev-libs/dbus-glib-0.76 ) +" + +# Pure-runtime deps from the session files should *NOT* be added here. +# >=gnome-settings-daemon-3.35.91 for UsbProtection required component. +# 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="${DEPEND} + >=gnome-base/gnome-settings-daemon-3.35.91 + >=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 +" +BDEPEND=" + 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=( + # Various patches from master (no 3-36 branch yet) + elogind support + "${WORKDIR}"/patches/ +) + +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) + -Dsystemd_session=$(usex systemd default disable) + $(meson_use systemd systemd_journal) + $(meson_use consolekit) + $(meson_use doc docbook) + -Dman=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + + dodir /etc/X11/Sessions + exeinto /etc/X11/Sessions + doexe "${FILESDIR}/Gnome" + + insinto /usr/share/applications + newins "${FILESDIR}/defaults.list-r4" gnome-mimeapps.list + + dodir /etc/X11/xinit/xinitrc.d/ + exeinto /etc/X11/xinit/xinitrc.d/ + newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome + + # This should be done here as discussed in bug #270852 + newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome + + # Set XCURSOR_THEME from current dconf setting instead of installing + # default cursor symlink globally and affecting other DEs (bug #543488) + # https://bugzilla.gnome.org/show_bug.cgi?id=711703 + newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then + ewarn "If you use a custom .xinitrc for your X session," + ewarn "make sure that the commands in the xinitrc.d scripts are run." + fi + + if ! use systemd && ! use elogind && ! use consolekit; then + ewarn "You are building without systemd, elogind and/or consolekit support." + ewarn "gnome-session won't be able to correctly track and manage your session." + fi +} + +pkg_postrm() { + xdg_pkg_postinst + gnome2_schemas_update +} diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 29adf574a46b..22a8c5da6862 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -2,5 +2,8 @@ AUX 3.32.1-fix-wacom-no-wayland.patch 811 BLAKE2B c817a6080438468d72c3633b878ba8 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b DIST gnome-settings-daemon-3.34.2-patchset.tar.xz 23824 BLAKE2B ce2b0720f340353ce9a27f81ac5b7a17ae44234596d80a183fe9dc69a6dd49c6b750a816b75c43df357436b32a74f48358602615c9b134cd12cd1d0d960ea2d1 SHA512 ba10afe2cd28592501c47b2eba8473a4a08d927a1fd292f738a2ae16df73e64a97e4520a680ace93c81755a60d9c378792d47b4028d1dbd3b0ff6514d5210f3d DIST gnome-settings-daemon-3.34.2.tar.xz 1397504 BLAKE2B a96728068a395892b67aa4b5f3223aa96d2f0d431d1836136483a5344ee2a490d2ad5a1978c265bc6d652ec3863b71f055405681fe0b2466b1a3bfd146712c4a SHA512 c5fab3af6d37dfb4dd9deff0656965699bb6c07f010c5040bb15b2fe5f7810b4815007975ad7a9841899ae1735273e394bb9539f32ab0464875cbb3648234f37 +DIST gnome-settings-daemon-3.36.1-patchset.tar.xz 79352 BLAKE2B 6daf9528f5aa4c6597a017f25da41039dd2c09b4a1c29dca2d72f20195bb93c9003de39df89a669996e13050538553fbf6ed4f738b1c6fae29e8825ba252d26a SHA512 fea4ecaadac102b0024c365ae2ba9e632ffeebab138bfc09b3f5bb0a7794c6efc779180023a73c6c884c7b64f7e8ac1ec40f1478231a5528c03829cd9273a58e +DIST gnome-settings-daemon-3.36.1.tar.xz 1415080 BLAKE2B 4026f3443b8dcab872ef54563b5fe8e89d6932373da0513d7d8c614616d396315f1e6a8d0be022aec82351b5cfe5868cbac5caeaa782d609885029fbbd1d91e3 SHA512 f2f43d9b772589b6b4212ee2b0afe8be79d50a2e0473a960c7a7b9d379222bbe84ca548114d0a247810a094b4b3bf41e40ca91173c6cf552517dc63eb3750c88 EBUILD gnome-settings-daemon-3.34.2.ebuild 3947 BLAKE2B aa788329a8496ea9acb029d1ee20b88c1d8e9dde8bc1a7d33f38b8471071074ba573b6f8d570eea2a6d70be5b6918a8c777a92a8e87ba8278b15a2a8ab2fed43 SHA512 83614be5327ee6d8eda65cf8d45925067a2629cb6cd06dd74a5bf64e2cdccd50ac476da2474d1581a2ead779e5fd7ee3a7d53b99decb59425b13fef5fca302b6 +EBUILD gnome-settings-daemon-3.36.1.ebuild 3909 BLAKE2B bcb5009e6dc8d338cf06853821e3416340b5dff2ed526fea90de03cf5be30753d24a4fffb56937f9cb748c515c33ff9d80ffd112efb815e389e7b8a2b3591d1b SHA512 7202e749672e18dd46ca94750d2111933f1183d6db57114b9a4ed183277446543efb8474af6aeaa320ed99365eba284c94703deaffb3d678c1a0141f0e2793c0 MISC metadata.xml 546 BLAKE2B 8b82608d88d30a327a48d46992c0c19cefd594682191bfe4649a0e090ff13c0a9b88adf4c4aa4b42f9393c21153130afbf2d5090d774b348cff3003b41e3cef3 SHA512 c1a8e1a648564c52fb00d68a67bcfea6b2f6369186ede54a7278f258ef9f6b0cc6f399fa5f9c8ee7846d97a6163729c8da970a0f2e93e23bfa2f84ebf2466cba diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild new file mode 100644 index 000000000000..07538907b839 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{3_6,3_7} ) + +inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg + +DESCRIPTION="Gnome Settings Daemon" +HOMEPAGE="https://gitlab.gnome.org/GNOME/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 modemmanager networkmanager smartcard systemd test +udev wayland" +REQUIRED_USE=" + ^^ ( elogind systemd ) + input_devices_wacom? ( udev ) + wayland? ( udev ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" + +DEPEND=" + >=sci-geosciences/geocode-glib-3.10 + >=dev-libs/glib-2.56:2 + >=gnome-base/gnome-desktop-3.34.2:3= + >=gnome-base/gsettings-desktop-schemas-3.35.91 + >=x11-libs/gtk+-3.15.3:3[X,wayland?] + >=dev-libs/libgweather-3.9.5:2= + colord? ( + >=x11-misc/colord-1.3.5:= + >=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.8:= + x11-libs/libX11 + udev? ( dev-libs/libgudev:= ) + wayland? ( dev-libs/wayland ) + input_devices_wacom? ( >=dev-libs/libwacom-0.7 + >=x11-libs/pango-1.20.0 + x11-libs/gdk-pixbuf:2 ) + smartcard? ( >=dev-libs/nss-3.11.2 ) + cups? ( >=net-print/cups-1.4[dbus] ) + modemmanager? ( >=app-crypt/gcr-3.7.5:= + >=net-misc/modemmanager-1.0:= ) + networkmanager? ( >=net-misc/networkmanager-1.0 ) + media-libs/alsa-lib + x11-libs/libXi + x11-libs/libXext + media-libs/fontconfig + systemd? ( sys-apps/systemd + sys-apps/dbus[user-session] ) +" +# logind needed for power and session management, bug #464944 +# gnome-session-3.33.90/gdm-3.33.90/gnome-shell-extensions-3.34.1/gnome-flashback-3.33.1 adapt to Clipboard and Mouse component removals (moved to mutter) +RDEPEND="${DEPEND} + gnome-base/dconf + elogind? ( sys-auth/elogind ) + !<gnome-base/gnome-session-3.33.90 + !<gnome-base/gdm-3.33.90 + !<gnome-extra/gnome-shell-extensions-3.34.1 + !<gnome-base/gnome-flashback-3.33.1 +" +# rfkill requires linux/rfkill.h (and USE=udev), thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead +BDEPEND=" + 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 +" + +PATCHES=( + # Updates from master branch after 3.36.1 (gnome-3-36 wasn't branched yet) + # 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)" + $(meson_use systemd) + -Dalsa=true + $(meson_use udev gudev) + $(meson_use colord) + $(meson_use cups) + $(meson_use networkmanager network_manager) + $(meson_use udev rfkill) + $(meson_use smartcard) + $(meson_use input_devices_wacom wacom) + $(meson_use wayland) + $(meson_use modemmanager wwan) + ) + meson_src_configure +} + +src_install() { + meson_src_install + # Don't auto-suspend by default on AC power + insinto /usr/share/glib-2.0/schemas + doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index 789c9fe20b81..5539b9ed888d 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,6 +1,12 @@ AUX 3.28.3-defaults.patch 1385 BLAKE2B d7e0495aadec7fa042086b5219cc34906f9333a446484e63d90932551d09f469e66cc5da43040a2bf955ecdb3d2beca0e1dba435dd7c309bbc78a1b7aba7f43b SHA512 190a9a61b164373e1f2528b96eca0312a7884651ee44212f686e5752430197b2644b67550dc41ed10684cccd0e8a0d870cfdeddf8582d57de637f7dad11d0124 AUX 3.34-optional-bluetooth.patch 1971 BLAKE2B bac967362e46cbd8b76368377c607573e34489b41b70441488086953f56581c8c77b013f848c079bb189188b5ac62de935fc55dd03f2bce725547079b344a27e SHA512 f3c8479090656f5655766a6fd790729e5c16c1b09f61f7b41485bdeee53e6e2ada7ecf7e641b8c8a9cb520a5db8a1bb4f5d0d005226bc5c08c1c553541e3e049 AUX 3.34.4-custom_stylesheet_crash.patch 17904 BLAKE2B cff95bf20f9b2e35daa885cbfb2e7490c968daefbcaac0a11287833d4cc23ca6c7e4e4ca52a523555da69e40ef0efd85cdeea8ad25f0943c887cabef22935bd4 SHA512 c0200c7759aa502b6d3ba4cbff789ab52d1510a0a0d7213c64e26e4773a58f1c7767b9fa2531a2c032943f08101b268453a462e7013d12cec96a32bfd3642c7e +AUX 3.34.5-CVE-2020-17489.patch 1717 BLAKE2B d92185c01f755b8aa1c54aa4c8ff57efa474a92ffe297b351f791266b1ad9f18bfddb17e19e241a0017149db5d5bb2da4b4472b853ca7e26ed34e1bda5c306af SHA512 ce9593eedae069156521e6836625d68abcfe30f65d993f7b0ec5a3f9accf8fef7aa74aa71ae289b5a1b10e7ac3de1bd28a8b61c2cf1038bdce304904da14eb65 +AUX 3.36-defaults.patch 1463 BLAKE2B c529ac85d19699d0837f4060011b8b7dd03773af4425ea27f4b87841ee6a77f222ee242e34550ca3807dc7330e0c411576f3e4e8dbbaacf684b7ca706133cc81 SHA512 f6656b0baaf53d919ee8ad54550909aed9b86280de3f6ac3667d6a3506834476024cf42087860a4ee431d74dbcfa1c066e37d6d012450d76dbfd498fe0f1fb46 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234 SHA512 ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4 +DIST gnome-shell-3.36.5-patchset.tar.xz 5296 BLAKE2B 6b353bd7714e2439590b74d25c964f06c8792337b22504b17cf37f4113bb0712d642fa1ab4fab9e1944544b3c57d6624c1758c97ef3b2f2a5ba2596305d4831e SHA512 669f8c2d5fe73c8f99f60ec38ac4b4fbf43e2d3667c1710f4f6179d77848f3f9d4245e22c128f41c1e594b44ba317b2430edbefa67c6886054d39726cdddd165 +DIST gnome-shell-3.36.5.tar.xz 1776080 BLAKE2B 82a53777a9fa56c3bd1c6914c1aefe85256d3cd640e95c9804b37c711360e09e758f536e9caee79c88d1686ffb3bc672f215cc454237922942edcec93f6bafd3 SHA512 e8cbcd9ee9643083870415fa3ea8ed0f1b6f2a138054f92e23479514c57b22afc38e3e082a89051f2be4e91e2dea3a68951a06eb0589f507825da9137d92e545 +EBUILD gnome-shell-3.34.5-r1.ebuild 6903 BLAKE2B 41758be694e28e790910602abe613065ad80fa2815559c675e9256f912a84dabea47d8f2e1949a4885ce74905f4ad1cf6cb16969ef73651f6662bf304f9e5349 SHA512 a4804d890b728a4e96538fc1bc3003db34cf54d31225ce4dd923a5d1f2c7a53768c30d46bafed1fcb9afc57d7227332b5b9e30129236873c3cf16c7142aa639d EBUILD gnome-shell-3.34.5.ebuild 6768 BLAKE2B 72b4934d79160c38f7868b4afddd6490cc936a0dbe73af07fcecd9f7c1434d4b96afcc036d53ac2b4d746429c9bd910c9333a97a994f64f757a1760136928302 SHA512 3a2cb1659aabe6995d27646fb5c1d5576335a96cc9b62f00e488b39694c4470f3f16185e92c71ea105449f2af6667511fff3fabfeb7d3a7b2a370412872d7357 +EBUILD gnome-shell-3.36.5.ebuild 6663 BLAKE2B a8539a191513d9f6d920c0c5ac77d8309a966bb77f1f145cb812c9db8043e991ead42b3e1731373986b672f2cc88ac7f1667cd29400c6fee80aee6b58af92f4a SHA512 6c2ae4013a23164b2a2d2f921c3481a48f37ad34b4afc693e12c3e8225014d4609a46d97560a7707c1908e88f7e1b25c2528f54ca59d4f17ace040c780fee23c MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06 diff --git a/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch new file mode 100644 index 000000000000..c6ed147c5a25 --- /dev/null +++ b/gnome-base/gnome-shell/files/3.34.5-CVE-2020-17489.patch @@ -0,0 +1,47 @@ +From e7f7da78d4d5a9abae780589810bd012300442e9 Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Mon, 27 Jul 2020 10:58:49 -0400 +Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in + +At the moment, if a user switches to the login screen vt, +the login screen fades in whatever was on screen prior, and +then does a reset. + +It makes more sense to reset first, so we fade in what the +user is going to interact with instead of what they interacted +with before. + +Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997 +(cherry picked from commit 13137aad9db52223e8b62cecbd3456f4a7f66f04) +--- + js/gdm/loginDialog.js | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js +index c3f90dc58..6b35ebb16 100644 +--- a/js/gdm/loginDialog.js ++++ b/js/gdm/loginDialog.js +@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({ + if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING) + return; + ++ if (this._authPrompt.verificationStatus !== AuthPrompt.AuthPromptStatus.NOT_VERIFYING) ++ this._authPrompt.reset(); ++ + this._bindOpacity(); + this.ease({ + opacity: 255, + duration: _FADE_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, +- onComplete: () => { +- if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING) +- this._authPrompt.reset(); +- this._unbindOpacity(); +- } ++ onComplete: () => this._unbindOpacity() + }); + } + +-- +2.20.1 + diff --git a/gnome-base/gnome-shell/files/3.36-defaults.patch b/gnome-base/gnome-shell/files/3.36-defaults.patch new file mode 100644 index 000000000000..0a4746ac46b7 --- /dev/null +++ b/gnome-base/gnome-shell/files/3.36-defaults.patch @@ -0,0 +1,28 @@ +From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 10 Dec 2013 23:33:51 +0100 +Subject: [PATCH 1/2] Alter list of default applications + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +[Updated to include desktop file renames to reverse DNS and 3.36 changes] +Signed-off-by: Mart Raudsepp <leio@gentoo.org> +--- + data/org.gnome.shell.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in +index c1e6b21..368c654 100644 +--- a/data/org.gnome.shell.gschema.xml.in ++++ b/data/org.gnome.shell.gschema.xml.in +@@ -31,7 +31,7 @@ + </description> + </key> + <key name="favorite-apps" type="as"> +- <default>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> ++ <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> + <summary>List of desktop file IDs for favorite applications</summary> + <description> + The applications corresponding to these identifiers +-- +2.10.1 + diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild new file mode 100644 index 000000000000..0aeebc31a62b --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.34.5-r1.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +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" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ?? ( elogind systemd )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" + +# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> +# FIXME: +# * gstreamer support is currently automagic +DEPEND=" + >=dev-libs/libcroco-0.6.8:0.6 + >=gnome-extra/evolution-data-server-3.33.1:= + >=app-crypt/gcr-3.7.5[introspection] + >=dev-libs/glib-2.57.2:2 + >=dev-libs/gobject-introspection-1.49.1:= + >=dev-libs/gjs-1.57.3 + >=x11-libs/gtk+-3.15.0:3[introspection] + >=x11-wm/mutter-3.34.0:0/5[introspection] + >=sys-auth/polkit-0.100[introspection] + >=gnome-base/gsettings-desktop-schemas-3.33.1 + >=x11-libs/startup-notification-0.11 + >=app-i18n/ibus-1.5.2 + >=gnome-base/gnome-desktop-3.32:3=[introspection] + bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) + >=media-libs/gstreamer-0.11.92:1.0 + media-libs/gst-plugins-base:1.0 + networkmanager? ( + >=net-misc/networkmanager-1.10.4:=[introspection] + net-libs/libnma[introspection] + >=app-crypt/libsecret-0.18 + dev-libs/dbus-glib ) + systemd? ( >=sys-apps/systemd-31 + >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) + elogind? ( >=sys-auth/elogind-237 ) + app-arch/gnome-autoar + dev-libs/json-glib + + >=app-accessibility/at-spi2-atk-2.5.3 + 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} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + ') + media-libs/mesa[X(+)] +" +# Runtime-only deps are probably incomplete and approximate. +# Introspection deps generated using: +# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq +# Each block: +# 1. Introspection stuff needed via imports.gi.* +# 2. gnome-session needed for shutdown/reboot/inhibitors/etc +# 3. Control shell settings +# 4. logind interface needed for suspending support +# 5. xdg-utils needed for xdg-open, used by extension tool +# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) +# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review +# 8. IBus is needed for nls integration +# 9. Optional telepathy chat integration +# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) +# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper +RDEPEND="${DEPEND} + >=sys-apps/accountsservice-0.6.14[introspection] + app-accessibility/at-spi2-core:2[introspection] + app-misc/geoclue[introspection] + >=dev-libs/libgweather-3.26:2[introspection] + >=sys-power/upower-0.99:=[introspection] + x11-libs/pango[introspection] + gnome-base/librsvg:2[introspection] + + >=gnome-base/gnome-session-2.91.91 + >=gnome-base/gnome-settings-daemon-3.8.3 + + x11-misc/xdg-utils + + >=x11-themes/adwaita-icon-theme-3.26 + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) + telepathy? ( + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.19[introspection] ) + media-fonts/cantarell +" +# avoid circular dependency, see bug #546134 +PDEPEND=" + >=gnome-base/gdm-3.5[introspection] + >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] + browser-extension? ( gnome-extra/chrome-gnome-shell ) +" +BDEPEND=" + dev-lang/sassc + dev-libs/libxslt + app-text/asciidoc + >=dev-util/gdbus-codegen-2.45.3 + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.17 + app-text/docbook-xml-dtd:4.3 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + # Try to fix crashes related to custom stylesheet; triggered often by package installs (probably desktop database update) + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/1265 + # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536 + "${FILESDIR}"/3.34.4-custom_stylesheet_crash.patch + # Fix automagic gnome-bluetooth dep, bug #398145 + "${FILESDIR}"/3.34-optional-bluetooth.patch + # Change favorites defaults, bug #479918 + "${FILESDIR}"/3.28.3-defaults.patch + # https://bugs.gentoo.org/736802 https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997 + "${FILESDIR}"/${PV}-CVE-2020-17489.patch +) + +src_prepare() { + xdg_src_prepare + # 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) + -Dextensions_tool=true + $(meson_use gtk-doc gtk_doc) + -Dman=true + $(meson_use networkmanager) + $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4 + # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session) + # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant? + pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs} +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if ! has_version 'media-libs/gst-plugins-good:1.0' || \ + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then + ewarn "To make use of GNOME Shell's built-in screen recording utility," + ewarn "you need to either install media-libs/gst-plugins-good:1.0" + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." + fi + + if ! has_version "media-libs/mesa[llvm]"; then + elog "llvmpipe is used as fallback when no 3D acceleration" + elog "is available. You will need to enable llvm USE for" + elog "media-libs/mesa if you do not have hardware 3D setup." + fi + + # https://bugs.gentoo.org/show_bug.cgi?id=563084 + # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)? + if has_version "x11-drivers/nvidia-drivers[-kms]"; then + ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," + ewarn "otherwise Gnome will fail to start" + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.5.ebuild b/gnome-base/gnome-shell/gnome-shell-3.36.5.ebuild new file mode 100644 index 000000000000..106118412d64 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.36.5.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg + +DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" +HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ?? ( elogind systemd )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" + +# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> +# FIXME: +# * gstreamer support is currently automagic +DEPEND=" + >=gnome-extra/evolution-data-server-3.33.1:= + >=app-crypt/gcr-3.7.5[introspection] + >=dev-libs/glib-2.57.2:2 + >=dev-libs/gobject-introspection-1.49.1:= + >=dev-libs/gjs-1.63.2 + >=x11-libs/gtk+-3.15.0:3[introspection] + >=x11-wm/mutter-3.36.0:0/6[introspection] + >=sys-auth/polkit-0.100[introspection] + >=gnome-base/gsettings-desktop-schemas-3.33.1 + >=x11-libs/startup-notification-0.11 + >=app-i18n/ibus-1.5.2 + >=gnome-base/gnome-desktop-3.35.90:3=[introspection] + bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) + >=media-libs/gstreamer-0.11.92:1.0 + media-libs/gst-plugins-base:1.0 + networkmanager? ( + >=net-misc/networkmanager-1.10.4:=[introspection] + net-libs/libnma[introspection] + >=app-crypt/libsecret-0.18 + dev-libs/dbus-glib ) + systemd? ( >=sys-apps/systemd-31 + >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) + elogind? ( >=sys-auth/elogind-237 ) + app-arch/gnome-autoar + dev-libs/json-glib + + >=app-accessibility/at-spi2-atk-2.5.3 + 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} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + ') + media-libs/mesa[X(+)] +" +# Runtime-only deps are probably incomplete and approximate. +# Introspection deps generated using: +# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq +# Each block: +# 1. Introspection stuff needed via imports.gi.* +# 2. gnome-session needed for shutdown/reboot/inhibitors/etc +# 3. Control shell settings +# 4. logind interface needed for suspending support +# 5. xdg-utils needed for xdg-open, used by extension tool +# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) +# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review +# 8. IBus is needed for nls integration +# 9. Optional telepathy chat integration +# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) +# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper +RDEPEND="${DEPEND} + >=sys-apps/accountsservice-0.6.14[introspection] + app-accessibility/at-spi2-core:2[introspection] + app-misc/geoclue[introspection] + >=dev-libs/libgweather-3.26:2[introspection] + >=sys-power/upower-0.99:=[introspection] + x11-libs/pango[introspection] + gnome-base/librsvg:2[introspection] + + >=gnome-base/gnome-session-2.91.91 + >=gnome-base/gnome-settings-daemon-3.8.3 + + x11-misc/xdg-utils + + >=x11-themes/adwaita-icon-theme-3.26 + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) + telepathy? ( + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.19[introspection] ) + media-fonts/cantarell +" +# avoid circular dependency, see bug #546134 +PDEPEND=" + >=gnome-base/gdm-3.5[introspection] + >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] + browser-extension? ( gnome-extra/chrome-gnome-shell ) +" +BDEPEND=" + dev-lang/sassc + dev-libs/libxslt + app-text/asciidoc + >=dev-util/gdbus-codegen-2.45.3 + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.17 + app-text/docbook-xml-dtd:4.3 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + # origin/gnome-3-36@03062d0d9d9f + try to fix crashes related to custom stylesheet; triggered often by package installs (probably desktop database update), screen unlock, etc + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/1265 + # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536 + "${WORKDIR}"/patches + # Fix automagic gnome-bluetooth dep, bug #398145 + "${FILESDIR}"/3.34-optional-bluetooth.patch + # Change favorites defaults, bug #479918 + "${FILESDIR}"/3.36-defaults.patch +) + +src_prepare() { + xdg_src_prepare + # 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) + -Dextensions_tool=true + -Dextensions_app=true + $(meson_use gtk-doc gtk_doc) + -Dman=true + $(meson_use networkmanager) + $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4 + # (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_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 b4d220cfc3e7..b1b0339a197b 100644 --- a/gnome-base/gnome/Manifest +++ b/gnome-base/gnome/Manifest @@ -1,2 +1,3 @@ -EBUILD gnome-3.34.4.ebuild 1402 BLAKE2B c0a7ebd49b0b87f3fd3a7415915b933e697a0ae1bd0d4857193e436bb821a102e3e4421fbaddcfb89c6c8b84484da16e9933cb0c1236e24e3efa73e12389c68e SHA512 ce9a0c5c8d2dd0d22d194c2b3fe4729628f8435ebb74e954cb88d81fba33b84a9bb27ca5a9e9dd3e9f23baa0ed4c0e7e5307878a343a495cdcba5fbba9d0897e +EBUILD gnome-3.34.4.ebuild 1397 BLAKE2B 1d225a941f9363bb73b46f08248bc7041cea51245cbc3fd72021606e048f743df0c5498523632c43f115069b76ab80865e6a8805957d91f28bab6cbbf07dc563 SHA512 61670731c906df15096b2c407558f6af249fd1135019527395392b71f5971c37b457063cb03345726045c18dd05ed805d497f54344e2d26907ee77eaee060635 +EBUILD gnome-3.36.5.ebuild 1392 BLAKE2B a3da5f28df6f080297a01c3e522dcd3d148acc7aa0d4a7c63dd24b9e46c0943acbe121c1167037eba2042714b3b8c580e9d6147018f8d541f44812684f12817d SHA512 5015830d6b18e7db1762f213bba3958075fd52d75981dc5d005d29dba89b40df28b8b0cf94b84ad7e7e5621b73e2aa32c9526c0b8ff78688ba23a4ea3ae3db60 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a diff --git a/gnome-base/gnome/gnome-3.34.4.ebuild b/gnome-base/gnome/gnome-3.34.4.ebuild index d4881080358d..4a5107192cc8 100644 --- a/gnome-base/gnome/gnome-3.34.4.ebuild +++ b/gnome-base/gnome/gnome-3.34.4.ebuild @@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2 # when unmasking for an arch # double check none of the deps are still masked ! -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="accessibility +bluetooth +classic cups +extras" diff --git a/gnome-base/gnome/gnome-3.36.5.ebuild b/gnome-base/gnome/gnome-3.36.5.ebuild new file mode 100644 index 000000000000..2b3cb8133d57 --- /dev/null +++ b/gnome-base/gnome/gnome-3.36.5.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Meta package for GNOME 3, merge this package to install" +HOMEPAGE="https://www.gnome.org/" + +LICENSE="metapackage" +SLOT="2.0" # Cannot be installed at the same time as gnome-2 + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~amd64 ~arm64 ~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.36.3 + + >=x11-wm/mutter-${PV} + >=gnome-base/gnome-shell-${PV}[bluetooth?] + >=media-fonts/cantarell-0.201 + + >=x11-themes/gnome-backgrounds-3.36.0 + x11-themes/sound-theme-freedesktop + + accessibility? ( + >=app-accessibility/at-spi2-atk-2.34.2 + >=app-accessibility/at-spi2-core-2.36.0 + >=app-accessibility/orca-3.36.4 + >=gnome-extra/mousetweaks-3.32.0 ) + classic? ( >=gnome-extra/gnome-shell-extensions-3.36.2 ) + extras? ( >=gnome-base/gnome-extra-apps-${PV} ) +" +PDEPEND=">=gnome-base/gvfs-1.44.1[udisks]" + +DEPEND="" +BDEPEND="" + +pkg_postinst() { + # Remind people where to find our project information + elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" + elog "for information about the project and documentation." +} diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest index b8a8d3a6a738..30335104b73c 100644 --- a/gnome-base/gsettings-desktop-schemas/Manifest +++ b/gnome-base/gsettings-desktop-schemas/Manifest @@ -1,4 +1,6 @@ AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705 DIST gsettings-desktop-schemas-3.34.0.tar.xz 650468 BLAKE2B a275cd011c255531b293ccb875159ea4465c79852a3d1be2a03faafa8dbb6ba7137d72c7a59bce93b6ce5f187ebf92aca334dc3c51c8de5ee3af3092fc250fe5 SHA512 6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1 +DIST gsettings-desktop-schemas-3.36.1.tar.xz 679788 BLAKE2B f49f98274f48cdb2eab0d3d94147cc0994245156999d5ed71adbbe4c949bb4da1ba230fe185938542b9854c77b6e0d7084d1919c26bf9939cd58baf4fcc8f129 SHA512 623a3759fe84cc5ea897043cc7c337a4f83302ebe5cfb9d214210a48e460e22b180518f5d768382ec18396bb2e86f22649dbc9b367a858e56b1ee8d2cab58fa8 EBUILD gsettings-desktop-schemas-3.34.0.ebuild 1017 BLAKE2B a548ba8e5a3828d64e3ce0d73e84e0703c1499ae3ac7854cd61dcd6ba99735d022f3cc090a0975b482ca35ac278420a231e1432e8500bdc1b39f5d48c8e0a6df SHA512 25be3c53bc476396887f6b1f45d7443d46182e2a571ec2d1b294d695533bd8837db346cb33b43b60f9b25ebf0cba826ee8e9cd85db56951dc745f5460c621dfd +EBUILD gsettings-desktop-schemas-3.36.1.ebuild 976 BLAKE2B 0b18b599e5d63e28e95023243a2dbf3392369efabc2a9a6ea96fdd5ec191f69f6183e3b1b2c2dcd9cd2e5d11ea28c2097d9489a7854bb06b06ed3b8fd16c127d SHA512 008f7713a4410188ef96a7eb3c45c19dae426af3b042e6a87576874328380c377bbbbbe9c53969f116b55e81f59121624f804df19836342d9873babead4f6912 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild new file mode 100644 index 000000000000..34729655bb54 --- /dev/null +++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="Collection of GSettings schemas for GNOME desktop" +HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="+introspection" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" + +BDEPEND=" + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + # Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases + "${FILESDIR}"/3.32.0-default-fonts.patch +) + +src_configure() { + meson_src_configure $(meson_use introspection) +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 0e26de3e4e36..6441d1b12448 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,4 +1,7 @@ +AUX libplist-2.2.patch 985 BLAKE2B cfb16b82634dfde00af05d96e3b0561b6bcbd246369b3048f807fee14fcfefdf1f2a9a39afaba9237109c051eb60f16a28916ef26e9f63fa0bcfff7e5cdefad4 SHA512 f6a9c6a2744063495ca95bfd47807a0883835504356948797e6d7015783d7f3b2504ac9ea791435301d2b4c063ef5642c53e485192c0008e0242e1754e567085 DIST gvfs-1.42.2-patchset.tar.xz 23932 BLAKE2B 6957c5a8a200ecff9c3294a7fb7304ae1be147e45dae1838121690a3a20b1d2557681b4efe5f722811d5302b8270d0058eedac7f8a95029cd872df3db14cc541 SHA512 0494fb36e093d06bb278a75ecbf3bc17460d5d20302a9c1d2c5b74a0b65c2a259141b515b3e80c57c3e1125df74b3cf6d2a91ae70c8e2e0af3bbca285417b9f0 DIST gvfs-1.42.2.tar.xz 1204972 BLAKE2B ebc1c4a4ae69a809ee7c556e65f87f968806ef057cfb7f7a7d2f18614443197c1feaad79099fd5b04640035e7ab306683018676ce109a7d718e3c8d35676be7c SHA512 b786ae2e493099a0a1ab2756efba3690f0e241a53995013e2632b2d7e01628d52d72b47298c7a2b913c8d50f135c191b2963a7ffc0e768fc5c96a89f93401e3c -EBUILD gvfs-1.42.2.ebuild 3851 BLAKE2B 97775a41744d5ec07cd3571c0aebca51690a06264164d97eddd641f943f454f95b78e6677e1622c35d563a1d9b75a17463cf89b749726339c2a66dab0ce96aea SHA512 bb04c71b2c39a01a742a46da0b31f5473701cb17a892f56567d5f133754b5e2eb8991193de0cef387bc0b00530259ac8d5102409a536240db47904e97883fdac +DIST gvfs-1.44.1.tar.xz 1222040 BLAKE2B 5a412395cf0edbdb78aea43eabd4fc0ec68f53b9f681cd6181b1c2ee09a01f90e024f75d44302eefdd9d3888512ec4fe672125eec3c79fe691d0f66dacde7bce SHA512 d936e70e6daa6a7494e5cc333a53afe82b601e34e2e54b207d9a4aefdc35dd068997832be750a6857144a48fa37065cb7e6b25378952007b06988ad07dfc6006 +EBUILD gvfs-1.42.2.ebuild 3885 BLAKE2B ee95e9a9667b1bc767bfabb200d566d8f8a31082c26b08c9a305b9677602223efc7ade9f18e7b7a3ae65799735fa4194ee48ba651b6cf1a5fa187494e74aa335 SHA512 93439634631eb7cb3bb0c8685abe4833790e4447f28443566c1aabd3339edfe3a68af8c0d84f74d818887a23488dc6b14cd1b09c73580eb3e564c3ba3a56a959 +EBUILD gvfs-1.44.1.ebuild 3798 BLAKE2B 8865b820a6b7c23c4c11fce62d1ef0bff769e8f7abc5925c576c1ce3a53fe334b7fd912ab11c42b20ce0bcbf3bc43514cee3dcdc489653a446a0a32a0f6b29a6 SHA512 53f68c2c6bb655eb4bc06c5b8129697f9239812206409a90e87e588b55d59a3e225b7033a60abc9372dc24481bff55e9d74bcaea340fe02508dee843fb8c5ae4 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7 diff --git a/gnome-base/gvfs/files/libplist-2.2.patch b/gnome-base/gvfs/files/libplist-2.2.patch new file mode 100644 index 000000000000..72634b58b69f --- /dev/null +++ b/gnome-base/gvfs/files/libplist-2.2.patch @@ -0,0 +1,30 @@ +From 13551f3f40d41f1357126ac5a26d0fa012cd8123 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Tue, 16 Jun 2020 13:28:35 +0200 +Subject: [PATCH] afc: Add support for libplist-2.2 + +Which changed name from libplist to libplist-2.0 to embed its API +version number in the library name. +--- + meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1750f65c..187bfd55 100644 +--- a/meson.build ++++ b/meson.build +@@ -357,7 +357,10 @@ config_h.set('HAVE_LOGIND', enable_logind) + enable_afc = get_option('afc') + if enable_afc + libimobiledevice_dep = dependency('libimobiledevice-1.0', version: '>= 1.2') +- libplist_dep = dependency('libplist', version: '>= 0.15') ++ libplist_dep = dependency('libplist-2.0', required: false) ++ if not libplist_dep.found() ++ libplist_dep = dependency('libplist', version: '>= 0.15') ++ endif + endif + + # *** Check if we should build with GOA volume monitor *** +-- +2.20.1 + diff --git a/gnome-base/gvfs/gvfs-1.42.2.ebuild b/gnome-base/gvfs/gvfs-1.42.2.ebuild index 9d564417391f..799db1bc3d99 100644 --- a/gnome-base/gvfs/gvfs-1.42.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.42.2.ebuild @@ -76,6 +76,7 @@ BDEPEND=" PATCHES=( "${WORKDIR}"/patches + "${FILESDIR}"/libplist-2.2.patch ) src_configure() { diff --git a/gnome-base/gvfs/gvfs-1.44.1.ebuild b/gnome-base/gvfs/gvfs-1.44.1.ebuild new file mode 100644 index 000000000000..b7efa067dcc3 --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.44.1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org gnome2-utils meson systemd xdg + +DESCRIPTION="Virtual filesystem implementation for GIO" +HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" + +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" +RESTRICT="!test? ( test )" +# elogind/systemd only relevant to udisks (in v1.38.1) +REQUIRED_USE=" + ?? ( elogind systemd ) + cdda? ( udev ) + google? ( gnome-online-accounts ) + gphoto2? ( udev ) + mtp? ( udev ) + udisks? ( udev ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +RDEPEND=" + >=dev-libs/glib-2.57.2:2 + >=gnome-base/gsettings-desktop-schemas-3.33.0 + afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) + sys-apps/dbus + app-crypt/gcr:= + policykit? ( + >=sys-auth/polkit-0.114 + sys-libs/libcap ) + http? ( + dev-libs/libxml2:2 + >=net-libs/libsoup-2.58.0:2.4 ) + zeroconf? ( >=net-dns/avahi-0.6[dbus] ) + udev? ( >=dev-libs/libgudev-147:= ) + fuse? ( >=sys-fs/fuse-3.0.0:3 ) + udisks? ( >=sys-fs/udisks-1.97:2 ) + systemd? ( >=sys-apps/systemd-206:0= ) + elogind? ( >=sys-auth/elogind-229:0= ) + ios? ( + >=app-pda/libimobiledevice-1.2:= + >=app-pda/libplist-1:= ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) + gnome-keyring? ( app-crypt/libsecret ) + bluray? ( media-libs/libbluray:= ) + mtp? ( + >=dev-libs/libusb-1.0.21 + >=media-libs/libmtp-1.1.15 ) + samba? ( >=net-fs/samba-4[client] ) + archive? ( app-arch/libarchive:= ) + cdda? ( + dev-libs/libcdio:0= + >=dev-libs/libcdio-paranoia-0.78.2 ) + google? ( >=dev-libs/libgdata-0.17.11:=[crypt,gnome-online-accounts] ) + gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) + nfs? ( >=net-fs/libnfs-1.9.8 ) + net-misc/openssh +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/meson-0.49 + dev-util/glib-utils + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + dev-util/gdbus-codegen +" + +PATCHES=( + "${FILESDIR}"/libplist-2.2.patch +) + +src_configure() { + local enable_logind="false" + if use systemd || use elogind; then + enable_logind="true" + fi + + local enable_gcrypt="false" + if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes + enable_gcrypt="true" + fi + + local enable_libusb="false" + if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes + enable_libusb="true" + fi + + local emesonargs=( + -Dsystemduserunitdir="$(systemd_get_userunitdir)" + -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d + $(meson_use policykit admin) + $(meson_use ios afc) + $(meson_use afp) + $(meson_use archive) + $(meson_use cdda) + $(meson_use zeroconf dnssd) + $(meson_use gnome-online-accounts goa) + $(meson_use google) + $(meson_use gphoto2) + $(meson_use http) + $(meson_use mtp) + $(meson_use nfs) + -Dsftp=true + $(meson_use samba smb) + $(meson_use udisks udisks2) + $(meson_use bluray) + $(meson_use fuse) + -Dgcr=true + -Dgcrypt=${enable_gcrypt} + $(meson_use udev gudev) + $(meson_use gnome-keyring keyring) + -Dlogind=${enable_logind} + -Dlibusb=${enable_libusb} + -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1 + -Dinstalled_tests=false + -Dman=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + gnome2_giomodule_cache_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + gnome2_giomodule_cache_update +} diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest index f800bd138f3f..1de6b989e727 100644 --- a/gnome-base/libglade/Manifest +++ b/gnome-base/libglade/Manifest @@ -4,4 +4,5 @@ AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8 DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735 EBUILD libglade-2.6.4-r2.ebuild 2833 BLAKE2B 9a427b6a95d8d9387b20b27cf327d57c81a668871cf0853193f499b980144caacad0ee6bcd3e0cf48655d5d4c668f8cdc43674243495d62f200925789dca4145 SHA512 3ba8b42f9a076a5bbfc103be2864494345e4095a1b4274a185af2dd00dcf92a57abbd23e7bc6bbfbaaeaf083ec36a75b88c652ebd39980c3f624f70aa5bd0fec +EBUILD libglade-2.6.4-r3.ebuild 2488 BLAKE2B 588a99f621abb8c59661867b66fc9dec1b3209b52b6f615010b822805b343a100f6278f935a6ad2b57762197a5782c94e136902aabad89861263caacef9834ea SHA512 2ed21ab6dca7653e829fc7dd26fbef32aa66d354ada006ee798f0483a5c9907a9264fbd367320cd12f55e728a880c5da1b105cee73b2df6a4a6642e317e0ac7d MISC metadata.xml 336 BLAKE2B c8f534b3eb5adf1f4e4b71a95b4dd7ecb6ddcf954d617eaf960a08d6ee43818c948c9ed72cbe252159a4185feaddef8a294e41277416618237a271ec84e90e5e SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3 diff --git a/gnome-base/libglade/libglade-2.6.4-r3.ebuild b/gnome-base/libglade/libglade-2.6.4-r3.ebuild new file mode 100644 index 000000000000..45b79e442676 --- /dev/null +++ b/gnome-base/libglade/libglade-2.6.4-r3.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +GNOME_TARBALL_SUFFIX="bz2" +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit gnome2 multilib-minimal virtualx + +DESCRIPTION="Library to construct graphical interfaces at runtime" +HOMEPAGE="https://library.gnome.org/devel/libglade/stable/" + +LICENSE="LGPL-2" +SLOT="2.0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] + >=dev-libs/atk-2.10.0[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + virtual/pkgconfig" + +src_prepare() { + # patch to stop make install installing the xml catalog + # because we do it ourselves in postinst() + eapply "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch + + # patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort + eapply "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch" + + # Fails with gold due to recent changes in glib-2.32's pkg-config files + eapply "${FILESDIR}/${P}-gold-glib-2.32.patch" + + # Needed for solaris, else gcc finds a syntax error in /usr/include/signal.h + eapply "${FILESDIR}/${P}-enable-extensions.patch" + + if ! use test; then + sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed" + fi + + mv configure.in configure.ac || die + gnome2_src_prepare +} + +multilib_src_configure() { + export am_cv_pathless_PYTHON=none + + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + $(use_enable static-libs static) + + if multilib_is_native_abi; then + ln -s "${S}"/doc/html doc/html || die + fi +} + +multilib_src_test() { + virtx emake check || die "make check failed" +} + +multilib_src_install() { + dodir /etc/xml + gnome2_src_install +} + +multilib_src_install_all() { + local DOCS=( AUTHORS ChangeLog NEWS README ) + einstalldocs +} + +pkg_postinst() { + echo ">>> Updating XML catalog" + "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \ + "https://glade.gnome.org/glade-2.0.dtd" \ + "${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog + gnome2_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm + echo ">>> removing entries from the XML catalog" + "${EPREFIX}"/usr/bin/xmlcatalog --noout --del \ + "${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog +} diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index 147297008473..7a8593d74b40 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -1,4 +1,6 @@ AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280 +DIST librsvg-2.48.8.tar.xz 15302184 BLAKE2B 7d44b58d894afbeff0cb4606ed64191c028e7ac9d987dd3248b90df4ae0c000ee47b02484116bf7ee6e7aad567b91df7a2aae6880514f5ddee3ef4826c2e828e SHA512 7b35afbbad17927168acb3a308bff59ea66e8e1ac18c2ab5626a7d494e90d87d2dc552959ad72974d3ed8ba4c2f919335cf9110a0d0a09148e606222e4fcee43 EBUILD librsvg-2.40.21.ebuild 2639 BLAKE2B 90b8112288349552ac764ea1e148ab03df464a7f7d3c50e1da99c73116c4c6b5bab15e808e08862944ab5d18da54e2938334490ea29edf1715f043ec941adf10 SHA512 03779cf7a6f14b55e8a38c2e28e07ebbc425dce3bb59eea3542643fd6e84fb9ee51b0610bb9d73ff929ff0b7f5efdaf8b19b4696d535158d2c2b8ed7381ff34a +EBUILD librsvg-2.48.8.ebuild 2498 BLAKE2B 77ad625306c3e87b085268d1b4f659f083ac58026d23f7285a866babeada7a43a3e28a5666043e5154af6573ac39325eba7e852fcb6052ae7ad59ccba5e1a84b SHA512 9e4445991fadcc1d29cb640248ffa0c8a3837afd3df750bbc1472ae2c66017c746335af351e4fc59652a3f0680470a0d81d1ec0586876bf606f590f5a633fc8a MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4 diff --git a/gnome-base/librsvg/librsvg-2.48.8.ebuild b/gnome-base/librsvg/librsvg-2.48.8.ebuild new file mode 100644 index 000000000000..c5ec2752fa96 --- /dev/null +++ b/gnome-base/librsvg/librsvg-2.48.8.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" + +inherit gnome2 multilib-minimal rust-toolchain vala + +DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" +HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg" + +LICENSE="LGPL-2+" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +IUSE="+introspection +vala" +REQUIRED_USE="vala? ( introspection )" + +RDEPEND=" + >=x11-libs/cairo-1.16.0[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}] + + introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) +" +DEPEND="${RDEPEND} + >=virtual/rust-1.39[${MULTILIB_USEDEP}] + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" +# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf + +RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc. + +src_prepare() { + use vala && vala_src_prepare + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=( + --disable-static + --disable-debug + --disable-tools # the tools/ subdirectory is useful only for librsvg devs + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable vala) + --enable-pixbuf-loader + ) + + if ! multilib_is_native_abi; then + myconf+=( + # Set the rust target, which can differ from CHOST + RUST_TARGET="$(rust_abi)" + # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as + # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD + cross_compiling=yes + ) + fi + + ECONF_SOURCE=${S} \ + gnome2_src_configure "${myconf[@]}" + + if multilib_is_native_abi; then + ln -s "${S}"/doc/html doc/html || die + fi +} + +multilib_src_compile() { + # causes segfault if set, see bug #411765 + unset __GL_NO_DSO_FINALIZER + gnome2_src_compile +} + +multilib_src_install() { + gnome2_src_install +} + +pkg_postinst() { + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + multilib_foreach_abi gnome2_pkg_postinst +} + +pkg_postrm() { + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + multilib_foreach_abi gnome2_pkg_postrm +} diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 0ee217cbeea7..7d9da755991e 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,8 +1,8 @@ AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459 AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a AUX 3.34.2-pango-1.42-compat.patch 3896 BLAKE2B 022cc2667db62a9956684f3b16f466a6dbb3112caabd80629775be0e50677fbe657e2fe9c3202f3d7c54c0c1fc7e80fe189583f30cf98d03196c131331e3fc2b SHA512 ee293078db3e17ca0f0e5cee560142f272855515f3f59b59c0743a544a3149bed5d904a2022deb210ce61c09673de903c82e288803545d30f068985f0db0f03d -DIST nautilus-3.34.2.tar.xz 3196976 BLAKE2B 38424061cb5591fc1df5824dd80e282637345bde148955c81632d4894153e10f3840389bb4e43dffe8c28f10eb6e64c1cc89f1bffdcf80fa581a5d47b7724dee SHA512 1a4e24fea3201f68b0316b95425bbc90078baa1ae7dccef2d2e48beda4007ecf2986254cde243d310c548e47a4693d84d1255654199649ce08429a99fb3a3a51 DIST nautilus-3.34.3.tar.xz 3213260 BLAKE2B a417ee5d5e032befed704b71b9ffd29cc9a2a6fae0612f96601756b876b0990625cc78eb2c7679bdce914f3dd30208b60243f403a508cf87a6761ea56251140d SHA512 f8ef86b5b67ef2b8eced492ee6b8d77155a9d6ec5ba6bb18132d678e6f12870963da9bcf4ff0bfbb8f4791bf068314557f9551febc23234c48d722e529c6ed9d -EBUILD nautilus-3.34.2.ebuild 2962 BLAKE2B c0a87c1adcb6841b57ac3cc1b191d6ba26be33c12b6b83b22296c44d176c0e9f88a979e823d5903910687692353680327ae56f2815e0989b0d59274c4562d9aa SHA512 e7e8e8e78239a423c330202811f7ca3303654af1159d30c46102aac0e3ce14eee61fbd175c7699db9d42048b925a2aca18804739313b12dea9ea0d5c31092980 +DIST nautilus-3.36.3.tar.xz 3201908 BLAKE2B ec7be7ad523e29c853a1a16dd6381257bd7f7af0004d4b84a9ef13539f5c8ea431c61f819eee6c0d396037846d390ae112b3fe2771276cde6128e7fad95eb4f4 SHA512 4dce01c20a34ed9bbff53a9886775af431754d02a4300e4647d87830502103e7436e53127b2e503af8e3a90785aa864514dbde22508ffb3e06eb43d4633fddde EBUILD nautilus-3.34.3.ebuild 2904 BLAKE2B 22da3640ed42c7f9f2b965ca0ded92c5add51f7134420a1b49351fd47fd4432d98cce7b571cf12296320ef0d55a2690636293bd4d1786478f2399ff902b16b9c SHA512 8c180ed68480d9cf5a341a6f49f7ac9295e9166da963f865686c7dc60c9010f5dabaa7c9813d88011d819b512304f9f173f94014065e0de0bc675c0e64f90ac9 -MISC metadata.xml 652 BLAKE2B e4161f58861954981a6837a9b6c7f6dd0b76dc84378ce2d9caea1375973d490751ce966753829b7b972a6c75d04519820f4cde8b6d4edc3b9a9abb7477c68a90 SHA512 a1906e74bd47437d2226ffb977f3f3d8c981a32f8d54d0f9e0156932b001b6e205b0e5b78ed5badb0b89c1ed1ff107f67e026bf5c4b088cfe95e2b69de8c6981 +EBUILD nautilus-3.36.3.ebuild 2861 BLAKE2B d7612bc528afcf9b62d807f2203899ebfd7421b247a331d717a99d196b76aeea1e776e21108ed46ea2e4e976b35fd907ecdb9ff0009a0555dfa1ad393b2570bd SHA512 816b2c7e75a50fe0123e22bb67a5e60925282fb51ec71cba2073a0b5bf2fd2509217c440748ed00e27219dbe32c506a6cdd6b526efd7833b1bdb0c2ef9b2736c +MISC metadata.xml 553 BLAKE2B 51c14fbccc3b060cb5fac644a8213672250edb2c2092076bb4e0c390bfc8562a950fd362ae4294ac1215e774fcd4dd4de6c709b126c04fa705cf10be0e6e836f SHA512 77102dd05a5180dffca7ef03d66e3d0dc113f272e583da442027a94cb4e9fc67f0c267d9f2d5d0a4ef895d58604aed78fbe01c19b3f018972ff675d392786b7c diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml index 6d7557c2caa1..576e3a2f23ff 100644 --- a/gnome-base/nautilus/metadata.xml +++ b/gnome-base/nautilus/metadata.xml @@ -7,8 +7,6 @@ </maintainer> <use> <flag name="gstreamer">Enable the Audio/Video file properties page</flag> - <flag name="packagekit">Use packagekit to search for programs to open - unknown file types</flag> <flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files from the file mananger</flag> <flag name="sendto">Enable the nautilus-sendto extension to send files to diff --git a/gnome-base/nautilus/nautilus-3.34.2.ebuild b/gnome-base/nautilus/nautilus-3.36.3.ebuild index 04735b07c056..47177bc30da1 100644 --- a/gnome-base/nautilus/nautilus-3.34.2.ebuild +++ b/gnome-base/nautilus/nautilus-3.36.3.ebuild @@ -10,9 +10,9 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" LICENSE="GPL-3+ LGPL-2.1+" SLOT="0" -IUSE="gnome +gstreamer gtk-doc +introspection packagekit +previewer selinux sendto" +IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" DEPEND=" >=dev-libs/glib-2.58.1:2 @@ -30,7 +30,6 @@ DEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.54:= ) " RDEPEND="${DEPEND} - packagekit? ( app-admin/packagekit-base ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) gstreamer? ( !<media-video/totem-3.31.91[nautilus] ) >=app-misc/tracker-miners-2.0:= @@ -55,7 +54,6 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc "${FILESDIR}"/3.32.3-optional-gstreamer.patch # Allow controlling audio-video-properties build - "${FILESDIR}"/${PV}-pango-1.42-compat.patch ) src_prepare() { @@ -73,7 +71,7 @@ src_configure() { -Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true $(meson_use gstreamer) # gstreamer audio-video-properties extension $(meson_use introspection) - $(meson_use packagekit) + -Dpackagekit=false $(meson_use selinux) -Dprofiling=false -Dtests=$(usex test all none) |