diff options
Diffstat (limited to 'gnome-base')
222 files changed, 12678 insertions, 0 deletions
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest new file mode 100644 index 000000000000..268a506c87d1 --- /dev/null +++ b/gnome-base/dconf-editor/Manifest @@ -0,0 +1,5 @@ +DIST dconf-editor-3.22.3.tar.xz 394760 SHA256 55f167d7e61714766406b23d7222d509f7bb98b9df1a367113ac14ea06f669a4 SHA512 0e1ddce6e970ea23329c6233ed87e6d4541b6f1e991e3159bda44c43b8092a4d983acbca18bbedb88304ac1afb541a15073a261dab9ffe94c94cfd06e3e412dc WHIRLPOOL 45bad491cd55c9c5dfa26600000322329d44c04a8d90ab0ccf1721ab1021d0607ceb3ff78ac5cc7d55594bc0aa1af1295584422c150ff10723aee4991bb6e7ab +EBUILD dconf-editor-3.22.3.ebuild 737 SHA256 cdcb6951b89d9fb59d18653f253caa69f9b9d81672e6f844dc3349f46088d1d5 SHA512 98c32c0c2d72a9ee208bccb0c8ed6b0896b2a84d0931d4fd4819271892b74332c98ff0e62bacdc62bfbe32d87bd028f767a1699818ec4828489af7315fb83d54 WHIRLPOOL 671267ee959e5028bea514556c2911cf051f0d8a609d60b425a69afbb6560e191bfffea270460e3c03b4f027a42950973b5f4e5294b76fcbe2514682e6e73a89 +MISC ChangeLog 6136 SHA256 53b4ba39cb629d3c7bfbc9e4faeaf6e854a7072ad37ce45f4e798c7f7b521c7c SHA512 8e256afbbe6ffa89ec417383bfcd76edd60b97baf0efc663c5750c69becee48945df20721b065df646e1b5c6b927193efaf430e0b99bf1c5ef5691209adcda67 WHIRLPOOL 43a1ddc598f18148289a662aaaefe53af8db01fc6e3809fd34fcd0b35b2db1cc2b2660abdb85f4dd83b9479462e818e51dd958070fd71cdddd66b135bd703c63 +MISC ChangeLog-2015 405 SHA256 482a839dd5c03d79080b27e97ecb31201d46c235dca48722a8c8cc025e236936 SHA512 81eaa00b1b80363296931fa8a3ebeb7189e9c8d0b8e162ec40182c5967c9b1dfd3fedf3e31b416232fede3365307f69691f6316d3134e621f6bd4da4365a764c WHIRLPOOL c266e402cd9d42d0e15971296badc5d67dfb7b2e367fa13be84ba15c3efc47c13dc619de270d4f06ee5189497fd9cbb1866b541515fd456ae015ad0497984994 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/dconf-editor/dconf-editor-3.22.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.22.3.ebuild new file mode 100644 index 000000000000..66f2f23f1549 --- /dev/null +++ b/gnome-base/dconf-editor/dconf-editor-3.22.3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2 + +DESCRIPTION="Graphical tool for editing the dconf configuration database" +HOMEPAGE="https://git.gnome.org/browse/dconf-editor" + +LICENSE="LGPL-2.1+" +SLOT="0" + +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux" + +COMMON_DEPEND=" + dev-libs/appstream-glib + >=dev-libs/glib-2.46.0:2 + >=gnome-base/dconf-0.25.1 + >=x11-libs/gtk+-3.22.0:3 +" +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.50 + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND="${COMMON_DEPEND} + !<gnome-base/dconf-0.22[X] +" + +src_configure() { + gnome2_src_configure \ + VALAC="$(type -P true)" +} diff --git a/gnome-base/dconf-editor/metadata.xml b/gnome-base/dconf-editor/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/dconf-editor/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest new file mode 100644 index 000000000000..55e419ed1e99 --- /dev/null +++ b/gnome-base/dconf/Manifest @@ -0,0 +1,5 @@ +DIST dconf-0.26.0.tar.xz 219688 SHA256 8683292eb31a3fae31e561f0a4220d8569b0f6d882e9958b68373f9043d658c9 SHA512 ea225397a486815c90a113c064d943f113490dfc754e4acba049b033115aa3a6a3849a5cdc133663de09811cde41c963041bc244cfd9ed32d65399889e415d1e WHIRLPOOL 5e4e24aa6083ad5a7a50041772bb7d466eb9cee93725311516fd6070a1b31b8db137772a3c55fa7cfca1675f72f9ab35b70d6aec1b67666eeedfbdfdebd9ac7a +EBUILD dconf-0.26.0-r1.ebuild 1508 SHA256 4e362bd74cc385686cb28503842c685a96f63ce7b032e6a14edeea253a7a2da8 SHA512 82a0b2d643087641ddb751cbf9b9b0deb3e5ab6dd9b1034a35b268d8e91c5a2fe238c5081e939adf3eb3460490c637e2d33b5344d4a87b9fc7c4edf9619e07cd WHIRLPOOL 3661241aa1f3cdccf068fe7058927bcf627a5ec4702cadc6cdfe3cf6f6732b2a82228eb1202913435e5bebe95e23730196a7a10a871e21062f80ebcde09214d3 +MISC ChangeLog 6133 SHA256 b73af8e368c7ff9192a0bf52dc25462f48a0e2a862b90fc26e49ed3bfc13b0dd SHA512 7e0a06e7dfbe41e2ffb68bc792ca51a7fb22072ce52e625983d3218e722831562b2659a2e9a3959ddb6222f0faefcf3fb8247b53797709c1d9ec46e5397b2e1d WHIRLPOOL 9580a6fb22ae78664a72318c31f0545f0f71f1cea4cc7c657518f87467e9a24ac4a4a10de24b654c715573f27de4ee2fe8b7d455eb354240daa80ed3742d3bb5 +MISC ChangeLog-2015 11251 SHA256 0a8b1d5eff74d4de2074effd7da83b8f2598b4b2fbab1a38e8748823aa8e0bc5 SHA512 620ee7574dc51594470debdc82f398eb358a65ef4a6d2addc929c999ca4a5147b6f05def2046315e2e766db0958f6caa1a78565bdb7e621526355b5bba49d810 WHIRLPOOL d09acd3e5b71ffbe8e930a6241637896e34f3dcd20ad7bceb9e80e931fbea672b72412911dc0b5c043536ee169e5a66d1daadb0d7a537fd8f12f0f35a0c20a42 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/dconf/dconf-0.26.0-r1.ebuild b/gnome-base/dconf/dconf-0.26.0-r1.ebuild new file mode 100644 index 000000000000..1187976d9e36 --- /dev/null +++ b/gnome-base/dconf/dconf-0.26.0-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 bash-completion-r1 virtualx + +DESCRIPTION="Simple low-level configuration system" +HOMEPAGE="https://wiki.gnome.org/action/show/Projects/dconf" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux" +IUSE="" + +RDEPEND=" + >=dev-libs/glib-2.44.0:2 + sys-apps/dbus +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.15 + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure \ + --disable-gcov \ + --enable-man \ + VALAC=$(type -P true) +} + +src_test() { + virtx emake check +} + +src_install() { + gnome2_src_install + + # GSettings backend may be one of: memory, gconf, dconf + # Only dconf is really considered functional by upstream + # must have it enabled over gconf if both are installed + echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf + echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf + doenvd 51dconf +} + +pkg_postinst() { + gnome2_pkg_postinst + # Kill existing dconf-service processes as recommended by upstream due to + # possible changes in the dconf private dbus API. + # dconf-service will be dbus-activated on next use. + pids=$(pgrep -x dconf-service) + if [[ $? == 0 ]]; then + ebegin "Stopping dconf-service; it will automatically restart on demand" + kill ${pids} + eend $? + fi +} diff --git a/gnome-base/dconf/metadata.xml b/gnome-base/dconf/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/dconf/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest new file mode 100644 index 000000000000..c6823b71dc40 --- /dev/null +++ b/gnome-base/gconf/Manifest @@ -0,0 +1,10 @@ +AUX gconf-2.24.0-no-gconfd.patch 787 SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c SHA512 c7f7437321d2afcbe75a8b8d819f04e5864cde3b2130f6dcff78c622b9bd336c66a30d666e0a4283d2fcf5c54afc741cc84f90401889127b03ef22b0752fb7b8 WHIRLPOOL 86c118fb0b571b5c47849fd4f7f09ade4ebf76324771fe9cccc64d95462cf3ab1a32de9a312412f843129025c41253d658a6546d7c3d9496451b9aacdf3b9451 +AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0 SHA512 c0576004aa8c8b64750037183a5d3df5b4d8ba520c83f33a906a8549139e2167d08c1bcc56cbdfe202bb078a703bd561680af63588f7ee4eb42ad6077182a3fa WHIRLPOOL eddf3b88ddbec7e29f2a58e6ccf26859e0846ec9b01e821f28dc584a9ad297805f5313e29dca5e5d576cca704e1ddb458fd322a3380ed65ddd4bb7d6924d862c +AUX gconf-3.2.6-gsettings-data-convert-paths.patch 1370 SHA256 836d5259ae84832004447defc2f0cea15ca1d8fffec6b8bf5d7eabb4d090070d SHA512 f4d7cc2261f82f7a28e574ec3b732a56bb3f067048312e318f8d23df93046489fdd5ad39d669cf0d9ada6cc07617524511c537a4f2fd0a37cd03788e84b9803b WHIRLPOOL 7e0f0d27fc05dcca803600b05ddddd3a7d02d4e984042aaa3be06a86943910dcb734c1a577a24db6f27c9b021a08ca866f6ab357162518398998f8d66ba79e91 +AUX gconf-3.2.6-mconvert-crasher.patch 1514 SHA256 22ada6a8e7c26b1c89df8c79a9a46fd3a43b35b9e96657e328ccd6f376f7034e SHA512 8b6885098b63077610b929c3b958efc04599a1f891a0d7b5f042f2638dbae7b3c67b97e7f4e34c439e55ff8c5df3bcc7c6edc56f11cd6506a4b28c2338c8511b WHIRLPOOL 483cd709829cee9396486f521f07aa978b2fed04d942230bd28f9bc1e040ac668d0bc3c2755c2778356bf754700c7b09e5c15b098a4a23f146d337f5d5ffd99e +AUX gconf-3.2.6-spew-console-error.patch 2594 SHA256 3638009b19744bd301364e110da70f8013fa41a68e4367f7eefae4b8fd7a05c7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602 WHIRLPOOL 27a02c790d3b59b7c2c717310270f3665bffb1e13d2786f98880e9bf38ab57f694e8ee384c00926ad1a67f62dff2ae20ea3392c176fb91ccedbbff8f1f52d141 +DIST GConf-3.2.6.tar.xz 1559904 SHA256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58 WHIRLPOOL ef38b5fb25b3cf915052ce00f926a0a9bf8ecb5771c2db0fd6f5f11531a8edb1c098a036eaaa20490e3de87a0a5eb411542f86d8c6a2be8ac45dcae0b29d3414 +EBUILD gconf-3.2.6-r4.ebuild 3811 SHA256 eadc8d3d6d6ec9d9d36954b5d75a7d88e9a449ec827f71483514a770ad1fdb31 SHA512 216ed8f0566e441e726be1f442de8f9ea8d504a1ca65d11054e20494c1e0f9bf44e06e69529e74b565759b6d1ba5b389319068cfba5e69a3b16297853114271f WHIRLPOOL 1495e1b082892d1e49bc9fcd4fc637b6e87d731c305dffbaa90c1a3709e5e93afc595dc1a0a98aa38354b990013206b305c8c776d57818bee3d4b9a8c17e7579 +MISC ChangeLog 4144 SHA256 0ad80005d915790d291372e0af3ff1a1aceaa08aa22c8620949061e0fc958be3 SHA512 d9d36d925c7d0acb051ff540005566ac4dad2f4925b21b1c68ed8fa7f50af1f117e5bc77c44e88c4bf2b6d22c9467c9f5fa7bd930cf23be7efce11dc5d7b28b0 WHIRLPOOL d4eb4fbdce08159ff3b5b74b948b3810ab03e51a06c5d47a8fc6329f8b06a1c971f399bcb9b21a0e78f01f8369db695330b511f14cddf978eb30c314e85189f9 +MISC ChangeLog-2015 41766 SHA256 5980fc92c7ed641eaf1629bcc675f601e4aacf597cfac97c849e1c4ad347f262 SHA512 7d196a466fa6ba55b78dca3bb1b3878a461d94fd96522a9dda29fd11f8f48bb289b6b27dbd09809def0b8a2bc4ea4f710b8a1eae57d38f12c6c4258dac74ea3d WHIRLPOOL 1671bd897744f233aa356e0d7f4c65b4a3661ad306b12dbd10ce6ce1535a242438b16990434b282bf96fd761c29185cc63755d893b9907425a695807db826113 +MISC metadata.xml 430 SHA256 0b65f0c7052658cdd068f815793795955373808419978f32e8ddf4ab208dbca2 SHA512 820c350a185014ad888ba9cb43afb5ae7f21a0000a224d68461abbee4efefcbd972db79d7086b8f7f023de0828fa6f01a32502cbf74439160003fad146d33ca4 WHIRLPOOL cadbf9dab0390344c3e5fdb3a5070d0731bc82370179e36eb05717db20c087def5aabfb5d50688ba4ba75c216d39c3b6e42087fb82d1cdff4f347bb778f365fb diff --git a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch b/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch new file mode 100644 index 000000000000..8ca6a0d4fc09 --- /dev/null +++ b/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch @@ -0,0 +1,19 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN GConf-2.23.2.old/gconf/gconftool.c GConf-2.23.2/gconf/gconftool.c +--- GConf-2.23.2.old/gconf/gconftool.c 2008-06-28 05:27:33.000000000 -0400 ++++ GConf-2.23.2/gconf/gconftool.c 2008-09-23 10:20:00.000000000 -0400 +@@ -856,6 +856,7 @@ main (int argc, char** argv) + { + g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n")); + makefile_install_mode = FALSE; ++ return 0; + } + + if (makefile_uninstall_mode && +@@ -863,6 +864,7 @@ main (int argc, char** argv) + { + g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n")); + makefile_uninstall_mode = FALSE; ++ return 0; + } + + if (makefile_install_mode || makefile_uninstall_mode) diff --git a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch b/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch new file mode 100644 index 000000000000..680b1a159b4a --- /dev/null +++ b/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch @@ -0,0 +1,18 @@ +From: Romain Perier <mrpouet@gentoo.org> +Date: Wed, 4 Nov 2009 11:58:25 +0100 +Subject: Do not segfault when entry is NULL + +--- + gconf/gconf-value.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +--- a/gconf/gconf-value.c ++++ b/gconf/gconf-value.c +@@ -1609,6 +1609,7 @@ void + gconf_entry_set_value (GConfEntry *entry, + const GConfValue *val) + { ++ g_return_if_fail (entry != NULL); + gconf_entry_set_value_nocopy (entry, + val ? gconf_value_copy (val) : NULL); + } diff --git a/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch b/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch new file mode 100644 index 000000000000..dc6c66b1c644 --- /dev/null +++ b/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch @@ -0,0 +1,41 @@ +From 405f865c07261a95c8c9a09a84ab679c6dd0a330 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Thu, 24 Oct 2013 16:27:24 -0400 +Subject: gsettings-data-convert: Warn (and fix) invalid schema paths + +See https://bugzilla.gnome.org/show_bug.cgi?id=704802 + +https://bugzilla.gnome.org/show_bug.cgi?id=710836 + +diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c +index 9b2d1d0..160ed41 100644 +--- a/gsettings/gsettings-data-convert.c ++++ b/gsettings/gsettings-data-convert.c +@@ -182,7 +182,23 @@ handle_file (const gchar *filename) + } + + if (schema_path[1] != NULL) +- settings = g_settings_new_with_path (schema_path[0], schema_path[1]); ++ { ++ char *compat_path_alloced = NULL; ++ char *compat_path; ++ /* Work around broken .convert files: ++ https://bugzilla.gnome.org/show_bug.cgi?id=704802 ++ */ ++ if (!g_str_has_suffix (schema_path[1], "/")) ++ { ++ g_warning ("Schema file '%s' has missing trailing / in '%s'", ++ filename, schema_path[1]); ++ compat_path = compat_path_alloced = g_strconcat (schema_path[1], "/", NULL); ++ } ++ else ++ compat_path = schema_path[1]; ++ settings = g_settings_new_with_path (schema_path[0], compat_path); ++ g_free (compat_path_alloced); ++ } + else + settings = g_settings_new (schema_path[0]); + +-- +cgit v0.10.1 + diff --git a/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch b/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch new file mode 100644 index 000000000000..54681bcb0e86 --- /dev/null +++ b/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch @@ -0,0 +1,45 @@ +From 98ff7acca7595f508b094506195aeffaf2e8b74c Mon Sep 17 00:00:00 2001 +From: Stefan Sauer <ensonic@users.sf.net> +Date: Wed, 23 Jan 2013 08:11:18 +0100 +Subject: mconvert: enable recursive scheme lookup and fix a crasher + +The recursive scheme lookup is needed to scan the whole settings path. The crash +would happen in the case of a misconfiguration (e.g. building gconf from source +and running uninstalled while the configure settings don't match the one used to +create the installed package). + +diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c +index a8af942..9b2d1d0 100644 +--- a/gsettings/gsettings-data-convert.c ++++ b/gsettings/gsettings-data-convert.c +@@ -22,6 +22,7 @@ + #include <string.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <stdlib.h> + #include <unistd.h> + #include <errno.h> + +@@ -90,6 +91,10 @@ get_writable_client (void) + GSList *addresses; + + addresses = get_writable_source_path (); ++ if (!addresses) { ++ g_printf("No writable gconf locations found\n"); ++ exit (1); ++ } + engine = gconf_engine_get_local_for_addresses (addresses, NULL); + gconf_address_list_free (addresses); + +@@ -155,7 +160,7 @@ handle_file (const gchar *filename) + + schema_path = g_strsplit (groups[i], ":", 2); + +- schema = g_settings_schema_source_lookup (source, schema_path[0], FALSE); ++ schema = g_settings_schema_source_lookup (source, schema_path[0], TRUE); + if (schema == NULL) + { + if (verbose) +-- +cgit v0.10.1 + diff --git a/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch b/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch new file mode 100644 index 000000000000..26503f7216ea --- /dev/null +++ b/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch @@ -0,0 +1,83 @@ +From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Mon, 15 Apr 2013 09:57:34 -0400 +Subject: dbus: Don't spew to console when unable to connect to dbus daemon + +Instead pass the error up for the caller to decide what to do. + +This prevent untrappable warning messages from showing up at the +console if gconftool --makefile-install-rule is called. + +diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c +index 5610fcf..048e3ea 100644 +--- a/gconf/gconf-dbus.c ++++ b/gconf/gconf-dbus.c +@@ -105,7 +105,7 @@ static GHashTable *engines_by_db = NULL; + static GHashTable *engines_by_address = NULL; + static gboolean dbus_disconnected = FALSE; + +-static gboolean ensure_dbus_connection (void); ++static gboolean ensure_dbus_connection (GError **error); + static gboolean ensure_service (gboolean start_if_not_found, + GError **err); + static gboolean ensure_database (GConfEngine *conf, +@@ -383,7 +383,7 @@ gconf_engine_detach (GConfEngine *conf) + } + + static gboolean +-ensure_dbus_connection (void) ++ensure_dbus_connection (GError **err) + { + DBusError error; + +@@ -392,7 +392,9 @@ ensure_dbus_connection (void) + + if (dbus_disconnected) + { +- g_warning ("The connection to DBus was broken. Can't reinitialize it."); ++ g_set_error (err, GCONF_ERROR, ++ GCONF_ERROR_NO_SERVER, ++ "The connection to DBus was broken. Can't reinitialize it."); + return FALSE; + } + +@@ -402,7 +404,10 @@ ensure_dbus_connection (void) + + if (!global_conn) + { +- g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message); ++ g_set_error (err, GCONF_ERROR, ++ GCONF_ERROR_NO_SERVER, ++ "Client failed to connect to the D-BUS daemon:\n%s", ++ error.message); + + dbus_error_free (&error); + return FALSE; +@@ -431,13 +436,8 @@ ensure_service (gboolean start_if_not_found, + + if (global_conn == NULL) + { +- if (!ensure_dbus_connection ()) +- { +- g_set_error (err, GCONF_ERROR, +- GCONF_ERROR_NO_SERVER, +- _("No D-BUS daemon running\n")); +- return FALSE; +- } ++ if (!ensure_dbus_connection (err)) ++ return FALSE; + + g_assert (global_conn != NULL); + } +@@ -2512,7 +2512,7 @@ gconf_ping_daemon (void) + { + if (global_conn == NULL) + { +- if (!ensure_dbus_connection ()) ++ if (!ensure_dbus_connection (NULL)) + { + return FALSE; + } +-- +cgit v0.10.1 + diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild new file mode 100644 index 000000000000..54df43366cf0 --- /dev/null +++ b/gnome-base/gconf/gconf-3.2.6-r4.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" +GNOME_ORG_MODULE="GConf" +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="xml" + +inherit eutils gnome2 multilib-minimal python-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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~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/gtk-doc-am + >=dev-util/intltool-0.35 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" +RDEPEND="${RDEPEND} + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +pkg_setup() { + kill_gconf +} + +src_prepare() { + # Do not start gconfd when installing schemas, fix bug #238276, upstream #631983 + epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch" + + # Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985 + epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch" + + # From 'master' + # mconvert: enable recursive scheme lookup and fix a crasher + epatch "${FILESDIR}/${P}-mconvert-crasher.patch" + + # dbus: Don't spew to console when unable to connect to dbus daemon + epatch "${FILESDIR}/${P}-spew-console-error.patch" + + # gsettings-data-convert: Warn (and fix) invalid schema paths + epatch "${FILESDIR}/${P}-gsettings-data-convert-paths.patch" + + gnome2_src_prepare +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --disable-static \ + --enable-gsettings-backend \ + --with-gtk=3.0 \ + --disable-orbit \ + $(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_replicate_script "${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() { + # 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/gconf/metadata.xml b/gnome-base/gconf/metadata.xml new file mode 100644 index 000000000000..d2a393a8590c --- /dev/null +++ b/gnome-base/gconf/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="ldap">Build backend which enables default mail accounts, + addressbooks and calendars for Evolution to be configured using each + user's LDAP entry."</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest new file mode 100644 index 000000000000..5984727c9077 --- /dev/null +++ b/gnome-base/gdm/Manifest @@ -0,0 +1,16 @@ +AUX 49-keychain-r1 193 SHA256 32e0b028eb6d1189fc82d72ef62661de78c491bcfa099e7ac652d6b4daa1598d SHA512 32a6d72de9b6b7bfbac0a563fc8710576419e6d989fe48da294b92b197722059ee0e46672d5df2833cd1a7dacf5ae4ebc31b12b605416fd25a0924c35e505d21 WHIRLPOOL dd8f9249e2f1c1c60131e1c030bfa4a8c251cfba083d55847273ac906bbfb27576ac29e4039c70269592667024b8a4871060139717796eed0edd3a341edbc4e0 +AUX 50-ssh-agent-r1 255 SHA256 bd91721bdccb7b1eb403c368caa6e9b84dcd75ddf89946db329ec42f9a8e7a8b SHA512 85c8eca948646508ecc52a30a15b94c626196037ab65b4d797df472df34c714aacf800261902febda5b7bc051bff29efc9fff474a0c029838881b7f8704b13ba WHIRLPOOL d4dc95afb4ef97e2a6365df27cbf8b2a3533d63471b52d5e54fc52247638701eea65fda0f339fa184919c1f8b386cff32e444e8a856bf1741aad23dd24b808de +AUX gdm-2.32.0-xinitrc-ssh-agent.patch 842 SHA256 868a7c00c4670f8291392bd063aa224477bad5d2490055086b6c8452ed439715 SHA512 40630ec2e7bee66102e141a0ba4d02e4202d052bb829606f684b6c23c9f3dbc2d43cea71d7eba163398251af2d7c7b34d0abafee76ccd6400521551de1c385bd WHIRLPOOL 0572ffda81ba45325d4fdd1c9f6b7ff6a0d6ac07ae1f7eac988ece66cdff72a34bcf69e659b36067d7171a772e7efa1a74373dda57ad627b6d1ba5f156dcd524 +AUX gdm-3.22.1-pam-module-dir.patch 1565 SHA256 0db0d1e1067c1009da94f7cab468bac2e4472bf98f4a33817308e3c95ac9c0af SHA512 ccb0e16f6e10501b10fbdbe28d06d14b261db4f66a4b5ed5092005e5b34f10938bfb0124f98e2fb2c793259da44b2fb14e6dd45d227b9a40886e275d6e45cfc3 WHIRLPOOL ca4e881f34472512813d7b51d8dc6d2fc5e501bd88ae8759e894fda50a07cb9ce455b16bfab7819f257aad3c91aa920bc27d7087b4b9359ac1d5adc5e30922e4 +AUX gdm-3.8.4-fingerprint-auth.patch 923 SHA256 7c256c4c93d959e1542d14fc2ff20f2f423dc8c4860cebeb37ff33912fcd8462 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5 WHIRLPOOL 161412826fbb165237be307688054772cfb3f955579aab5e62da9837cc9f3fef9d2ce7a4d0e738305842a343a16f978e36578ef7a54795c707ee9b4834289be7 +AUX gdm-3.8.4-logo.patch 805 SHA256 7381afcca38bdcf2d5c229bed61525a72350a95cadf3f09803615cd5158cb4bc SHA512 98dc0b01f4a4cbb87b32ec52450eb21f07bf96dc4d919cf662314c50fe0f2b1a19c90e3d8d2a0de905e8ada41642c0f89aa89dd640ead7e3d732468c9e363fb2 WHIRLPOOL 7ef489f1d989021257e87d8cacb711955d77c37ad8b9435ff2ef611b871ec7b76feb081e8ca910b3ede5dfb8a8846c10e595dd7eeae5a9018105b431175b9dfa +DIST gdm-3.22.3.tar.xz 1110740 SHA256 e7ca3ce77140efe1920f8864c2c77f89bc9f9f75e70e744994cf0a70d8780963 SHA512 b87acfca13c1d71ed1d7390625d1c36d58cfcde0ea969fa29cde5cabcb2fdf386e30e3b4d3ca057c2cdb99c202dca19d2a478b55083c468c7fb595e69881aebf WHIRLPOOL 7239028567fcdb6acba5e38982163ab52c5560d24ab3e97db065c7afbc4e7fa42611f6d271ca3d07cd30b0e5e641dee1c2958089efd69f3fd394733ebaa1c0e7 +DIST gdm-3.24.2.tar.xz 1113644 SHA256 4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8 SHA512 6e2649bce5520532a2976bac8a47629fc4c852d7127b913c29a9c43a7dba26d75472a083cbfff7b64bab56deb38ed13d8387d4d302d55f263c80120255a4a270 WHIRLPOOL 41b95ca05414af99c0ae426fb3bd28b25d3f477a22c2151bc7a94d72d09b10b48545ed511c72e7f493cabc99368776eaf16d0436db9c533efd4692ecfe4767fe +DIST gdm-3.24.3.tar.xz 1113992 SHA256 c07bb3fdde46deb0fdaf12bdfbce0365806dd4df4573783d7b8301d2a8ddbdf1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345 WHIRLPOOL 4d78e4de6c402fc3c45b48aebf3ae12cbf2065056d524288308544c4b41c23e3dbb00d012054419f8ccd36e02a515186554391e0905a8f56659dd463f25060a8 +DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153 +EBUILD gdm-3.22.3-r1.ebuild 6173 SHA256 838b95273fe5d3587f40be57a5e4f0d46e9dc278ebc7423d9117d23fed0b3a78 SHA512 8bb19f74b768ae4a03da42d0bceb9c9d61ecab486419ffae552d6976c5177d0764318d4f5361b024322725f26367edd5f4147a570f7fbfd6d09a194faeca3756 WHIRLPOOL 76752bb4079d2f7240d3a26786126c76f22eeee043aa88b8f7ae77df7b241f383ac00fa860025801b4b1f468da193f9ce2539fd83dfa6ff0296e80aebe67f5a9 +EBUILD gdm-3.24.2.ebuild 6053 SHA256 4f1e2985140cb2a22ee8b5e51ed95711d9a7380bb91cd68b2e99deeece9ab69b SHA512 2c8f15ea34137391cbc33e580f348d43cb50b56cefb58eb2e0b0d643e3c1b1141fc00d985bcb32513fceb0d76274696f66955d6ddf843044f87ae1700c2b4a8e WHIRLPOOL 4bd7be16c88906e3ca533a8950caa37b3cb7bf586e543166e4eedd8d25a5bea468ea81b361a0cbc4651a1edbc28ce98b03da0a349527b6527885d1e2e54c4ab3 +EBUILD gdm-3.24.3.ebuild 6053 SHA256 4f1e2985140cb2a22ee8b5e51ed95711d9a7380bb91cd68b2e99deeece9ab69b SHA512 2c8f15ea34137391cbc33e580f348d43cb50b56cefb58eb2e0b0d643e3c1b1141fc00d985bcb32513fceb0d76274696f66955d6ddf843044f87ae1700c2b4a8e WHIRLPOOL 4bd7be16c88906e3ca533a8950caa37b3cb7bf586e543166e4eedd8d25a5bea468ea81b361a0cbc4651a1edbc28ce98b03da0a349527b6527885d1e2e54c4ab3 +MISC ChangeLog 6471 SHA256 d3879af58a74c0fef7b26d5d2310f286c7531d5b9b951a32dab94be59c0fa320 SHA512 badf892e28495f1016498f7c8e0f1b770a18eb82e12c53e61dfab5f09d32e737fd445698f7e7c767f0be4c2c0c7de359f86b686891714dab6e52606eac21ade4 WHIRLPOOL 62fd0703eec4a24daa297866ddf85046f9c0c21c9a54b28af85239e71f7a51a18dccb6636cce242376f5290d1a4fda05239e90335eacccb3f304f18e74c4812c +MISC ChangeLog-2015 65334 SHA256 01368adb6b3b008e09f15dd743ad3fe612564fd88e1c84baa9677ba23d4bf476 SHA512 2ff9069892e4a4f080176ba21dea5965023de6b9d2081cb1101d93b2371a38af44b4e940a2543709a079dc3f3610b729c28c55d622fb7b58e87a361aa4351f9c WHIRLPOOL 19fb7648f771b47114add95e7d658ad7006bd4ae0ea4dc87adc227b78e1bf406acfd3d810ce7b1fc562e3dfb5909c793d01a373eb68f295e1fe44a1208696990 +MISC metadata.xml 477 SHA256 03820d1cffa377d641669c5fed1fdcecb0e8c9dbc285e713e8cb129884a9943e SHA512 4da6d5a4f518596834d4138db716bf58d2b2f28f07fed6379a6f0d8bdecb6b803fb3b24880dfcb93ff5aac03f512bf08af7f9742d01a497dd4fc6d7a74d1a844 WHIRLPOOL 7decea261e69d30467819cb487868efcdb31e9c11a334afa81d518cc43dfeced405ab3ec601171d87af7fc71a7042f5723216d0a9b43acf69e33d2b0a67cfa7c diff --git a/gnome-base/gdm/files/49-keychain-r1 b/gnome-base/gdm/files/49-keychain-r1 new file mode 100644 index 000000000000..51a1ca87905c --- /dev/null +++ b/gnome-base/gdm/files/49-keychain-r1 @@ -0,0 +1,9 @@ +#!/bin/bash + +# source keychain variables + +keychain="`which keychain 2>/dev/null`" +if [ -n "$keychain" ] && [ -x "$keychain" ] && [ -f "$HOME/.bash_profile" ] +then + . "${HOME}/.bash_profile" +fi diff --git a/gnome-base/gdm/files/50-ssh-agent-r1 b/gnome-base/gdm/files/50-ssh-agent-r1 new file mode 100644 index 000000000000..4d94fb04a14a --- /dev/null +++ b/gnome-base/gdm/files/50-ssh-agent-r1 @@ -0,0 +1,10 @@ +#!/bin/sh + +# add ssh-agent if found + +sshagent="`which ssh-agent 2>/dev/null`" +if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then + command="$sshagent -- $command" +elif [ -z "$sshagent" ] ; then + echo "$0: ssh-agent not found!" +fi diff --git a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch new file mode 100644 index 000000000000..bfd8398af2b3 --- /dev/null +++ b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch @@ -0,0 +1,32 @@ +From c0581264d5e2b412aa27dc30623512b461024e4f Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 2 Nov 2010 23:19:31 +0100 +Subject: [PATCH 2/4] ssh-agent handling must be done at xinitrc.d + +Gentoo bug: #220603 +--- + data/Xsession.in | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/data/Xsession.in b/data/Xsession.in +index 201be92..88f1fd9 100755 +--- a/data/Xsession.in ++++ b/data/Xsession.in +@@ -191,14 +191,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then + done + fi + +-# add ssh-agent if found +-sshagent="`gdmwhich ssh-agent`" +-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then +- command="$sshagent -- $command" +-elif [ -z "$sshagent" ] ; then +- echo "$0: ssh-agent not found!" +-fi +- + echo "$0: Setup done, will execute: $command" + + eval exec $command +-- +1.8.5.1 + diff --git a/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch b/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch new file mode 100644 index 000000000000..7dc4392e41cb --- /dev/null +++ b/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch @@ -0,0 +1,52 @@ +From 4fc9023bb86689f1391651fa744d9e63ee1d7bbc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> +Date: Mon, 21 Nov 2016 08:18:32 +0100 +Subject: [PATCH] pam_gdm: allow setting pam module dir at configure time + +Code taken almost verbatim from gnome-keyring. +--- + configure.ac | 10 +++++++++- + pam_gdm/Makefile.am | 2 +- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dd98992..e0074dd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -476,7 +476,7 @@ dnl --------------------------------------------------------------------------- + dnl - Check for PAM stuff + dnl --------------------------------------------------------------------------- + +-dnl PAM prefix ++dnl PAM prefix (configuration files) + withval="" + AC_ARG_WITH(pam-prefix, + AS_HELP_STRING([--with-pam-prefix=<prefix>], +@@ -492,6 +492,14 @@ else + fi + AC_SUBST(PAM_PREFIX) + ++dnl PAM dir (dynamic modules) ++AC_ARG_WITH([pam-dir], ++ [AC_HELP_STRING([--with-pam-dir=DIR], ++ [directory to install pam modules in])], ++ [], [with_pam_dir='${libdir}/security']) ++PAM_DEST_DIR="$with_pam_dir" ++AC_SUBST(PAM_DEST_DIR) ++ + have_pam=no + AC_CHECK_LIB(pam, pam_start, have_pam=yes) + +diff --git a/pam_gdm/Makefile.am b/pam_gdm/Makefile.am +index 61d672b..980b31c 100644 +--- a/pam_gdm/Makefile.am ++++ b/pam_gdm/Makefile.am +@@ -36,4 +36,4 @@ pam_gdm_LTLIBRARIES = \ + pam_gdm.la \ + $(END_OF_LIST) + +-pam_gdmdir = $(libdir)/security ++pam_gdmdir = $(PAM_DEST_DIR) +-- +2.10.2 + diff --git a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch new file mode 100644 index 000000000000..cd19077a5f1d --- /dev/null +++ b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch @@ -0,0 +1,29 @@ +From 75fe02c2b383b27b202940bdedd7d8d2c64169fb Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Tue, 30 Jul 2013 22:56:30 -0400 +Subject: [PATCH 3/4] Gentoo does not have a fingerprint-auth pam stack + +--- + data/pam-exherbo/gdm-fingerprint.pam | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/data/pam-exherbo/gdm-fingerprint.pam b/data/pam-exherbo/gdm-fingerprint.pam +index 41639ec..d9633fb 100644 +--- a/data/pam-exherbo/gdm-fingerprint.pam ++++ b/data/pam-exherbo/gdm-fingerprint.pam +@@ -1,6 +1,11 @@ + account include system-login + +-auth substack fingerprint-auth ++auth optional pam_env.so ++auth required pam_tally2.so onerr=succeed ++auth required pam_shells.so ++auth required pam_nologin.so ++auth required pam_fprintd.so ++auth required pam_permit.so + auth optional pam_gnome_keyring.so + + password required pam_deny.so +-- +1.8.5.1 + diff --git a/gnome-base/gdm/files/gdm-3.8.4-logo.patch b/gnome-base/gdm/files/gdm-3.8.4-logo.patch new file mode 100644 index 000000000000..151d4bc77f42 --- /dev/null +++ b/gnome-base/gdm/files/gdm-3.8.4-logo.patch @@ -0,0 +1,25 @@ +From bcc651df77a429a6bf9b13892f71fedb1b87a069 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 11 Dec 2013 22:46:58 +0100 +Subject: [PATCH 4/4] Apply Gentoo branding + +--- + data/org.gnome.login-screen.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/org.gnome.login-screen.gschema.xml.in b/data/org.gnome.login-screen.gschema.xml.in +index 03da374..5e81bc0 100644 +--- a/data/org.gnome.login-screen.gschema.xml.in ++++ b/data/org.gnome.login-screen.gschema.xml.in +@@ -31,7 +31,7 @@ + </_description> + </key> + <key name="logo" type="s"> +- <default>''</default> ++ <default>'/usr/share/pixmaps/gentoo-gdm.svg'</default> + <_summary> + Path to small image at top of user list + </_summary> +-- +1.8.5.1 + diff --git a/gnome-base/gdm/gdm-3.22.3-r1.ebuild b/gnome-base/gdm/gdm-3.22.3-r1.ebuild new file mode 100644 index 000000000000..ea15676a90dc --- /dev/null +++ b/gnome-base/gdm/gdm-3.22.3-r1.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 pam readme.gentoo-r1 systemd user versionator + +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" +HOMEPAGE="https://wiki.gnome.org/Projects/GDM" + +SRC_URI="${SRC_URI} + branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" + +LICENSE=" + GPL-2+ + branding? ( CC-BY-SA-4.0 ) +" + +SLOT="0" + +IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" + +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.36:2[dbus] + >=x11-libs/gtk+-2.91.1:3 + >=gnome-base/dconf-0.20 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + >=media-libs/fontconfig-2.5.0:1.0 + >=media-libs/libcanberra-0.4[gtk3] + sys-apps/dbus + >=sys-apps/accountsservice-0.6.12 + + x11-apps/sessreg + x11-base/xorg-server + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-libs/libxcb + >=x11-misc/xdg-utils-1.0.2-r3 + + virtual/pam + + >=sys-apps/systemd-186:0=[pam] + + sys-auth/pambase[systemd] + + audit? ( sys-process/audit ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) +" +# XXX: These deps are from session and desktop files in data/ directory +# fprintd is used via dbus by gdm-fingerprint-extension +# gnome-session-3.6 needed to avoid freezing with orca +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-session-3.6 + >=gnome-base/gnome-shell-3.1.90 + x11-apps/xhost + + accessibility? ( + >=app-accessibility/orca-3.10 + gnome-extra/mousetweaks ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) + + !gnome-extra/fast-user-switch-applet +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + >=dev-util/intltool-0.40.0 + dev-util/itstool + virtual/pkgconfig + x11-proto/inputproto + x11-proto/randrproto + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) +" + +DOC_CONTENTS=" + To make GDM start at boot, run:\n + # systemctl enable gdm.service\n + \n + For passwordless login to unlock your keyring, you need to install + sys-auth/pambase with USE=gnome-keyring and set an empty password + on your keyring. Use app-crypt/seahorse for that.\n + \n + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 + for smartcard support +" + +pkg_setup() { + enewgroup gdm + enewgroup video # Just in case it hasn't been created yet + enewuser gdm -1 -1 /var/lib/gdm gdm,video + + # For compatibility with certain versions of nvidia-drivers, etc., need to + # ensure that gdm user is in the video group + if ! egetent group video | grep -q gdm; then + # FIXME XXX: is this at all portable, ldap-safe, etc.? + # XXX: egetent does not have a 1-argument form, so we can't use it to + # get the list of gdm's groups + local g=$(groups gdm) + elog "Adding user gdm to video group" + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" + fi +} + +src_prepare() { + # ssh-agent handling must be done at xinitrc.d, bug #220603 + eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # Gentoo does not have a fingerprint-auth pam stack + eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" + + # Show logo when branding is enabled + use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch" + + # allow setting pam module dir, bug #599714 + eapply "${FILESDIR}/${PN}-3.22.1-pam-module-dir.patch" + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + local myconf + # PAM is the only auth scheme supported + # even though configure lists shadow and crypt + # they don't have any corresponding code. + # --with-at-spi-registryd-directory= needs to be passed explicitly because + # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 + # Xevie is obsolete, bug #482304 + # --with-initial-vt=7 conflicts with plymouth, bug #453392 + ! use plymouth && myconf="${myconf} --with-initial-vt=7" + + gnome2_src_configure \ + --enable-gdm-xsession \ + --enable-user-display-server \ + --with-run-dir=/run/gdm \ + --localstatedir="${EPREFIX}"/var \ + --disable-static \ + --with-xdmcp=yes \ + --enable-authentication-scheme=pam \ + --with-default-pam-config=exherbo \ + --with-pam-dir=$(getpam_mod_dir) \ + --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ + --without-xevie \ + --enable-systemd-journal \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + $(use_with audit libaudit) \ + $(use_enable ipv6) \ + $(use_with plymouth) \ + $(use_with selinux) \ + $(use_with tcpd tcp-wrappers) \ + $(use_enable wayland wayland-support) \ + $(use_with xinerama) \ + ${myconf} +} + +src_install() { + gnome2_src_install + + if ! use accessibility ; then + rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die + fi + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}/49-keychain-r1" 49-keychain + newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent + + # gdm user's home directory + keepdir /var/lib/gdm + fowners gdm:gdm /var/lib/gdm + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg + + readme.gentoo_create_doc +} + +pkg_postinst() { + local d ret + + gnome2_pkg_postinst + + # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm + ret=0 + ebegin "Fixing "${EROOT}"var/lib/gdm ownership" + chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 + for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do + [[ ! -e "${d}" ]] || chown -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.24.2.ebuild b/gnome-base/gdm/gdm-3.24.2.ebuild new file mode 100644 index 000000000000..98e6db80fbba --- /dev/null +++ b/gnome-base/gdm/gdm-3.24.2.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 pam readme.gentoo-r1 systemd user versionator + +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" +HOMEPAGE="https://wiki.gnome.org/Projects/GDM" + +SRC_URI="${SRC_URI} + branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" + +LICENSE=" + GPL-2+ + branding? ( CC-BY-SA-4.0 ) +" + +SLOT="0" + +IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.36:2[dbus] + >=x11-libs/gtk+-2.91.1:3 + >=gnome-base/dconf-0.20 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + >=media-libs/fontconfig-2.5.0:1.0 + >=media-libs/libcanberra-0.4[gtk3] + sys-apps/dbus + >=sys-apps/accountsservice-0.6.35 + + x11-apps/sessreg + x11-base/xorg-server + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-libs/libxcb + >=x11-misc/xdg-utils-1.0.2-r3 + + virtual/pam + >=sys-apps/systemd-186:0=[pam] + + sys-auth/pambase[systemd] + + audit? ( sys-process/audit ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) +" +# XXX: These deps are from session and desktop files in data/ directory +# fprintd is used via dbus by gdm-fingerprint-extension +# gnome-session-3.6 needed to avoid freezing with orca +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-session-3.6 + >=gnome-base/gnome-shell-3.1.90 + x11-apps/xhost + + accessibility? ( + >=app-accessibility/orca-3.10 + gnome-extra/mousetweaks ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) + + !gnome-extra/fast-user-switch-applet +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + >=dev-util/intltool-0.40.0 + dev-util/itstool + virtual/pkgconfig + x11-proto/inputproto + x11-proto/randrproto + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) +" + +DOC_CONTENTS=" + To make GDM start at boot, run:\n + # systemctl enable gdm.service\n + \n + For passwordless login to unlock your keyring, you need to install + sys-auth/pambase with USE=gnome-keyring and set an empty password + on your keyring. Use app-crypt/seahorse for that.\n + \n + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 + for smartcard support +" + +pkg_setup() { + enewgroup gdm + enewgroup video # Just in case it hasn't been created yet + enewuser gdm -1 -1 /var/lib/gdm gdm,video + + # For compatibility with certain versions of nvidia-drivers, etc., need to + # ensure that gdm user is in the video group + if ! egetent group video | grep -q gdm; then + # FIXME XXX: is this at all portable, ldap-safe, etc.? + # XXX: egetent does not have a 1-argument form, so we can't use it to + # get the list of gdm's groups + local g=$(groups gdm) + elog "Adding user gdm to video group" + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" + fi +} + +src_prepare() { + # ssh-agent handling must be done at xinitrc.d, bug #220603 + eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # Gentoo does not have a fingerprint-auth pam stack + eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" + + # Show logo when branding is enabled + use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch" + + gnome2_src_prepare +} + +src_configure() { + local myconf + # PAM is the only auth scheme supported + # even though configure lists shadow and crypt + # they don't have any corresponding code. + # --with-at-spi-registryd-directory= needs to be passed explicitly because + # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 + # Xevie is obsolete, bug #482304 + # --with-initial-vt=7 conflicts with plymouth, bug #453392 + ! use plymouth && myconf="${myconf} --with-initial-vt=7" + + gnome2_src_configure \ + --enable-gdm-xsession \ + --enable-user-display-server \ + --with-run-dir=/run/gdm \ + --localstatedir="${EPREFIX}"/var \ + --disable-static \ + --with-xdmcp=yes \ + --enable-authentication-scheme=pam \ + --with-default-pam-config=exherbo \ + --with-pam-mod-dir=$(getpam_mod_dir) \ + --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ + --without-xevie \ + --enable-systemd-journal \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + $(use_with audit libaudit) \ + $(use_enable ipv6) \ + $(use_with plymouth) \ + $(use_with selinux) \ + $(use_with tcpd tcp-wrappers) \ + $(use_enable wayland wayland-support) \ + $(use_with xinerama) \ + ${myconf} +} + +src_install() { + gnome2_src_install + + if ! use accessibility ; then + rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die + fi + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}/49-keychain-r1" 49-keychain + newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent + + # gdm user's home directory + keepdir /var/lib/gdm + fowners gdm:gdm /var/lib/gdm + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg + + readme.gentoo_create_doc +} + +pkg_postinst() { + local d ret + + gnome2_pkg_postinst + + # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm + ret=0 + ebegin "Fixing "${EROOT}"var/lib/gdm ownership" + chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 + for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do + [[ ! -e "${d}" ]] || chown -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.24.3.ebuild b/gnome-base/gdm/gdm-3.24.3.ebuild new file mode 100644 index 000000000000..98e6db80fbba --- /dev/null +++ b/gnome-base/gdm/gdm-3.24.3.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 pam readme.gentoo-r1 systemd user versionator + +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" +HOMEPAGE="https://wiki.gnome.org/Projects/GDM" + +SRC_URI="${SRC_URI} + branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" + +LICENSE=" + GPL-2+ + branding? ( CC-BY-SA-4.0 ) +" + +SLOT="0" + +IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.36:2[dbus] + >=x11-libs/gtk+-2.91.1:3 + >=gnome-base/dconf-0.20 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + >=media-libs/fontconfig-2.5.0:1.0 + >=media-libs/libcanberra-0.4[gtk3] + sys-apps/dbus + >=sys-apps/accountsservice-0.6.35 + + x11-apps/sessreg + x11-base/xorg-server + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-libs/libxcb + >=x11-misc/xdg-utils-1.0.2-r3 + + virtual/pam + >=sys-apps/systemd-186:0=[pam] + + sys-auth/pambase[systemd] + + audit? ( sys-process/audit ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) +" +# XXX: These deps are from session and desktop files in data/ directory +# fprintd is used via dbus by gdm-fingerprint-extension +# gnome-session-3.6 needed to avoid freezing with orca +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-session-3.6 + >=gnome-base/gnome-shell-3.1.90 + x11-apps/xhost + + accessibility? ( + >=app-accessibility/orca-3.10 + gnome-extra/mousetweaks ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) + + !gnome-extra/fast-user-switch-applet +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + >=dev-util/intltool-0.40.0 + dev-util/itstool + virtual/pkgconfig + x11-proto/inputproto + x11-proto/randrproto + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) +" + +DOC_CONTENTS=" + To make GDM start at boot, run:\n + # systemctl enable gdm.service\n + \n + For passwordless login to unlock your keyring, you need to install + sys-auth/pambase with USE=gnome-keyring and set an empty password + on your keyring. Use app-crypt/seahorse for that.\n + \n + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 + for smartcard support +" + +pkg_setup() { + enewgroup gdm + enewgroup video # Just in case it hasn't been created yet + enewuser gdm -1 -1 /var/lib/gdm gdm,video + + # For compatibility with certain versions of nvidia-drivers, etc., need to + # ensure that gdm user is in the video group + if ! egetent group video | grep -q gdm; then + # FIXME XXX: is this at all portable, ldap-safe, etc.? + # XXX: egetent does not have a 1-argument form, so we can't use it to + # get the list of gdm's groups + local g=$(groups gdm) + elog "Adding user gdm to video group" + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" + fi +} + +src_prepare() { + # ssh-agent handling must be done at xinitrc.d, bug #220603 + eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # Gentoo does not have a fingerprint-auth pam stack + eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" + + # Show logo when branding is enabled + use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch" + + gnome2_src_prepare +} + +src_configure() { + local myconf + # PAM is the only auth scheme supported + # even though configure lists shadow and crypt + # they don't have any corresponding code. + # --with-at-spi-registryd-directory= needs to be passed explicitly because + # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 + # Xevie is obsolete, bug #482304 + # --with-initial-vt=7 conflicts with plymouth, bug #453392 + ! use plymouth && myconf="${myconf} --with-initial-vt=7" + + gnome2_src_configure \ + --enable-gdm-xsession \ + --enable-user-display-server \ + --with-run-dir=/run/gdm \ + --localstatedir="${EPREFIX}"/var \ + --disable-static \ + --with-xdmcp=yes \ + --enable-authentication-scheme=pam \ + --with-default-pam-config=exherbo \ + --with-pam-mod-dir=$(getpam_mod_dir) \ + --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ + --without-xevie \ + --enable-systemd-journal \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + $(use_with audit libaudit) \ + $(use_enable ipv6) \ + $(use_with plymouth) \ + $(use_with selinux) \ + $(use_with tcpd tcp-wrappers) \ + $(use_enable wayland wayland-support) \ + $(use_with xinerama) \ + ${myconf} +} + +src_install() { + gnome2_src_install + + if ! use accessibility ; then + rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die + fi + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}/49-keychain-r1" 49-keychain + newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent + + # gdm user's home directory + keepdir /var/lib/gdm + fowners gdm:gdm /var/lib/gdm + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg + + readme.gentoo_create_doc +} + +pkg_postinst() { + local d ret + + gnome2_pkg_postinst + + # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm + ret=0 + ebegin "Fixing "${EROOT}"var/lib/gdm ownership" + chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 + for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do + [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1 + done + eend ${ret} + + systemd_reenable gdm.service + + readme.gentoo_print_elog +} diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml new file mode 100644 index 000000000000..747420ed8b55 --- /dev/null +++ b/gnome-base/gdm/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="fprint">Enables experimental fingerprint authentication using + <pkg>sys-auth/fprintd</pkg></flag> + <flag name="plymouth">Enable support for smooth transition from + <pkg>sys-boot/plymouth</pkg></flag> +</use> +</pkgmetadata> diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest new file mode 100644 index 000000000000..ee7d72a0c039 --- /dev/null +++ b/gnome-base/gnome-common/Manifest @@ -0,0 +1,6 @@ +DIST gnome-common-3.18.0.tar.xz 155804 SHA256 22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf SHA512 b931c9a6668d996560549738bb2d95f86f56fa68ce930c077275bdc8fddbc2d28d215c1190099db1df851417902fca87ec81f1c0e644c5b9630a175e1cde0719 WHIRLPOOL d84fbee01c1b51c333395998d98eeb2d31d60dbac6a624bdc066b62d1f583bd36759e8e46528970f12b786ccf2724ad8204af5dadaf75656d9b9b0567269f07e +EBUILD gnome-common-3.18.0-r1.ebuild 663 SHA256 aef9eaecad9abcd4e41c04e7c4336b876f450ddd22194794923ab20464e428e4 SHA512 01df27dc01c1311bc12baf38362100058cb6592cebd2a7c2904e70e77cf1c37c5d36f3bebdcfc467cb94034e3f82ad3b24f2d44d8e59db2a1af54585b002e248 WHIRLPOOL b6fd3d8b9065007df297b1c3080488733a2b9b3966b4a8a93c993bb7819d898d0295478dd7cdacf50d403751a6fd716eb8afd7c762bb40c1d6b15681c29ab8d4 +EBUILD gnome-common-3.18.0.ebuild 752 SHA256 68fe51dcfeecedf208adb2cb2c523fd947a92048f61d2fd0a94d08a864190491 SHA512 ad16bc58c922293a52ba972b400d9ee9664cfd100bb86b13f29e636a5ecc6939af73a8923901d37248a94563fe39f51859639f6ce560fa1eff1f31d6a6f33a0b WHIRLPOOL d74c66b8c7cdf4e4c52bd27f390e1f016aa3eb661e9dc9e59ecc3524acc4c4843bb8c269b6ea01f97ccfb5c061e4d5154151c8234709be9ec3d0a2f29a768a63 +MISC ChangeLog 4857 SHA256 97553f7e82ac1049085e32c39908a8e8f93696356163143179794e921fd88e78 SHA512 040839d6266c284f3e4926f347e724eb9331ee1a89b6472d24e55b10bc8c1e464fd6c005807ee49e35c75cf02840bf6959bdc462805d40dfdbb547e5d3d41a6b WHIRLPOOL 3220cd8f56431a2a7801f143961f70947bf27ee308a3ca5e576479699410eb400744f4cbb03785eebdb78a64c6ae4321e3dfe514a27f2bc3cfd6fd738da14210 +MISC ChangeLog-2015 19149 SHA256 0f68d4914f9db2e6c7c5828d9f94c52c7a09082c41e5d66b5623305cbb880fcf SHA512 ede3324eeb8d1be3b78e0417b91e89556f75e9ec2b1a3d325372d13490749edf7fef1654309d80fc9f2ad3e6038c0ca9806110f1d3ad872b10dd63ec43f14eff WHIRLPOOL 10acc2908ecc5357df63763fbfb2b090b197bd68869cbd63ceae4425d4a98e4205064572f8c551ff4ea40ab311749e9d2182008d78fbf6c61d2f51bf068b1e53 +MISC metadata.xml 423 SHA256 5f437a19b22ddcbcb9c86d13d17b2a4f7d86790cbe5c28567e0af9222ce1051f SHA512 267dd7f1897f75f178b4f83325117792d9bccfdc339327eb54b151452c65fedadd72b4c0205b00d18a9edd985dbb9cc32e11bf4e3b587a8dd3d6a3a9bc8d1183 WHIRLPOOL 31b79fa614ed401814c3c81f07fc5c9f499fa39b380f83e3fd42eced470a4cac1c4cd181b9df34a33e58117fa7b0fe21f53f774fb4e84cde2a2140cd9a2ab9c8 diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild new file mode 100644 index 000000000000..6ef07b78a497 --- /dev/null +++ b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Common files for development of Gnome packages" +HOMEPAGE="https://git.gnome.org/browse/gnome-common" + +LICENSE="GPL-3" +SLOT="3" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="+autoconf-archive" + +RDEPEND="" +DEPEND="" + +src_configure() { + # Force people to rely on sys-devel/autoconf-archive, bug #594084 + gnome2_src_configure --with-autoconf-archive +} diff --git a/gnome-base/gnome-common/gnome-common-3.18.0.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0.ebuild new file mode 100644 index 000000000000..6453ba4ad343 --- /dev/null +++ b/gnome-base/gnome-common/gnome-common-3.18.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="no" + +inherit gnome2 + +DESCRIPTION="Common files for development of Gnome packages" +HOMEPAGE="https://git.gnome.org/browse/gnome-common" + +LICENSE="GPL-3" +SLOT="3" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="+autoconf-archive" + +RDEPEND="autoconf-archive? ( >=sys-devel/autoconf-archive-2015.02.04 ) + !autoconf-archive? ( !>=sys-devel/autoconf-archive-2015.02.04 ) +" +DEPEND="" + +src_configure() { + gnome2_src_configure \ + $(use_with autoconf-archive) +} diff --git a/gnome-base/gnome-common/metadata.xml b/gnome-base/gnome-common/metadata.xml new file mode 100644 index 000000000000..1340d1a31fcd --- /dev/null +++ b/gnome-base/gnome-common/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="autoconf-archive">Pull in <pkg>sys-devel/autoconf-archive</pkg> for ax_*.m4 files + instead of installing them from the gnome-common tarball</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest new file mode 100644 index 000000000000..ff60338dbc1f --- /dev/null +++ b/gnome-base/gnome-control-center/Manifest @@ -0,0 +1,22 @@ +AUX 3.22.2-fix-build-without-wayland.patch 1103 SHA256 7d75ff72fce62dc92fbec52b25cd378deee664e5169e403bb2f80ff562520242 SHA512 629deca257bd71f660728798747a4207d6e87a4442b2473a3ae1fb4be0770eac3b93f2496b33dab290fe671a08a8648f597ef65548dc705c35578bbc7ba3112b WHIRLPOOL 724794a600a4095e1f32913f80c165c1b6dcb4dcbfc04d940b6324bf82ef0396488142052556c1bb16cd7079c99f68ee86d51b75ce823dbfa0940cab1cf9b11b +AUX 3.22.2-fix-dual-gpu-crash.patch 946 SHA256 dc53c7f4e5a6c90f11a84641059b81dd2180cee6d1bb49bb75c9ee4ac2f487a0 SHA512 55748a6c2aea9b8454e455b561f3097025bb085c70eca04948e490f9b59e8eb64985832a06193979f6ac1de19d8a064fc48548bb78b9b6a90a4465427838e1f6 WHIRLPOOL e1953663c0a1e632747dc81e161d469be5f1c56a577cc4cced56684802b117912db8ba5cbadd62adde688f85923938a85210d8b0d8891ad6f547409ce285fb77 +AUX 3.24.2-fix-without-gdkwayland.patch 1363 SHA256 31c0f4732f264e3dba61bd1d2a0c223ef041eed7c48bcf56917293ee95060ab7 SHA512 8f46ecc84e5ffbce5519683ab86a44ba2e19d20e20ef5b7c346c5ec760e13d72292b4cfbe0d0710f047e8b14ba37f707ef546a75515e3e6f47b6739bb3dcf2da WHIRLPOOL 724af66c9d9f74a7b0dc373f002dd6675c9a375ec13096857240f4c3bb05548bc9fda53ff5935ad8e31fa3ff860e6915c5fe6d0a73a24a7b173a737f858a27f7 +AUX 3.24.2-gentoo-paths.patch 3785 SHA256 8f9fd3c0bda0746c68314ffca8f9422a5d174d709996b8f5a109d3cb9c1719fa SHA512 695ca629b4110d2123f0d0180cddebce86aff303f96dbaeeed7ca9d5819108c53a302a5c0fb5bbcf3516369b10ccefc2948fbbd18725d349c0eb26218339b5fa WHIRLPOOL 1c4a08cc5e6a583775c94b5bf202552e3d35090c39f79d8111a99041d294861df6ad89d88c4f4b94902e5189ae012a0e46bf8c06569afa89065ce7a085fb1f6f +AUX 3.24.2-optional-cups.patch 6546 SHA256 1ec369f5d764d0deac07061d6d3b88fc962b49cb3ce4333698cae78b2e035d41 SHA512 95d6d89ea7cdd10e15a462b123a52237386cc4a82f3064a62277a6de48d3c6db76ceb6f8fe5a088f3bb4523f2679e24d978fb868842cf27094760a5a8663a527 WHIRLPOOL 4d343d285b2f96c77ef1e4b3a9ad1398964655aea277f202b8146585305c7c8b0891c6d2a056f3743378a339ffadefca34abab9c13b76810ee44f2188f8ebce5 +AUX 3.24.2-optional-networkmanager.patch 2985 SHA256 67ee5d1b78a74b7d5777e9f8a049b8afd2a44377a2848e987c16b3dab1a63eb1 SHA512 8319deff6e96745b31661d70112ffae120416445efb8732fc92f0c1e0aa392942668db3234330133b27f7a6e81d416ed22db47ece5204a1ff9628978827fe929 WHIRLPOOL 66a071232c354162620904b30cd8f230b95b9d6f62df36df039e50cc77baacb1b226231810b3bd13a8d84d8b8e18d868adf20fb7e140f1063fc2f9c23f1b5983 +AUX 3.24.2-optional-wayland.patch 1361 SHA256 c4e589657825fd42652b06725316e67fbb0d2f44390e94b4e397353287f45a0b SHA512 3fa91c8977df2332b14055863820d246700cf8c23f7167c8008a17a8b7744ed91182e5cc71575477b0e5186036c830835b26e387a2f659ec1e9022eb77a98005 WHIRLPOOL 84e0c8048ee9fca38e35ec2baa22bf5487785cae415a379dc87ade493ffb4c2f96e4a47e3b4c4d10793343d125b8a1a6cd371b95302a38c47c566ac1dd381943 +AUX 3.24.2-optional.patch 20472 SHA256 83d9da8d07d6b90b1c0f1744aab1be62ed07f1911f6646971fa332b1e7a4fe5e SHA512 b10e22183720cdbd94aa9e052b6f7568a836c619d1afc243d481f91afff07cedff6dd5e4b945ce4d5d7931aef8617a6a60f9304bb712a12a66bd9b1396859f8f WHIRLPOOL 22efe81b31287b8ac411598c88e5b0a6b044435208e8f045beb0a9ce3bd82b0197e4f60518b20a3e9645abbe5e5826216e7783572a7a3e28dbae6510c99dcc1a +AUX gnome-control-center-3.22.0-gentoo-paths.patch 4314 SHA256 ad5b1db4677c1c71597220e0dee6db8fec83a2d1bfe64814a7e40eb38005be00 SHA512 d4be7f0dcffd3fe1e9dd2613431e6d003c6085bd2f46b92b601eba6a9270ca0403856de30997024b4bc5eb4fd79e7a7bccac18c1895205f0bfa556f01205f491 WHIRLPOOL f385e66c64fead42b0bc5d40c7c36b5198fa4043931ea6534af5ef2c04a5fde7a719611f1287c55fe50a05138d0b38a8aa144fac98f79252ed71e30a3e302cd8 +AUX gnome-control-center-3.22.0-keep-panels-optional.patch 1061 SHA256 7279baa1124ddb65027dd65df770a2f130aaae724f0f364820cd39ca21ddd534 SHA512 7f88be97cb7354db2cfd9ed3528c4e72f12b48788831dea48f59bc93e8521d3d6de4a14ed0ae580cb4a0fd48ddf4b5d131125325289277820c98e1bb9aafa96f WHIRLPOOL 8d994ce5bb337d875eeb84fe1a55174ab52f07d3cb6d8074ae8b014a3a9b2e08e84e06e7fad33aa71a5ef10b5bf83d4147f241d88b37ccc770c7a9eec78ddecc +AUX gnome-control-center-3.22.0-make-networkmanager-optional.patch 2975 SHA256 53bc2c00226a978ee357498597c6dc7b7c0c51ebe121332ac7b37f2464502e9a SHA512 152880e919e418b4997560558b2a7ec287ba5a9b1edc9983c5991a5e0ab5f9f940ab5ae192a146cafb959d511f06d3f36e232a91869f936b9816cefb5fe89ac5 WHIRLPOOL d06e3b3f824bed30476ba3e0b2a1a31521e68cb2e9160157a1b1ee889995118cc342188532badcbb24247bfee67dd69c4935f282a8c024868c4a8d382a8d1c1c +AUX gnome-control-center-3.22.0-make-wayland-optional.patch 1343 SHA256 7946c160cdee7c89ad2829894993bbd765b80bcf34c6d8b5e749115f3bd85fc7 SHA512 6466122a63525517a99b41bf8366ac244d7d25c7b12b953ebd36568ac61b84d4c1a67dc6c53aa19f5c115c5754db132b2f7bb630f515e7c2a7e52e9abbcf1ba9 WHIRLPOOL 5d02b458c1ab797265f19e4999dac4880784a0b0259b1a635ebc78d2d77a74e2ebed61d859a9b82c544945d753a5531e405b886df5a0bb2b9804da74d0cfae18 +AUX gnome-control-center-3.22.0-optional.patch 21387 SHA256 225161377afc6afd44f31e6376208137c96942f3722b580e8bbc21f0e48bf36b SHA512 78cbd1ebbd60ee7c9837724899224bca836dc4149154e101da54caf17f3d1652eb67aede09b41a58f43b68791a05ce82fa910e3ec9ce417b735f708d9482f683 WHIRLPOOL a1cdfdb291ac21ba9d13166225162e5b1e9305e72496455aa09e53d2ad6f04bb26e1963c6bbb421d3c0eb18d32b32acc47e47458f3c343883621968172a06459 +DIST gnome-control-center-3.22.2.tar.xz 7277380 SHA256 7512ff3e256c1d43a746752e90a8079d0b064aae35283cfe863e19706ce22f92 SHA512 a9ed72c47703fcbbd0d6f3301be7d5b3a8eff2f0c400bde19e14c5d013404fc5907765fb20af40022f7700547d06c02203a919b4db4c191f64f3ac20cb12626a WHIRLPOOL 393fa9d1752330ebac81215f35df5da6ed4b457cbc5ce56a5497191584266161c4ab0105b16535ef245be62aec27c6556fca2416ce7b91651b266f224592b686 +DIST gnome-control-center-3.24.2.tar.xz 7269112 SHA256 382a4b1bf54754c1f5f83adb1faeca2e9de70df5d3d85ac6b0fb192801518f2b SHA512 5041d4907cba0ea188663ad574ddaac6c341ec22b69f7a3d6332b8ae0a572fe33eb19eed758f3d593fe6224d793f2ecc3677584ebf0971f3ae145363a1769cc0 WHIRLPOOL 6e42ec6ac877eb19cc64d5d52106662a872cd4cba25bf0fb2f0fa4a4c1d82fc4149a52f7922e1e1e6dd005133cf54d5e154f75807da58d510e7d09610b41cb7b +DIST gnome-control-center-3.24.3.tar.xz 7302120 SHA256 43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2 SHA512 70b827f70fb95e8db0ee01e3ba80242dfdb0f90e31c391ca470c372cb6c8626f054e1e5b79e954935e9b567564129b80957091039e16e921e1c93b3d584c71cb WHIRLPOOL 3e5b9c47ef2ecf9fdba3037ace51eefab765e7dfa829586b90da267ccbd099658f48967600aaaa3259796e56805fe3c90fa55577787ca84bdd5e6cfb2729757b +EBUILD gnome-control-center-3.22.2-r1.ebuild 5085 SHA256 b5958943c4bf183b78c1d42c8a9cdc9c4bb994ff64b494c3c0b050d6d993d6ab SHA512 334c5d600c341d47051a3b47cfb8e986922111d17cb8e0099969b29597630b046ba06abe86d63af705b468bb0e9d778f7447a0ef8262f57b88723352470ce643 WHIRLPOOL 6bf23b56ccc59c30b31812a57211d2650ae95f6982a05bb6e69ccb4730b775aec80ef70655b7fffe30cd236b00f44ee1d7b0828ec1c4c516366c4303109cc801 +EBUILD gnome-control-center-3.24.2.ebuild 5162 SHA256 0f2602b9b4a351cb89d02e8d65567995bffbb3b186d9e1685b4c3b050ab7aaa0 SHA512 71714546dd36432c4f0d042de36a72a20b631143e40ceeeb217cf91aee99f883e6990d330a3053951a7f349b805fa0ed1fac566fdb364164047ac3751de1fe6c WHIRLPOOL 8504d0beafc96f659627a6bd848c8b89fef61deb8ce97d61e24279ea1b56a31b80bba96d8888224bf0b1b3f7c78f6a514112fba34de9a4fd1532a7d0745605b7 +EBUILD gnome-control-center-3.24.3.ebuild 5168 SHA256 d9de6c73600818e29884106c5bb1ada2965dcc0fb9acb53b7d79b74d5e2b1212 SHA512 bdfdfc6c449ed0f333c523a648c9c4bdabaf58eeabddf303cd75a3d9114d3827483dba90480f548e63e6b55d204e420bb2e9549e4107dc4367d7adc8b633abec WHIRLPOOL 1dba8b0c428d7a3dd47b4af9ff042e3d8eeb8a3a227c210832bc6a070bbe870d1bae099840e50e3960e9dac51651c12b5e35b16d49932c5575c48c20636c5e85 +MISC ChangeLog 8967 SHA256 9e300ae898549cdf9392349486d15993b508ed96282285ff5c123953172a2e57 SHA512 710c2de6027e881b07940e180fef6ee1456c709c5326198c85624562bc46e2cecae98d36971a143659e1a9fd033301093f90330f99e9472578f50cf7d7ff8492 WHIRLPOOL 144d323773bd14b4435c1ed9fabc07d94bd1a0113f4496e2eeaa00fd8b8d715f8ac2ef6e082f2f99345b8a9586c642719bb42cd9484e473a7afacb7c7bf373b7 +MISC ChangeLog-2015 73186 SHA256 244a99f3d136afed135c7a5d00c2b359988e38741304bbc12f77c5781117ac9b SHA512 4ec762a78b3eddc6be09ec0ba6ea70a5a90757e163d0f163a1386d1ae8cae803010d3b56fdcbacf2c0767eba53e20965ca691ae1d15073485e717b1a5b45220d WHIRLPOOL ba05cd7c3df70c7951c6cbb9cd546f7aa10a082498718690e8c0347c70df3d069ea0db6b6c162193069947754d18ac366778c6fb664a9e5aeb2de3014bd7b0ed +MISC metadata.xml 592 SHA256 5974a212907bf040c4516d4b899a4c7f59b3f6236b00afdf3a294c8a7677bc68 SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104 WHIRLPOOL 3546d2e3e6e7c2cfd60dc7be811f6ca95e25f8dd6113bd906fe33a431d233389141039e2768deec2e56a9d4ebcf78fd84f7d534beec99ecca117d140eca89260 diff --git a/gnome-base/gnome-control-center/files/3.22.2-fix-build-without-wayland.patch b/gnome-base/gnome-control-center/files/3.22.2-fix-build-without-wayland.patch new file mode 100644 index 000000000000..0895a743a715 --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.22.2-fix-build-without-wayland.patch @@ -0,0 +1,35 @@ +From 4825881b129bdde0eaa5419ece6198ebda420825 Mon Sep 17 00:00:00 2001 +From: Ting-Wei Lan <lantw@src.gnome.org> +Date: Thu, 10 Nov 2016 22:27:11 +0800 +Subject: [PATCH 1/2] info: Fix build when Wayland is disabled + +https://bugzilla.gnome.org/show_bug.cgi?id=774324 +--- + panels/info/cc-info-panel.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c +index 4584766..1d596a3 100644 +--- a/panels/info/cc-info-panel.c ++++ b/panels/info/cc-info-panel.c +@@ -351,8 +351,15 @@ get_graphics_data (void) + display = gdk_display_get_default (); + + #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WAYLAND) +- if (GDK_IS_X11_DISPLAY (display) || +- GDK_IS_WAYLAND_DISPLAY (display)) ++ gboolean x11_or_wayland = FALSE; ++#ifdef GDK_WINDOWING_X11 ++ x11_or_wayland = GDK_IS_X11_DISPLAY (display); ++#endif ++#ifdef GDK_WINDOWING_WAYLAND ++ x11_or_wayland = x11_or_wayland || GDK_IS_WAYLAND_DISPLAY (display); ++#endif ++ ++ if (x11_or_wayland) + { + char *discrete_renderer = NULL; + char *renderer; +-- +2.10.1 + diff --git a/gnome-base/gnome-control-center/files/3.22.2-fix-dual-gpu-crash.patch b/gnome-base/gnome-control-center/files/3.22.2-fix-dual-gpu-crash.patch new file mode 100644 index 000000000000..a390477a4247 --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.22.2-fix-dual-gpu-crash.patch @@ -0,0 +1,32 @@ +From 97e4d87ae8a123d5b1711ddbaba6bc0d3a0a39a8 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <oholy@redhat.com> +Date: Mon, 5 Dec 2016 10:15:12 +0100 +Subject: [PATCH 2/2] info: Do not crash if Renderer is not set by + SessionManager + +This regression has been introduced by commit 52da4da. The +info panel crashes if prettify_info() returns NULL. This happens +if Renderer property from SessionManager is empty. + +https://bugzilla.gnome.org/show_bug.cgi?id=774240 +--- + panels/info/info-cleanup.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/panels/info/info-cleanup.c b/panels/info/info-cleanup.c +index 20243ec..bb47493 100644 +--- a/panels/info/info-cleanup.c ++++ b/panels/info/info-cleanup.c +@@ -99,6 +99,9 @@ remove_duplicate_whitespace (const char *old) + GRegex *re; + GError *error; + ++ if (old == NULL) ++ return NULL; ++ + error = NULL; + re = g_regex_new ("[ \t\n\r]+", G_REGEX_MULTILINE, 0, &error); + if (re == NULL) +-- +2.10.1 + diff --git a/gnome-base/gnome-control-center/files/3.24.2-fix-without-gdkwayland.patch b/gnome-base/gnome-control-center/files/3.24.2-fix-without-gdkwayland.patch new file mode 100644 index 000000000000..0d41cca4704d --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.24.2-fix-without-gdkwayland.patch @@ -0,0 +1,47 @@ +From 13437b364fe56ffaaa421b8396ba761a2e0cc13d Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Sat, 15 Jul 2017 06:22:16 +0300 +Subject: [PATCH] common: Add missing GDK_WINDOWING_WAYLAND guards for + gsd_udev_device_manager_lookup_device + +commit 8f9259ac06db added a gdkwayland specific lookup_device implementation, guard it +with compile-time GDK_WINDOWING_WAYLAND as other places are. + +https://bugzilla.gnome.org/show_bug.cgi?id=780544 +--- + panels/common/gsd-device-manager-udev.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/panels/common/gsd-device-manager-udev.c b/panels/common/gsd-device-manager-udev.c +index fdda02a..5dc4447 100644 +--- a/panels/common/gsd-device-manager-udev.c ++++ b/panels/common/gsd-device-manager-udev.c +@@ -24,7 +24,9 @@ + #include <string.h> + #include <gudev/gudev.h> + ++#ifdef GDK_WINDOWING_WAYLAND + #include <gdk/gdkwayland.h> ++#endif + #include "gsd-device-manager-udev.h" + + struct _GsdUdevDeviceManager +@@ -227,6 +229,7 @@ static GsdDevice * + gsd_udev_device_manager_lookup_device (GsdDeviceManager *manager, + GdkDevice *gdk_device) + { ++#ifdef GDK_WINDOWING_WAYLAND + const gchar *node_path; + GHashTableIter iter; + GsdDevice *device; +@@ -243,6 +246,7 @@ gsd_udev_device_manager_lookup_device (GsdDeviceManager *manager, + return device; + } + } ++#endif + + return NULL; + } +-- +2.10.2 + diff --git a/gnome-base/gnome-control-center/files/3.24.2-gentoo-paths.patch b/gnome-base/gnome-control-center/files/3.24.2-gentoo-paths.patch new file mode 100644 index 000000000000..1c7f92783780 --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.24.2-gentoo-paths.patch @@ -0,0 +1,107 @@ +From 522dcaf9de0378394c4558961da99ddf0b8b87e7 Mon Sep 17 00:00:00 2001 +From: Timo Tambet <ttambet@gmail.com> +Date: Sun, 26 Feb 2017 01:04:05 +0200 +Subject: [PATCH 4/5] Fix some absolute paths to be appropriate for Gentoo + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +Signed-off-by: Alexandre Rostovtsev <tetromino@gentoo.org> +[Updated for 3.23.90; printer panel /usr/share path went away with print testpage button] +Signed-off-by: Timo Tambet <ttambet@gmail.com> +--- + panels/datetime/Makefile.am | 1 + + panels/datetime/test-endianess.c | 4 ++-- + panels/datetime/test-timezone.c | 2 +- + panels/datetime/tz.h | 4 ++-- + panels/printers/Makefile.am | 3 +++ + panels/printers/pp-host.c | 2 +- + 6 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am +index a003f0b..c43062e 100644 +--- a/panels/datetime/Makefile.am ++++ b/panels/datetime/Makefile.am +@@ -23,6 +23,7 @@ AM_CPPFLAGS = \ + $(DATETIME_PANEL_CFLAGS) \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ + -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ ++ -DREALDATADIR="\"$(datadir)\"" \ + $(NULL) + + # test-timezone is still too noisy +diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c +index 06b2613..eb52bb6 100644 +--- a/panels/datetime/test-endianess.c ++++ b/panels/datetime/test-endianess.c +@@ -26,11 +26,11 @@ test_endianess (void) + GDir *dir; + const char *name; + +- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); ++ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL); + if (dir == NULL) { + /* Try with /usr/share/locale/ + * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ +- dir = g_dir_open ("/usr/share/locale/", 0, NULL); ++ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL); + if (dir == NULL) { + g_assert_not_reached (); + } +diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c +index db5c030..7ef5cef 100644 +--- a/panels/datetime/test-timezone.c ++++ b/panels/datetime/test-timezone.c +@@ -2,7 +2,7 @@ + #include <gtk/gtk.h> + #include "cc-timezone-map.h" + +-#define TZ_DIR "/usr/share/zoneinfo/" ++#define TZ_DIR REALDATADIR "/zoneinfo/" + + static GList * + get_timezone_list (GList *tzs, +diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h +index 93905b3..1ba918c 100644 +--- a/panels/datetime/tz.h ++++ b/panels/datetime/tz.h +@@ -28,9 +28,9 @@ + #include <glib.h> + + #ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" ++# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab" + #else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" ++# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab" + #endif + + typedef struct _TzDB TzDB; +diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am +index 575cda3..d5da0bf 100644 +--- a/panels/printers/Makefile.am ++++ b/panels/printers/Makefile.am +@@ -9,6 +9,9 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/shell/ \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ + -DTEST_SRCDIR=\""$(srcdir)/"\" \ ++ -DREALDATADIR="\"$(datadir)\"" \ ++ -DPREFIX="\"$(prefix)\"" \ ++ -DLIBEXECDIR="\"$(libexecdir)\"" \ + $(NULL) + + noinst_LTLIBRARIES = libprinters.la +diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c +index 8af77e9..bb6df78 100644 +--- a/panels/printers/pp-host.c ++++ b/panels/printers/pp-host.c +@@ -267,7 +267,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res, + data->devices->devices = NULL; + + argv = g_new0 (gchar *, 3); +- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); ++ argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp"); + argv[1] = g_strdup (priv->hostname); + + /* Use SNMP to get printer's informations */ +-- +2.10.2 + diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch new file mode 100644 index 000000000000..c634d77a53cb --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch @@ -0,0 +1,196 @@ +From f76cc5a97dfa94b03abb878767c8dc15b4461685 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 14 Jul 2017 05:07:42 +0300 +Subject: [PATCH 5/5] Make printers panel optional + +--- + configure.ac | 96 ++++++++++++++++++++++++++++++------------------- + panels/Makefile.am | 7 ++-- + shell/Makefile.am | 7 ++-- + shell/cc-panel-loader.c | 4 +++ + 4 files changed, 73 insertions(+), 41 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4af24d0..7629621 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -189,9 +189,59 @@ AS_IF([test "$enable_color" != "no"], + ]) + AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes") + +-PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES +- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION +- smbclient) ++# Check for CUPS 1.4 or newer ++build_printers=no ++AC_PROG_SED ++ ++AC_ARG_ENABLE([cups], ++ AS_HELP_STRING([--disable-cups], [disable printer management panel]), ++ [], ++ enable_cups=yes ++) ++ ++AS_IF([test "x$enable_cups" != "xno"], ++ [ ++ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES ++ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION ++ smbclient) ++ ++ AC_PATH_PROG(CUPS_CONFIG, cups-config) ++ ++ if test x$CUPS_CONFIG = x; then ++ AC_MSG_ERROR([cups-config not found]) ++ fi ++ ++ CUPS_API_VERSION=`$CUPS_CONFIG --api-version` ++ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1` ++ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2` ++ ++ AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],, ++ AC_MSG_ERROR([CUPS headers not found])) ++ ++ if ! test $CUPS_API_MAJOR -gt 1 -o \ ++ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then ++ AC_MSG_ERROR([CUPS 1.4 or newer not found]) ++ fi ++ ++ # https://bugzilla.gnome.org/show_bug.cgi?id=696766 ++ CUPS_CPPFLAGS="" ++ if test $CUPS_API_MAJOR -gt 1 -o \ ++ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then ++ CUPS_CPPFLAGS=-D_PPD_DEPRECATED="" ++ fi ++ ++ CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'` ++ CUPS_LIBS=`$CUPS_CONFIG --libs` ++ ++ AC_SUBST(CUPS_CPPFLAGS) ++ AC_SUBST(CUPS_CFLAGS) ++ AC_SUBST(CUPS_LIBS) ++ build_printers=yes ++ AC_DEFINE(BUILD_PRINTERS, 1, [Define to 1 to build the Printers panel]) ++ ] ++) ++AM_CONDITIONAL(BUILD_PRINTERS, test "x$build_printers" = "xyes") ++ + PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) + PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION +@@ -334,40 +384,6 @@ AS_IF([test "$enable_bluetooth" = "yes"], + ]) + AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"]) + +-# Check for CUPS 1.4 or newer +-AC_PROG_SED +- +-AC_PATH_PROG(CUPS_CONFIG, cups-config) +- +-if test x$CUPS_CONFIG = x; then +- AC_MSG_ERROR([cups-config not found]) +-fi +- +-CUPS_API_VERSION=`$CUPS_CONFIG --api-version` +-CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1` +-CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2` +- +-AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],, +- AC_MSG_ERROR([CUPS headers not found])) +- +-if ! test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then +- AC_MSG_ERROR([CUPS 1.4 or newer not found]) +-fi +- +-# https://bugzilla.gnome.org/show_bug.cgi?id=696766 +-CUPS_CPPFLAGS="" +-if test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then +- CUPS_CPPFLAGS=-D_PPD_DEPRECATED="" +-fi +- +-CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'` +-CUPS_LIBS=`$CUPS_CONFIG --libs` +-AC_SUBST(CUPS_CPPFLAGS) +-AC_SUBST(CUPS_CFLAGS) +-AC_SUBST(CUPS_LIBS) +- + # Optional dependency for the user accounts panel + AC_ARG_WITH([cheese], + AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),, +@@ -671,6 +687,12 @@ else + AC_MSG_NOTICE([ Color panel disabled]) + fi + ++if test "x$build_printers" = "xyes"; then ++ AC_MSG_NOTICE([** CUPS (Printers panel)]) ++else ++ AC_MSG_NOTICE([ Printers panel disabled]) ++fi ++ + + if test "x$have_cheese" = "xyes"; then + AC_MSG_NOTICE([** Cheese (Users panel webcam support)]) +diff --git a/panels/Makefile.am b/panels/Makefile.am +index 2806c45..b68561e 100644 +--- a/panels/Makefile.am ++++ b/panels/Makefile.am +@@ -14,8 +14,11 @@ SUBDIRS= \ + datetime \ + search \ + privacy \ +- sharing \ +- printers ++ sharing ++ ++if BUILD_PRINTERS ++SUBDIRS += printers ++endif + + if BUILD_COLOR + SUBDIRS += color +diff --git a/shell/Makefile.am b/shell/Makefile.am +index f3e49c7..af782ea 100644 +--- a/shell/Makefile.am ++++ b/shell/Makefile.am +@@ -91,8 +91,11 @@ gnome_control_center_LDADD = \ + $(top_builddir)/panels/sharing/libsharing.la \ + $(top_builddir)/panels/sound/libsound.la \ + $(top_builddir)/panels/universal-access/libuniversal-access.la \ +- $(top_builddir)/panels/user-accounts/libuser-accounts.la \ +- $(top_builddir)/panels/printers/libprinters.la ++ $(top_builddir)/panels/user-accounts/libuser-accounts.la ++ ++if BUILD_PRINTERS ++gnome_control_center_LDADD += $(top_builddir)/panels/printers/libprinters.la ++endif + + if BUILD_WACOM + gnome_control_center_LDADD += $(top_builddir)/panels/wacom/libwacom-properties.la +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index 9104b45..a713079 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -49,7 +49,9 @@ extern GType cc_notifications_panel_get_type (void); + extern GType cc_goa_panel_get_type (void); + #endif /* BUILD_ONLINE_ACCOUNTS */ + extern GType cc_power_panel_get_type (void); ++#ifdef BUILD_PRINTERS + extern GType cc_printers_panel_get_type (void); ++#endif /* BUILD_PRINTERS */ + extern GType cc_privacy_panel_get_type (void); + extern GType cc_region_panel_get_type (void); + extern GType cc_search_panel_get_type (void); +@@ -95,7 +97,9 @@ static struct { + PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), + #endif + PANEL_TYPE("power", cc_power_panel_get_type ), ++#ifdef BUILD_PRINTERS + PANEL_TYPE("printers", cc_printers_panel_get_type ), ++#endif + PANEL_TYPE("privacy", cc_privacy_panel_get_type ), + PANEL_TYPE("region", cc_region_panel_get_type ), + PANEL_TYPE("search", cc_search_panel_get_type ), +-- +2.10.2 + diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional-networkmanager.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-networkmanager.patch new file mode 100644 index 000000000000..e4efa1c7c1cc --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.24.2-optional-networkmanager.patch @@ -0,0 +1,69 @@ +From c19cbe68d5a4a1363b320debfc6b3e93dbb7e8ac Mon Sep 17 00:00:00 2001 +From: Timo Tambet <ttambet@gmail.com> +Date: Sun, 26 Feb 2017 00:37:06 +0200 +Subject: [PATCH 3/5] Make network panel optional + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +[Updated for 3.23.90] +Signed-off-by: Timo Tambet <ttambet@gmail.com> +--- + configure.ac | 43 +++++++++++++++++++++++++------------------ + 1 file changed, 25 insertions(+), 18 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b47dbc8..4af24d0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -275,24 +275,31 @@ linux_usb_error_or_warn() + esac + } + +-PKG_CHECK_MODULES(NETWORK_MANAGER, +- libnm >= $NETWORK_MANAGER_REQUIRED_VERSION +- libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION +- mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, +- [have_networkmanager=yes], have_networkmanager=no) +-if test "x$have_networkmanager" = xno ; then +- linux_error_or_warn "*** Network panel will not be built (NetworkManager or ModemManager not found) ***" +-else +- AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel]) +-fi +-AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes]) +-if test x${have_networkmanager} = xyes; then +- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available]) +- NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN +- NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager` +- AC_SUBST(NM_VPN_CONFIG_DIR) +- AC_SUBST(NM_VPN_MODULE_DIR) +-fi ++AC_ARG_ENABLE([networkmanager], ++ AS_HELP_STRING([--disable-networkmanager], [Disable network panel]), ++ [], ++ [enable_networkmanager=auto]) ++AS_IF([test "$enable_networkmanager" != "no"], ++ [ ++ PKG_CHECK_MODULES(NETWORK_MANAGER, ++ libnm >= $NETWORK_MANAGER_REQUIRED_VERSION ++ libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION ++ mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, ++ [have_networkmanager=yes], [have_networkmanager=no]) ++ ++ AS_IF([test "$have_networkmanager" = "no"], ++ [ ++ AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***]) ++ ], [ ++ AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel]) ++ AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available]) ++ NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN ++ NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager` ++ AC_SUBST([NM_VPN_CONFIG_DIR]) ++ AC_SUBST([NM_VPN_MODULE_DIR]) ++ ]) ++ ]) ++AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"]) + + # Check for power panel + if test x${have_networkmanager} = xyes; then +-- +2.10.2 + diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch new file mode 100644 index 000000000000..21d4a45b8f16 --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch @@ -0,0 +1,46 @@ +From e18ff93353a432867e373e549206928d3ced04cc Mon Sep 17 00:00:00 2001 +From: Ole Reifschneider <tranquility@gentoo.org> +Date: Sat, 25 Apr 2015 22:22:09 +0200 +Subject: [PATCH 2/5] Make wayland support optional + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +Signed-off-by: Mart Raudsepp <leio@gentoo.org> +--- + configure.ac | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9566fb7..b47dbc8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -227,12 +227,21 @@ if test "x$have_udev" = xyes ; then + fi + AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"]) + +-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no) +-if test "x$have_wayland" = xyes ; then +- if test "x$have_udev" != xyes ; then +- AC_MSG_ERROR([udev is required for Wayland support]) +- fi +-fi ++AC_ARG_ENABLE( ++ [wayland], ++ AS_HELP_STRING([--disable-wayland], [disable wayland support]), ++ [], ++ enable_wayland=auto ++) ++ ++AS_IF([test "$enable_wayland" != "no"], ++ [ ++ AS_IF([test "x$have_udev" = xno], ++ [AC_MSG_ERROR([udev is required for Wayland support])], ++ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])]) ++ ++ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0) ++]) + + # Panels that must be built on Linux systems + linux_error_or_warn() +-- +2.10.2 + diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional.patch b/gnome-base/gnome-control-center/files/3.24.2-optional.patch new file mode 100644 index 000000000000..54e3f65f568e --- /dev/null +++ b/gnome-base/gnome-control-center/files/3.24.2-optional.patch @@ -0,0 +1,556 @@ +From c3b0d1123cae5a895452d2a8d75e663e76cbf5bd Mon Sep 17 00:00:00 2001 +From: Timo Tambet <ttambet@gmail.com> +Date: Sat, 25 Feb 2017 23:29:10 +0200 +Subject: [PATCH 1/5] Make bluetooth/colord/goa/kerberos/wacom optional + +Upstream is not interested in any part of this patch: + +https://bugzilla.gnome.org/686840 +https://bugzilla.gnome.org/697478 +https://bugzilla.gnome.org/700145 + +Signed-off-by: Ole Reifschneider <tranquility@gentoo.org> +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +Signed-off-by: Alexandre Rostovtsev <tetromino@gentoo.org> +--- + configure.ac | 171 ++++++++++++++++++++++++-------- + panels/Makefile.am | 10 +- + panels/background/Makefile.am | 8 +- + panels/background/bg-pictures-source.c | 20 ++++ + panels/power/cc-power-panel.c | 2 +- + panels/user-accounts/um-realm-manager.c | 9 ++ + shell/Makefile.am | 10 +- + shell/cc-panel-loader.c | 8 ++ + 8 files changed, 188 insertions(+), 50 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 11fc9fc..9566fb7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -120,10 +120,6 @@ LIBGD_INIT([_view-common static]) + PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) + PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) + PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) +-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 +- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION +- goa-1.0 >= $GOA_REQUIRED_VERSION +- grilo-0.3 >= $GRILO_REQUIRED_VERSION) + PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION +@@ -141,12 +137,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 + PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0 + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) + PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) +-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) +-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES +- colord >= $COLORD_REQUIRED_VERSION +- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION +- libsoup-2.4 +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) ++ ++build_online_accounts=no ++background_online_accounts= ++AC_ARG_ENABLE([goa], ++ AS_HELP_STRING([--disable-goa], ++ [disable online accounts management panel]), ++ [], ++ [enable_goa=auto]) ++ ++AS_IF([test "$enable_goa" != "no"], ++ [PKG_CHECK_MODULES([ONLINE_ACCOUNTS_PANEL], ++ [$COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION], ++ [ ++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) ++ build_online_accounts=yes ++ background_goa_dependencies="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION" ++ ], [ ++ AS_IF([test "$enable_goa" = "yes"], ++ [AC_MSG_ERROR([gnome-online-accounts support requested but not found])]) ++ ]) ++ ]) ++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "$build_online_accounts" = "yes") ++ ++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 ++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION ++ $background_goa_dependencies) ++ ++build_color=no ++AC_ARG_ENABLE([color], ++ AS_HELP_STRING([--disable-color], ++ [disable color management panel]), ++ [], ++ [enable_color=auto]) ++ ++AS_IF([test "$enable_color" != "no"], ++ [PKG_CHECK_MODULES([COLOR_PANEL], ++ [ ++ $COMMON_MODULES ++ colord >= $COLORD_REQUIRED_VERSION ++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION ++ libsoup-2.4 ++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION ++ ], [ ++ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) ++ build_color=yes ++ ], [ ++ AS_IF([test "$enable_color" = "yes"], ++ [AC_MSG_ERROR([colord support requested but not found])]) ++ ]) ++ ]) ++AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes") ++ + PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION + smbclient) +@@ -254,17 +296,27 @@ else + fi + + # Check for gnome-bluetooth +-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2, +- [have_bluetooth=yes], have_bluetooth=no) +-if test "x$have_bluetooth" = xyes ; then +- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) +-else +- linux_usb_error_or_warn "*** Bluetooth panel will not be built" +-fi +-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes]) +-if test x${have_bluetooth} = xyes; then +- AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available]) +-fi ++have_bluetooth=no ++AC_ARG_ENABLE([bluetooth], ++ AS_HELP_STRING([--disable-bluetooth], ++ [disable bluetooth management panel]), ++ [], ++ [enable_bluetooth=auto]) ++ ++AS_IF([test "$enable_bluetooth" = "yes"], ++ [PKG_CHECK_MODULES([BLUETOOTH], ++ [$COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2], ++ [ ++ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) ++ have_bluetooth=yes ++ ], ++ [ ++ have_bluetooth=no ++ AS_IF([test "$enable_bluetooth" = "yes"], ++ [AC_MSG_ERROR([bluetooth support requested but not found])]) ++ ]) ++ ]) ++AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"]) + + # Check for CUPS 1.4 or newer + AC_PROG_SED +@@ -319,32 +371,52 @@ fi + AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes) + + # Wacom +-PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES +- gnome-settings-daemon >= $GSD_REQUIRED_VERSION +- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION +- clutter-gtk-1.0 +- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION, +- [have_wacom=yes], [have_wacom=no]) ++AC_ARG_ENABLE([wacom], ++ AS_HELP_STRING([--disable-wacom], ++ [disable wacom management panel]), ++ [], ++ [enable_wacom=yes]) ++AS_IF([test "x$enable_wacom" = "xyes"], ++ [PKG_CHECK_MODULES([WACOM_PANEL], ++ [ ++ $COMMON_MODULES ++ gnome-settings-daemon >= $GSD_REQUIRED_VERSION ++ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION ++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION ++ clutter-gtk-1.0 ++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION ++ ], [ ++ have_wacom=yes ++ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) ++ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) ++ ], [ ++ have_wacom=no ++ AC_MSG_ERROR([wacom support requested but not found]) ++ ]) ++ ]) + +-if test "x$have_wacom" = xyes ; then +- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) +- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) +-else +- linux_usb_error_or_warn "*** Wacom panel will not be built" +-fi + AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) + + # Kerberos kerberos support +-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) +-if test "$KRB5_CONFIG" = "no"; then +- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) +-fi +- +-AC_MSG_CHECKING(for krb5 libraries and flags) +-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" +-KRB5_LIBS="`$KRB5_CONFIG --libs`" +-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) ++AC_ARG_ENABLE([kerberos], ++ AS_HELP_STRING([--disable-kerberos], ++ [disable kerberos support (default: enabled)]), ++ [], ++ [enable_kerberos=yes]) ++ ++AS_IF([test "$enable_kerberos" != "no"], ++ [ ++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) ++ ++ AS_IF([test "$KRB5_CONFIG" = "no"], ++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])) ++ ++ AC_MSG_CHECKING([for krb5 libraries and flags]) ++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" ++ KRB5_LIBS="`$KRB5_CONFIG --libs`" ++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) ++ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) ++ ]) + + AC_SUBST(KRB5_CFLAGS) + AC_SUBST(KRB5_LIBS) +@@ -576,11 +648,24 @@ if test "x$have_bluetooth" = "xyes"; then + else + AC_MSG_NOTICE([ Bluetooth panel disabled]) + fi ++ ++if test "x$build_color" = "xyes"; then ++ AC_MSG_NOTICE([** colord (Color panel)]) ++else ++ AC_MSG_NOTICE([ Color panel disabled]) ++fi ++ ++ + if test "x$have_cheese" = "xyes"; then + AC_MSG_NOTICE([** Cheese (Users panel webcam support)]) + else + AC_MSG_NOTICE([ Users panel webcam support disabled]) + fi ++if test "x$build_online_accounts" = "xyes"; then ++ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) ++else ++ AC_MSG_NOTICE([ Online Accounts panel disabled]) ++fi + if test "x$have_wacom" = "xyes"; then + AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) + else +diff --git a/panels/Makefile.am b/panels/Makefile.am +index 507cd2f..2806c45 100644 +--- a/panels/Makefile.am ++++ b/panels/Makefile.am +@@ -2,11 +2,9 @@ SUBDIRS= \ + common \ + background \ + power \ +- color \ + display \ + mouse \ + notifications \ +- online-accounts \ + region \ + info \ + sound \ +@@ -19,6 +17,10 @@ SUBDIRS= \ + sharing \ + printers + ++if BUILD_COLOR ++SUBDIRS += color ++endif ++ + if BUILD_WACOM + SUBDIRS += wacom + endif +@@ -31,4 +33,8 @@ if BUILD_BLUETOOTH + SUBDIRS += bluetooth + endif + ++if BUILD_ONLINE_ACCOUNTS ++SUBDIRS += online-accounts ++endif ++ + -include $(top_srcdir)/git.mk +diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am +index ccb8017..bde4cdf 100644 +--- a/panels/background/Makefile.am ++++ b/panels/background/Makefile.am +@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \ + $(BUILT_SOURCES) \ + cc-background-chooser-dialog.c \ + cc-background-chooser-dialog.h \ +- cc-background-grilo-miner.c \ +- cc-background-grilo-miner.h \ + cc-background-item.c \ + cc-background-item.h \ + cc-background-xml.c \ +@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \ + bg-colors-source.c \ + bg-colors-source.h + ++if BUILD_ONLINE_ACCOUNTS ++libbackground_chooser_la_SOURCES += \ ++ cc-background-grilo-miner.c \ ++ cc-background-grilo-miner.h ++endif ++ + libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) + + libbackground_la_SOURCES = \ +diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c +index a33cee7..408359c 100644 +--- a/panels/background/bg-pictures-source.c ++++ b/panels/background/bg-pictures-source.c +@@ -23,13 +23,17 @@ + + #include "bg-pictures-source.h" + ++#ifdef BUILD_ONLINE_ACCOUNTS + #include "cc-background-grilo-miner.h" ++#endif + #include "cc-background-item.h" + + #include <string.h> + #include <cairo-gobject.h> + #include <gio/gio.h> ++#ifdef BUILD_ONLINE_ACCOUNTS + #include <grilo.h> ++#endif + #include <libgnome-desktop/gnome-desktop-thumbnail.h> + #include <gdesktop-enums.h> + +@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate + { + GCancellable *cancellable; + ++#ifdef BUILD_ONLINE_ACCOUNTS + CcBackgroundGriloMiner *grl_miner; ++#endif + + GnomeDesktopThumbnailFactory *thumb_factory; + +@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object) + g_clear_object (&priv->cancellable); + } + ++#ifdef BUILD_ONLINE_ACCOUNTS + g_clear_object (&priv->grl_miner); ++#endif + g_clear_object (&priv->thumb_factory); + + G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); +@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source, + gboolean needs_download; + gboolean retval = FALSE; + GFile *pictures_dir, *cache_dir; ++#ifdef BUILD_ONLINE_ACCOUNTS + GrlMedia *media; ++#else ++ gpointer media = NULL; ++#endif + + /* find png and jpeg files */ + if (!content_type) +@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source, + + read_file: + ++#ifdef BUILD_ONLINE_ACCOUNTS + media = g_object_get_data (G_OBJECT (file), "grl-media"); ++#endif + if (media == NULL) + { + g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); +@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, + return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); + } + ++#ifdef BUILD_ONLINE_ACCOUNTS + static gboolean + add_single_file_from_media (BgPicturesSource *bg_source, + GFile *file, +@@ -580,6 +595,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, + + return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); + } ++#endif /* BUILD_ONLINE_ACCOUNTS */ + + gboolean + bg_pictures_source_add (BgPicturesSource *bg_source, +@@ -923,6 +939,7 @@ monitor_path (BgPicturesSource *self, + return monitor; + } + ++#ifdef BUILD_ONLINE_ACCOUNTS + static void + media_found_cb (BgPicturesSource *self, GrlMedia *media) + { +@@ -934,6 +951,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) + g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); + add_single_file_from_media (self, file, media); + } ++#endif /* BUILD_ONLINE_ACCOUNTS */ + + static void + bg_pictures_source_init (BgPicturesSource *self) +@@ -961,9 +979,11 @@ bg_pictures_source_init (BgPicturesSource *self) + priv->cache_dir_monitor = monitor_path (self, cache_path); + g_free (cache_path); + ++#ifdef BUILD_ONLINE_ACCOUNTS + priv->grl_miner = cc_background_grilo_miner_new (); + g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); + cc_background_grilo_miner_start (priv->grl_miner); ++#endif /* BUILD_ONLINE_ACCOUNTS */ + + priv->thumb_factory = + gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); +diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c +index db4e69a..7677b58 100644 +--- a/panels/power/cc-power-panel.c ++++ b/panels/power/cc-power-panel.c +@@ -1882,7 +1882,7 @@ add_power_saving_section (CcPowerPanel *self) + G_CALLBACK (wifi_switch_changed), self); + #endif + +-#ifdef HAVE_BLUETOOTH ++#ifdef BUILD_BLUETOOTH + priv->bt_rfkill = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_NONE, + NULL, +diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c +index 2639148..977dab1 100644 +--- a/panels/user-accounts/um-realm-manager.c ++++ b/panels/user-accounts/um-realm-manager.c +@@ -22,7 +22,9 @@ + + #include "um-realm-manager.h" + ++#ifdef HAVE_KERBEROS + #include <krb5/krb5.h> ++#endif + + #include <glib.h> + #include <glib/gi18n.h> +@@ -698,6 +700,7 @@ login_closure_free (gpointer data) + g_slice_free (LoginClosure, login); + } + ++#ifdef HAVE_KERBEROS + static krb5_error_code + login_perform_kinit (krb5_context k5, + const gchar *realm, +@@ -761,12 +764,14 @@ login_perform_kinit (krb5_context k5, + + return code; + } ++#endif /* HAVE_KERBEROS */ + + static void + kinit_thread_func (GSimpleAsyncResult *async, + GObject *object, + GCancellable *cancellable) + { ++#ifdef HAVE_KERBEROS + LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); + krb5_context k5 = NULL; + krb5_error_code code; +@@ -844,6 +849,10 @@ kinit_thread_func (GSimpleAsyncResult *async, + + if (k5) + krb5_free_context (k5); ++#else /* HAVE_KERBEROS */ ++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, ++ _("gnome-control-center was built without kerberos support")); ++#endif + } + + void +diff --git a/shell/Makefile.am b/shell/Makefile.am +index 6af3199..f3e49c7 100644 +--- a/shell/Makefile.am ++++ b/shell/Makefile.am +@@ -78,14 +78,12 @@ gnome_control_center_LDADD = \ + $(top_builddir)/panels/common/liblanguage.la \ + $(top_builddir)/panels/common/libdevice.la \ + $(top_builddir)/panels/background/libbackground.la \ +- $(top_builddir)/panels/color/libcolor.la \ + $(top_builddir)/panels/datetime/libdate_time.la \ + $(top_builddir)/panels/display/libdisplay.la \ + $(top_builddir)/panels/info/libinfo.la \ + $(top_builddir)/panels/keyboard/libkeyboard.la \ + $(top_builddir)/panels/mouse/libmouse-properties.la \ + $(top_builddir)/panels/notifications/libnotifications.la \ +- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ + $(top_builddir)/panels/power/libpower.la \ + $(top_builddir)/panels/privacy/libprivacy.la \ + $(top_builddir)/panels/region/libregion.la \ +@@ -108,6 +106,14 @@ if BUILD_BLUETOOTH + gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la + endif + ++if BUILD_COLOR ++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la ++endif ++ ++if BUILD_ONLINE_ACCOUNTS ++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la ++endif ++ + gnome_control_center_alt_LDADD = \ + $(gnome_control_center_LDADD) \ + alt/libshell_alt.la +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index 20ebb85..9104b45 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); + #ifdef BUILD_BLUETOOTH + extern GType cc_bluetooth_panel_get_type (void); + #endif /* BUILD_BLUETOOTH */ ++#ifdef BUILD_COLOR + extern GType cc_color_panel_get_type (void); ++#endif /* BUILD_COLOR */ + extern GType cc_date_time_panel_get_type (void); + extern GType cc_display_panel_get_type (void); + extern GType cc_info_panel_get_type (void); +@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); + extern GType cc_network_panel_get_type (void); + #endif /* BUILD_NETWORK */ + extern GType cc_notifications_panel_get_type (void); ++#ifdef BUILD_ONLINE_ACCOUNTS + extern GType cc_goa_panel_get_type (void); ++#endif /* BUILD_ONLINE_ACCOUNTS */ + extern GType cc_power_panel_get_type (void); + extern GType cc_printers_panel_get_type (void); + extern GType cc_privacy_panel_get_type (void); +@@ -75,7 +79,9 @@ static struct { + #ifdef BUILD_BLUETOOTH + PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), + #endif ++#ifdef BUILD_COLOR + PANEL_TYPE("color", cc_color_panel_get_type ), ++#endif + PANEL_TYPE("datetime", cc_date_time_panel_get_type ), + PANEL_TYPE("display", cc_display_panel_get_type ), + PANEL_TYPE("info", cc_info_panel_get_type ), +@@ -85,7 +91,9 @@ static struct { + PANEL_TYPE("network", cc_network_panel_get_type ), + #endif + PANEL_TYPE("notifications", cc_notifications_panel_get_type), ++#ifdef BUILD_ONLINE_ACCOUNTS + PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), ++#endif + PANEL_TYPE("power", cc_power_panel_get_type ), + PANEL_TYPE("printers", cc_printers_panel_get_type ), + PANEL_TYPE("privacy", cc_privacy_panel_get_type ), +-- +2.10.2 + diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch new file mode 100644 index 000000000000..5d5af0d9717d --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch @@ -0,0 +1,120 @@ +From c093ce404bf9868980fe7b83d6aa2ab3ec7831e2 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Sun, 8 Dec 2013 23:44:56 +0100 +Subject: [PATCH 5/5] Fix some absolute paths to be appropriate for Gentoo + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +--- + panels/datetime/Makefile.am | 1 + + panels/datetime/test-endianess.c | 4 ++-- + panels/datetime/test-timezone.c | 2 +- + panels/datetime/tz.h | 4 ++-- + panels/printers/Makefile.am | 3 +++ + panels/printers/cc-printers-panel.c | 4 ++-- + panels/printers/pp-host.c | 2 +- + 7 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am +index 43523a6..d8d677d 100644 +--- a/panels/datetime/Makefile.am ++++ b/panels/datetime/Makefile.am +@@ -23,6 +23,7 @@ AM_CPPFLAGS = \ + $(DATETIME_PANEL_CFLAGS) \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ + -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ ++ -DREALDATADIR="\"$(datadir)\"" \ + $(NULL) + + # test-timezone is still too noisy +diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c +index 06b2613..eb52bb6 100644 +--- a/panels/datetime/test-endianess.c ++++ b/panels/datetime/test-endianess.c +@@ -26,11 +26,11 @@ test_endianess (void) + GDir *dir; + const char *name; + +- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); ++ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL); + if (dir == NULL) { + /* Try with /usr/share/locale/ + * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ +- dir = g_dir_open ("/usr/share/locale/", 0, NULL); ++ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL); + if (dir == NULL) { + g_assert_not_reached (); + } +diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c +index db5c030..7ef5cef 100644 +--- a/panels/datetime/test-timezone.c ++++ b/panels/datetime/test-timezone.c +@@ -2,7 +2,7 @@ + #include <gtk/gtk.h> + #include "cc-timezone-map.h" + +-#define TZ_DIR "/usr/share/zoneinfo/" ++#define TZ_DIR REALDATADIR "/zoneinfo/" + + static GList * + get_timezone_list (GList *tzs, +diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h +index 93905b3..1ba918c 100644 +--- a/panels/datetime/tz.h ++++ b/panels/datetime/tz.h +@@ -28,9 +28,9 @@ + #include <glib.h> + + #ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" ++# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab" + #else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" ++# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab" + #endif + + typedef struct _TzDB TzDB; +diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am +index 512cda5..87726dd 100644 +--- a/panels/printers/Makefile.am ++++ b/panels/printers/Makefile.am +@@ -10,6 +10,9 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/shell/ \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ + -DTEST_SRCDIR=\""$(srcdir)/"\" \ ++ -DREALDATADIR="\"$(datadir)\"" \ ++ -DPREFIX="\"$(prefix)\"" \ ++ -DLIBEXECDIR="\"$(libexecdir)\"" \ + $(NULL) + + noinst_LTLIBRARIES = libprinters.la +diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c +index fb55608..a6dfb90 100644 +--- a/panels/printers/cc-printers-panel.c ++++ b/panels/printers/cc-printers-panel.c +@@ -2590,8 +2590,8 @@ test_page_cb (GtkButton *button, + + if (printer_name) + { +- const gchar *const dirs[] = { "/usr/share/cups", +- "/usr/local/share/cups", ++ const gchar *const dirs[] = { REALDATADIR "/cups", ++ PREFIX "/local/share/cups", + NULL }; + const gchar *datadir = NULL; + http_t *http = NULL; +diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c +index fbfb434..bd00518 100644 +--- a/panels/printers/pp-host.c ++++ b/panels/printers/pp-host.c +@@ -254,7 +254,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res, + data->devices->devices = NULL; + + argv = g_new0 (gchar *, 3); +- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); ++ argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp"); + argv[1] = g_strdup (priv->hostname); + + /* Use SNMP to get printer's informations */ +-- +2.10.1 + diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch new file mode 100644 index 000000000000..2bd4e0e0abe4 --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch @@ -0,0 +1,40 @@ +From 0ee5e7191e62e6df9067fa5b0886d09952d4e315 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Mon, 11 May 2015 23:59:03 +0200 +Subject: [PATCH 3/5] Optional gotta be optional + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +--- + configure.ac | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 140459c..fe947d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -512,22 +512,6 @@ else + AC_MSG_RESULT(no) + fi + +-case $host_os in +- linux*) +- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then +- # Nothing +- echo "USB-related panels disabled on S390" +- else +- if test "x$have_networkmanager" != "xyes" -o \ +- "x$have_bluetooth" != "xyes" -o \ +- "x$enable_cups" != "xyes" -o \ +- "x$have_wacom" != "xyes"; then +- AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are not optional on Linux systems]) +- fi +- fi +- ;; +-esac +- + AC_CONFIG_FILES([ + Makefile + panels/Makefile +-- +2.10.1 + diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch new file mode 100644 index 000000000000..f4a7d3b8ea7f --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch @@ -0,0 +1,67 @@ +From 1ad9510963dc634cb1805ca9e4726004130fc7e3 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 12 May 2015 00:32:11 +0200 +Subject: [PATCH 4/5] Make network panel optional + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +--- + configure.ac | 43 +++++++++++++++++++++++++------------------ + 1 file changed, 25 insertions(+), 18 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fe947d7..6ecda91 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -241,24 +241,31 @@ AS_IF([test "$enable_wayland" != "no"], + PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0) + ]) + +-PKG_CHECK_MODULES(NETWORK_MANAGER, +- libnm >= $NETWORK_MANAGER_REQUIRED_VERSION +- libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION +- mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, +- [have_networkmanager=yes], have_networkmanager=no) +-if test "x$have_networkmanager" = xno ; then +- AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***) +-else +- AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel]) +-fi +-AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes]) +-if test x${have_networkmanager} = xyes; then +- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available]) +- NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN +- NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager` +- AC_SUBST(NM_VPN_CONFIG_DIR) +- AC_SUBST(NM_VPN_MODULE_DIR) +-fi ++AC_ARG_ENABLE([networkmanager], ++ AS_HELP_STRING([--disable-networkmanager], [Disable network panel]), ++ [], ++ [enable_networkmanager=auto]) ++AS_IF([test "$enable_networkmanager" != "no"], ++ [ ++ PKG_CHECK_MODULES(NETWORK_MANAGER, ++ libnm >= $NETWORK_MANAGER_REQUIRED_VERSION ++ libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION ++ mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, ++ [have_networkmanager=yes], [have_networkmanager=no]) ++ ++ AS_IF([test "$have_networkmanager" = "no"], ++ [ ++ AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***]) ++ ], [ ++ AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel]) ++ AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available]) ++ NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN ++ NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager` ++ AC_SUBST([NM_VPN_CONFIG_DIR]) ++ AC_SUBST([NM_VPN_MODULE_DIR]) ++ ]) ++ ]) ++AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"]) + + # Check for power panel + if test x${have_networkmanager} = xyes; then +-- +2.10.1 + diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch new file mode 100644 index 000000000000..2c06408d1a33 --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch @@ -0,0 +1,45 @@ +From 09d1f1a057268a6acdfb42e7dcb2843c0066f542 Mon Sep 17 00:00:00 2001 +From: Ole Reifschneider <tranquility@gentoo.org> +Date: Sat, 25 Apr 2015 22:22:09 +0200 +Subject: [PATCH 2/5] Make wayland support optional + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +--- + configure.ac | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 19096f5..140459c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -225,12 +225,21 @@ if test "x$have_udev" = xyes ; then + fi + AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"]) + +-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no) +-if test "x$have_wayland" = xyes ; then +- if test "x$have_udev" != xyes ; then +- AC_MSG_ERROR([udev is required for Wayland support]) +- fi +-fi ++AC_ARG_ENABLE( ++ [wayland], ++ AS_HELP_STRING([--disable-wayland], [disable wayland support]), ++ [], ++ enable_wayland=auto ++) ++ ++AS_IF([test "$enable_wayland" != "no"], ++ [ ++ AS_IF([test "x$have_udev" = xno], ++ [AC_MSG_ERROR([udev is required for Wayland support])], ++ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])]) ++ ++ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0) ++]) + + PKG_CHECK_MODULES(NETWORK_MANAGER, + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION +-- +2.10.1 + diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch new file mode 100644 index 000000000000..02516ced7c94 --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch @@ -0,0 +1,569 @@ +From 108d79460d42d5e8167ad52747628f9dfd21058d Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Wed, 2 Nov 2016 23:40:52 +0100 +Subject: [PATCH 1/5] Make bluetooth/colord/goa/kerberos/wacom optional + +Upstream is not interested in any part of this patch: + +https://bugzilla.gnome.org/show_bug.cgi?id=686840 +https://bugzilla.gnome.org/show_bug.cgi?id=697478 +https://bugzilla.gnome.org/show_bug.cgi?id=700145 + +Signed-off-by: Ole Reifschneider <tranquility@gentoo.org> +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +--- + configure.ac | 185 +++++++++++++++++++++++--------- + panels/Makefile.am | 10 +- + panels/background/Makefile.am | 8 +- + panels/background/bg-pictures-source.c | 20 ++++ + panels/power/cc-power-panel.c | 2 +- + panels/user-accounts/um-realm-manager.c | 9 ++ + shell/Makefile.am | 10 +- + shell/cc-panel-loader.c | 8 ++ + 8 files changed, 196 insertions(+), 56 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1e07acd..19096f5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static]) + PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) + PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) + PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) +-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 +- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION +- goa-1.0 >= $GOA_REQUIRED_VERSION +- grilo-0.3 >= $GRILO_REQUIRED_VERSION) + PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION +@@ -140,12 +136,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 + PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0 + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) + PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) +-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) +-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES +- colord >= $COLORD_REQUIRED_VERSION +- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION +- libsoup-2.4 +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) ++ ++build_online_accounts=no ++background_online_accounts= ++AC_ARG_ENABLE([goa], ++ AS_HELP_STRING([--disable-goa], ++ [disable online accounts management panel]), ++ [], ++ [enable_goa=auto]) ++ ++AS_IF([test "$enable_goa" != "no"], ++ [PKG_CHECK_MODULES([ONLINE_ACCOUNTS_PANEL], ++ [$COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION], ++ [ ++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) ++ build_online_accounts=yes ++ background_goa_dependencies="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION" ++ ], [ ++ AS_IF([test "$enable_goa" = "yes"], ++ [AC_MSG_ERROR([gnome-online-accounts support requested but not found])]) ++ ]) ++ ]) ++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "$build_online_accounts" = "yes") ++ ++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 ++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION ++ $background_goa_dependencies) ++ ++build_color=no ++AC_ARG_ENABLE([color], ++ AS_HELP_STRING([--disable-color], ++ [disable color management panel]), ++ [], ++ [enable_color=auto]) ++ ++AS_IF([test "$enable_color" != "no"], ++ [PKG_CHECK_MODULES([COLOR_PANEL], ++ [ ++ $COMMON_MODULES ++ colord >= $COLORD_REQUIRED_VERSION ++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION ++ libsoup-2.4 ++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION ++ ], [ ++ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) ++ build_color=yes ++ ], [ ++ AS_IF([test "$enable_color" = "yes"], ++ [AC_MSG_ERROR([colord support requested but not found])]) ++ ]) ++ ]) ++AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes") ++ + PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) + PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) +@@ -220,15 +262,27 @@ else + fi + + # Check for gnome-bluetooth +-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2, +- [have_bluetooth=yes], have_bluetooth=no) +-if test "x$have_bluetooth" = xyes ; then +- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) +-fi +-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes]) +-if test x${have_bluetooth} = xyes; then +- AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available]) +-fi ++have_bluetooth=no ++AC_ARG_ENABLE([bluetooth], ++ AS_HELP_STRING([--disable-bluetooth], ++ [disable bluetooth management panel]), ++ [], ++ [enable_bluetooth=auto]) ++ ++AS_IF([test "$enable_bluetooth" = "yes"], ++ [PKG_CHECK_MODULES([BLUETOOTH], ++ [$COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2], ++ [ ++ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) ++ have_bluetooth=yes ++ ], ++ [ ++ have_bluetooth=no ++ AS_IF([test "$enable_bluetooth" = "yes"], ++ [AC_MSG_ERROR([bluetooth support requested but not found])]) ++ ]) ++ ]) ++AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"]) + + # Check for smbclient + PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no]) +@@ -301,38 +355,61 @@ fi + AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes) + + # wacom is disabled for s390/s390x and non Linux platforms (needs udev) +-case $host_os in +- linux*) +- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then +- have_wacom=no +- else +- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES +- gnome-settings-daemon >= $GSD_REQUIRED_VERSION +- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION +- clutter-gtk-1.0 +- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) +- have_wacom=yes +- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) +- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) +- fi +- ;; +- *) +- have_wacom=no +- ;; +-esac +-AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) ++have_wacom=no ++AS_CASE([$host_os], ++ [linux*], ++ [AS_IF([test "$host_cpu" = "s390" -o "$host_cpu" = "s390x"], ++ [have_wacom=no], ++ [ ++ AC_ARG_ENABLE([wacom], ++ AS_HELP_STRING([--disable-wacom], ++ [disable wacom management panel]), ++ [], ++ [enable_wacom=yes]) ++ AS_IF([test "$enable_wacom" = "yes"], ++ [PKG_CHECK_MODULES([WACOM_PANEL], ++ [ ++ $COMMON_MODULES ++ gnome-settings-daemon >= $GSD_REQUIRED_VERSION ++ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION ++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION ++ clutter-gtk-1.0 ++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION ++ ], [ ++ have_wacom=yes ++ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) ++ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) ++ ], [ ++ have_wacom=no ++ AS_IF([test "$enable_wacom" = "yes"], ++ [AC_MSG_ERROR([wacom support requested but not found])]) ++ ]) ++ ]) ++ ]) ++ ], ++ [have_wacom=no]) ++AM_CONDITIONAL(BUILD_WACOM, [test "$have_wacom" = "yes"]) + + # Kerberos kerberos support +-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) +-if test "$KRB5_CONFIG" = "no"; then +- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) +-fi +- +-AC_MSG_CHECKING(for krb5 libraries and flags) +-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" +-KRB5_LIBS="`$KRB5_CONFIG --libs`" +-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) ++AC_ARG_ENABLE([kerberos], ++ AS_HELP_STRING([--disable-kerberos], ++ [disable kerberos support (default: enabled)]), ++ [], ++ [enable_kerberos=yes]) ++ ++AS_IF([test "$enable_kerberos" != "no"], ++ [ ++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) ++ ++ AS_IF([test "$KRB5_CONFIG" = "no"], ++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])) ++ ++ AC_MSG_CHECKING([for krb5 libraries and flags]) ++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" ++ KRB5_LIBS="`$KRB5_CONFIG --libs`" ++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) ++ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) ++ ]) + + AC_SUBST(KRB5_CFLAGS) + AC_SUBST(KRB5_LIBS) +@@ -569,6 +646,11 @@ if test "x$have_bluetooth" = "xyes"; then + else + AC_MSG_NOTICE([ Bluetooth panel disabled]) + fi ++if test "x$build_color" = "xyes"; then ++ AC_MSG_NOTICE([** colord (Color panel)]) ++else ++ AC_MSG_NOTICE([ Color panel disabled]) ++fi + if test "x$enable_cups" = "xyes"; then + AC_MSG_NOTICE([** CUPS (Printers panel)]) + else +@@ -579,6 +661,11 @@ if test "x$have_cheese" = "xyes"; then + else + AC_MSG_NOTICE([ Users panel webcam support disabled]) + fi ++if test "x$build_online_accounts" = "xyes"; then ++ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) ++else ++ AC_MSG_NOTICE([ Online Accounts panel disabled]) ++fi + if test "x$have_wacom" = "xyes"; then + AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) + else +diff --git a/panels/Makefile.am b/panels/Makefile.am +index 9961c25..0c54622 100644 +--- a/panels/Makefile.am ++++ b/panels/Makefile.am +@@ -2,11 +2,9 @@ SUBDIRS= \ + common \ + background \ + power \ +- color \ + display \ + mouse \ + notifications \ +- online-accounts \ + region \ + info \ + sound \ +@@ -18,6 +16,10 @@ SUBDIRS= \ + privacy \ + sharing + ++if BUILD_COLOR ++SUBDIRS += color ++endif ++ + if BUILD_WACOM + SUBDIRS += wacom + endif +@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH + SUBDIRS += bluetooth + endif + ++if BUILD_ONLINE_ACCOUNTS ++SUBDIRS += online-accounts ++endif ++ + -include $(top_srcdir)/git.mk +diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am +index ccb8017..bde4cdf 100644 +--- a/panels/background/Makefile.am ++++ b/panels/background/Makefile.am +@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \ + $(BUILT_SOURCES) \ + cc-background-chooser-dialog.c \ + cc-background-chooser-dialog.h \ +- cc-background-grilo-miner.c \ +- cc-background-grilo-miner.h \ + cc-background-item.c \ + cc-background-item.h \ + cc-background-xml.c \ +@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \ + bg-colors-source.c \ + bg-colors-source.h + ++if BUILD_ONLINE_ACCOUNTS ++libbackground_chooser_la_SOURCES += \ ++ cc-background-grilo-miner.c \ ++ cc-background-grilo-miner.h ++endif ++ + libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) + + libbackground_la_SOURCES = \ +diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c +index a33cee7..408359c 100644 +--- a/panels/background/bg-pictures-source.c ++++ b/panels/background/bg-pictures-source.c +@@ -23,13 +23,17 @@ + + #include "bg-pictures-source.h" + ++#ifdef BUILD_ONLINE_ACCOUNTS + #include "cc-background-grilo-miner.h" ++#endif + #include "cc-background-item.h" + + #include <string.h> + #include <cairo-gobject.h> + #include <gio/gio.h> ++#ifdef BUILD_ONLINE_ACCOUNTS + #include <grilo.h> ++#endif + #include <libgnome-desktop/gnome-desktop-thumbnail.h> + #include <gdesktop-enums.h> + +@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate + { + GCancellable *cancellable; + ++#ifdef BUILD_ONLINE_ACCOUNTS + CcBackgroundGriloMiner *grl_miner; ++#endif + + GnomeDesktopThumbnailFactory *thumb_factory; + +@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object) + g_clear_object (&priv->cancellable); + } + ++#ifdef BUILD_ONLINE_ACCOUNTS + g_clear_object (&priv->grl_miner); ++#endif + g_clear_object (&priv->thumb_factory); + + G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); +@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source, + gboolean needs_download; + gboolean retval = FALSE; + GFile *pictures_dir, *cache_dir; ++#ifdef BUILD_ONLINE_ACCOUNTS + GrlMedia *media; ++#else ++ gpointer media = NULL; ++#endif + + /* find png and jpeg files */ + if (!content_type) +@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source, + + read_file: + ++#ifdef BUILD_ONLINE_ACCOUNTS + media = g_object_get_data (G_OBJECT (file), "grl-media"); ++#endif + if (media == NULL) + { + g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); +@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, + return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); + } + ++#ifdef BUILD_ONLINE_ACCOUNTS + static gboolean + add_single_file_from_media (BgPicturesSource *bg_source, + GFile *file, +@@ -580,6 +595,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, + + return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); + } ++#endif /* BUILD_ONLINE_ACCOUNTS */ + + gboolean + bg_pictures_source_add (BgPicturesSource *bg_source, +@@ -923,6 +939,7 @@ monitor_path (BgPicturesSource *self, + return monitor; + } + ++#ifdef BUILD_ONLINE_ACCOUNTS + static void + media_found_cb (BgPicturesSource *self, GrlMedia *media) + { +@@ -934,6 +951,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) + g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); + add_single_file_from_media (self, file, media); + } ++#endif /* BUILD_ONLINE_ACCOUNTS */ + + static void + bg_pictures_source_init (BgPicturesSource *self) +@@ -961,9 +979,11 @@ bg_pictures_source_init (BgPicturesSource *self) + priv->cache_dir_monitor = monitor_path (self, cache_path); + g_free (cache_path); + ++#ifdef BUILD_ONLINE_ACCOUNTS + priv->grl_miner = cc_background_grilo_miner_new (); + g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); + cc_background_grilo_miner_start (priv->grl_miner); ++#endif /* BUILD_ONLINE_ACCOUNTS */ + + priv->thumb_factory = + gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); +diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c +index db4e69a..7677b58 100644 +--- a/panels/power/cc-power-panel.c ++++ b/panels/power/cc-power-panel.c +@@ -1882,7 +1882,7 @@ add_power_saving_section (CcPowerPanel *self) + G_CALLBACK (wifi_switch_changed), self); + #endif + +-#ifdef HAVE_BLUETOOTH ++#ifdef BUILD_BLUETOOTH + priv->bt_rfkill = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_NONE, + NULL, +diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c +index 8a0a0e6..22c6b94 100644 +--- a/panels/user-accounts/um-realm-manager.c ++++ b/panels/user-accounts/um-realm-manager.c +@@ -22,7 +22,9 @@ + + #include "um-realm-manager.h" + ++#ifdef HAVE_KERBEROS + #include <krb5/krb5.h> ++#endif + + #include <glib.h> + #include <glib/gi18n.h> +@@ -698,6 +700,7 @@ login_closure_free (gpointer data) + g_slice_free (LoginClosure, login); + } + ++#ifdef HAVE_KERBEROS + static krb5_error_code + login_perform_kinit (krb5_context k5, + const gchar *realm, +@@ -761,12 +764,14 @@ login_perform_kinit (krb5_context k5, + + return code; + } ++#endif /* HAVE_KERBEROS */ + + static void + kinit_thread_func (GSimpleAsyncResult *async, + GObject *object, + GCancellable *cancellable) + { ++#ifdef HAVE_KERBEROS + LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); + krb5_context k5 = NULL; + krb5_error_code code; +@@ -844,6 +849,10 @@ kinit_thread_func (GSimpleAsyncResult *async, + + if (k5) + krb5_free_context (k5); ++#else /* HAVE_KERBEROS */ ++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, ++ _("gnome-control-center was built without kerberos support")); ++#endif + } + + void +diff --git a/shell/Makefile.am b/shell/Makefile.am +index 45f6363..b76f343 100644 +--- a/shell/Makefile.am ++++ b/shell/Makefile.am +@@ -78,14 +78,12 @@ gnome_control_center_LDADD = \ + $(top_builddir)/panels/common/liblanguage.la \ + $(top_builddir)/panels/common/libdevice.la \ + $(top_builddir)/panels/background/libbackground.la \ +- $(top_builddir)/panels/color/libcolor.la \ + $(top_builddir)/panels/datetime/libdate_time.la \ + $(top_builddir)/panels/display/libdisplay.la \ + $(top_builddir)/panels/info/libinfo.la \ + $(top_builddir)/panels/keyboard/libkeyboard.la \ + $(top_builddir)/panels/mouse/libmouse-properties.la \ + $(top_builddir)/panels/notifications/libnotifications.la \ +- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ + $(top_builddir)/panels/power/libpower.la \ + $(top_builddir)/panels/privacy/libprivacy.la \ + $(top_builddir)/panels/region/libregion.la \ +@@ -111,6 +109,14 @@ if BUILD_BLUETOOTH + gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la + endif + ++if BUILD_COLOR ++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la ++endif ++ ++if BUILD_ONLINE_ACCOUNTS ++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la ++endif ++ + gnome_control_center_alt_LDADD = \ + $(gnome_control_center_LDADD) \ + alt/libshell_alt.la +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index 03dbfb1..a713079 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); + #ifdef BUILD_BLUETOOTH + extern GType cc_bluetooth_panel_get_type (void); + #endif /* BUILD_BLUETOOTH */ ++#ifdef BUILD_COLOR + extern GType cc_color_panel_get_type (void); ++#endif /* BUILD_COLOR */ + extern GType cc_date_time_panel_get_type (void); + extern GType cc_display_panel_get_type (void); + extern GType cc_info_panel_get_type (void); +@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); + extern GType cc_network_panel_get_type (void); + #endif /* BUILD_NETWORK */ + extern GType cc_notifications_panel_get_type (void); ++#ifdef BUILD_ONLINE_ACCOUNTS + extern GType cc_goa_panel_get_type (void); ++#endif /* BUILD_ONLINE_ACCOUNTS */ + extern GType cc_power_panel_get_type (void); + #ifdef BUILD_PRINTERS + extern GType cc_printers_panel_get_type (void); +@@ -77,7 +81,9 @@ static struct { + #ifdef BUILD_BLUETOOTH + PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), + #endif ++#ifdef BUILD_COLOR + PANEL_TYPE("color", cc_color_panel_get_type ), ++#endif + PANEL_TYPE("datetime", cc_date_time_panel_get_type ), + PANEL_TYPE("display", cc_display_panel_get_type ), + PANEL_TYPE("info", cc_info_panel_get_type ), +@@ -87,7 +93,9 @@ static struct { + PANEL_TYPE("network", cc_network_panel_get_type ), + #endif + PANEL_TYPE("notifications", cc_notifications_panel_get_type), ++#ifdef BUILD_ONLINE_ACCOUNTS + PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), ++#endif + PANEL_TYPE("power", cc_power_panel_get_type ), + #ifdef BUILD_PRINTERS + PANEL_TYPE("printers", cc_printers_panel_get_type ), +-- +2.10.1 + diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild new file mode 100644 index 000000000000..c9c82aa7b53e --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit bash-completion-r1 gnome2 + +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" +HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" + +LICENSE="GPL-2+" +SLOT="2" +IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# False positives caused by nested configure scripts +QA_CONFIGURE_OPTIONS=".*" + +# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login +# g-s-d[policykit] needed for bug #403527 +# kerberos unfortunately means mit-krb5; build fails with heimdal +# udev could be made optional, only conditions gsd-device-panel +# (mouse, keyboards, touchscreen, etc) +COMMON_DEPEND=" + >=dev-libs/glib-2.44.0:2[dbus] + >=x11-libs/gdk-pixbuf-2.23.0:2 + >=x11-libs/gtk+-3.22.0:3[X,wayland?] + >=gnome-base/gsettings-desktop-schemas-3.21.4 + >=gnome-base/gnome-desktop-3.21.2:3= + >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] + + >=dev-libs/libpwquality-1.2.2 + dev-libs/libxml2:2 + gnome-base/libgtop:2= + media-libs/fontconfig + >=sys-apps/accountsservice-0.6.39 + + >=media-libs/libcanberra-0.13[gtk3] + >=media-sound/pulseaudio-2[glib] + >=sys-auth/polkit-0.97 + >=sys-power/upower-0.99:= + + virtual/libgudev + x11-apps/xmodmap + x11-libs/cairo + x11-libs/libX11 + x11-libs/libXxf86misc + >=x11-libs/libXi-1.2 + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) + colord? ( + net-libs/libsoup:2.4 + >=x11-misc/colord-0.1.34:0= + >=x11-libs/colord-gtk-0.1.24 ) + cups? ( + >=net-print/cups-1.4[dbus] + >=net-fs/samba-4.0.0[client] + ) + gnome-online-accounts? ( + >=media-libs/grilo-0.3.0:0.3= + >=net-libs/gnome-online-accounts-3.21.5:= ) + ibus? ( >=app-i18n/ibus-1.5.2 ) + kerberos? ( app-crypt/mit-krb5 ) + networkmanager? ( + >=gnome-extra/nm-applet-1.2.0 + >=net-misc/networkmanager-1.2.0:=[modemmanager] + >=net-misc/modemmanager-0.7.990 ) + v4l? ( + media-libs/clutter-gtk:1.0 + >=media-video/cheese-3.5.91 ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + >=media-libs/clutter-1.11.3:1.0 + media-libs/clutter-gtk:1.0 + >=x11-libs/libXi-1.2 ) +" +# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x +# libgnomekbd needed only for gkbd-keyboard-display tool +# +# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 +# Also we need newer driver versions to allow wacom and libinput drivers to +# not collide +# +# system-config-printer provides org.fedoraproject.Config.Printing service and interface +# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy +RDEPEND="${COMMON_DEPEND} + || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) + x11-themes/adwaita-icon-theme + colord? ( >=gnome-extra/gnome-color-manager-3 ) + cups? ( + app-admin/system-config-printer + net-print/cups-pk-helper ) + input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) + >=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 ) ) + + !<gnome-base/gdm-2.91.94 + !<gnome-extra/gnome-color-manager-3.1.2 + !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 +PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" + +DEPEND="${COMMON_DEPEND} + x11-proto/xproto + x11-proto/xf86miscproto + x11-proto/kbproto + + dev-libs/libxml2:2 + dev-libs/libxslt + >=dev-util/intltool-0.40.1 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + + gnome-base/gnome-common + sys-devel/autoconf-archive +" +# Needed for autoreconf +# gnome-base/gnome-common +# sys-devel/autoconf-archive + +PATCHES=( + # From gnome-3-22 branch + "${FILESDIR}"/${PV}-fix-build-without-wayland.patch # bug 613192 + "${FILESDIR}"/${PV}-fix-dual-gpu-crash.patch + # Make some panels and dependencies optional; requires eautoreconf + # https://bugzilla.gnome.org/686840, 697478, 700145 + "${FILESDIR}"/${PN}-3.22.0-optional.patch + "${FILESDIR}"/${PN}-3.22.0-make-wayland-optional.patch + "${FILESDIR}"/${PN}-3.22.0-keep-panels-optional.patch + "${FILESDIR}"/${PN}-3.22.0-make-networkmanager-optional.patch + # Fix some absolute paths to be appropriate for Gentoo + "${FILESDIR}"/${PN}-3.22.0-gentoo-paths.patch +) + +src_configure() { + gnome2_src_configure \ + --disable-update-mimedb \ + --disable-static \ + --enable-documentation \ + $(use_enable bluetooth) \ + $(use_enable colord color) \ + $(use_enable cups) \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable gnome-online-accounts goa) \ + $(use_enable ibus) \ + $(use_enable kerberos) \ + $(use_enable networkmanager) \ + $(use_with v4l cheese) \ + $(use_enable input_devices_wacom wacom) \ + $(use_enable wayland) +} + +src_install() { + gnome2_src_install completiondir="$(get_bashcompdir)" +} diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild new file mode 100644 index 000000000000..e802f6f162f5 --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit bash-completion-r1 gnome2 + +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" +HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" + +LICENSE="GPL-2+" +SLOT="2" +IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# False positives caused by nested configure scripts +QA_CONFIGURE_OPTIONS=".*" + +# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login +# g-s-d[policykit] needed for bug #403527 +# kerberos unfortunately means mit-krb5; build fails with heimdal +# udev could be made optional, only conditions gsd-device-panel +# (mouse, keyboards, touchscreen, etc) +# display panel requires colord +# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional) +COMMON_DEPEND=" + >=dev-libs/glib-2.44.0:2[dbus] + >=x11-libs/gdk-pixbuf-2.23.0:2 + >=x11-libs/gtk+-3.22.0:3[X,wayland?] + >=gnome-base/gsettings-desktop-schemas-3.21.4 + >=gnome-base/gnome-desktop-3.21.2:3= + >=gnome-base/gnome-settings-daemon-3.23.90[colord?,policykit] + >=x11-misc/colord-0.1.34:0= + + >=dev-libs/libpwquality-1.2.2 + dev-libs/libxml2:2 + gnome-base/libgtop:2= + media-libs/fontconfig + >=sys-apps/accountsservice-0.6.39 + + >=media-libs/libcanberra-0.13[gtk3] + >=media-sound/pulseaudio-2[glib] + >=sys-auth/polkit-0.97 + >=sys-power/upower-0.99:= + + virtual/libgudev + x11-apps/xmodmap + x11-libs/cairo + x11-libs/libX11 + x11-libs/libXxf86misc + >=x11-libs/libXi-1.2 + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) + colord? ( + net-libs/libsoup:2.4 + >=x11-misc/colord-0.1.34:0= + >=x11-libs/colord-gtk-0.1.24 ) + cups? ( + >=net-print/cups-1.4[dbus] + >=net-fs/samba-4.0.0[client] + ) + gnome-online-accounts? ( + >=media-libs/grilo-0.3.0:0.3= + >=net-libs/gnome-online-accounts-3.21.5:= ) + ibus? ( >=app-i18n/ibus-1.5.2 ) + kerberos? ( app-crypt/mit-krb5 ) + networkmanager? ( + >=gnome-extra/nm-applet-1.2.0 + >=net-misc/networkmanager-1.2.0:=[modemmanager] + >=net-misc/modemmanager-0.7.990 ) + v4l? ( + media-libs/clutter-gtk:1.0 + >=media-video/cheese-3.5.91 ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + >=media-libs/clutter-1.11.3:1.0 + media-libs/clutter-gtk:1.0 + >=x11-libs/libXi-1.2 ) +" +# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x +# libgnomekbd needed only for gkbd-keyboard-display tool +# +# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 +# Also we need newer driver versions to allow wacom and libinput drivers to +# not collide +# +# system-config-printer provides org.fedoraproject.Config.Printing service and interface +# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy +RDEPEND="${COMMON_DEPEND} + || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) + x11-themes/adwaita-icon-theme + colord? ( >=gnome-extra/gnome-color-manager-3 ) + cups? ( + app-admin/system-config-printer + net-print/cups-pk-helper ) + input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) + >=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 ) ) + + !<gnome-base/gdm-2.91.94 + !<gnome-extra/gnome-color-manager-3.1.2 + !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 +PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" + +DEPEND="${COMMON_DEPEND} + x11-proto/xproto + x11-proto/xf86miscproto + x11-proto/kbproto + + dev-libs/libxml2:2 + dev-libs/libxslt + >=dev-util/intltool-0.40.1 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + + gnome-base/gnome-common + sys-devel/autoconf-archive +" +# Needed for autoreconf +# gnome-base/gnome-common +# sys-devel/autoconf-archive + +PATCHES=( + # Make some panels and dependencies optional; requires eautoreconf + # https://bugzilla.gnome.org/686840, 697478, 700145 + "${FILESDIR}"/${PV}-optional.patch + "${FILESDIR}"/${PV}-optional-wayland.patch + "${FILESDIR}"/${PV}-optional-networkmanager.patch + "${FILESDIR}"/${PV}-optional-cups.patch + # Fix some absolute paths to be appropriate for Gentoo + "${FILESDIR}"/${PV}-gentoo-paths.patch + # https://bugzilla.gnome.org/show_bug.cgi?id=780544 + "${FILESDIR}"/${PV}-fix-without-gdkwayland.patch +) + +src_configure() { + gnome2_src_configure \ + --disable-update-mimedb \ + --disable-static \ + --enable-documentation \ + $(use_enable bluetooth) \ + $(use_enable colord color) \ + $(use_enable cups) \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable gnome-online-accounts goa) \ + $(use_enable ibus) \ + $(use_enable kerberos) \ + $(use_enable networkmanager) \ + $(use_with v4l cheese) \ + $(use_enable input_devices_wacom wacom) \ + $(use_enable wayland) +} + +src_install() { + gnome2_src_install completiondir="$(get_bashcompdir)" +} diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild new file mode 100644 index 000000000000..4935e46c8860 --- /dev/null +++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit bash-completion-r1 gnome2 + +DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" +HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" + +LICENSE="GPL-2+" +SLOT="2" +IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# False positives caused by nested configure scripts +QA_CONFIGURE_OPTIONS=".*" + +# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login +# g-s-d[policykit] needed for bug #403527 +# kerberos unfortunately means mit-krb5; build fails with heimdal +# udev could be made optional, only conditions gsd-device-panel +# (mouse, keyboards, touchscreen, etc) +# display panel requires colord +# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional) +COMMON_DEPEND=" + >=dev-libs/glib-2.44.0:2[dbus] + >=x11-libs/gdk-pixbuf-2.23.0:2 + >=x11-libs/gtk+-3.22.0:3[X,wayland?] + >=gnome-base/gsettings-desktop-schemas-3.21.4 + >=gnome-base/gnome-desktop-3.21.2:3= + >=gnome-base/gnome-settings-daemon-3.23.90[colord?,policykit] + >=x11-misc/colord-0.1.34:0= + + >=dev-libs/libpwquality-1.2.2 + dev-libs/libxml2:2 + gnome-base/libgtop:2= + media-libs/fontconfig + >=sys-apps/accountsservice-0.6.39 + + >=media-libs/libcanberra-0.13[gtk3] + >=media-sound/pulseaudio-2[glib] + >=sys-auth/polkit-0.97 + >=sys-power/upower-0.99:= + + virtual/libgudev + x11-apps/xmodmap + x11-libs/cairo + x11-libs/libX11 + x11-libs/libXxf86misc + >=x11-libs/libXi-1.2 + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) + colord? ( + net-libs/libsoup:2.4 + >=x11-misc/colord-0.1.34:0= + >=x11-libs/colord-gtk-0.1.24 ) + cups? ( + >=net-print/cups-1.4[dbus] + >=net-fs/samba-4.0.0[client] + ) + gnome-online-accounts? ( + >=media-libs/grilo-0.3.0:0.3= + >=net-libs/gnome-online-accounts-3.21.5:= ) + ibus? ( >=app-i18n/ibus-1.5.2 ) + kerberos? ( app-crypt/mit-krb5 ) + networkmanager? ( + >=gnome-extra/nm-applet-1.2.0 + >=net-misc/networkmanager-1.2.0:=[modemmanager] + >=net-misc/modemmanager-0.7.990 ) + v4l? ( + media-libs/clutter-gtk:1.0 + >=media-video/cheese-3.5.91 ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + >=media-libs/clutter-1.11.3:1.0 + media-libs/clutter-gtk:1.0 + >=x11-libs/libXi-1.2 ) +" +# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x +# libgnomekbd needed only for gkbd-keyboard-display tool +# +# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 +# Also we need newer driver versions to allow wacom and libinput drivers to +# not collide +# +# system-config-printer provides org.fedoraproject.Config.Printing service and interface +# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy +RDEPEND="${COMMON_DEPEND} + || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) + x11-themes/adwaita-icon-theme + colord? ( >=gnome-extra/gnome-color-manager-3 ) + cups? ( + app-admin/system-config-printer + net-print/cups-pk-helper ) + input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) + >=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 ) ) + + !<gnome-base/gdm-2.91.94 + !<gnome-extra/gnome-color-manager-3.1.2 + !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 +PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" + +DEPEND="${COMMON_DEPEND} + x11-proto/xproto + x11-proto/xf86miscproto + x11-proto/kbproto + + dev-libs/libxml2:2 + dev-libs/libxslt + >=dev-util/intltool-0.40.1 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + + gnome-base/gnome-common + sys-devel/autoconf-archive +" +# Needed for autoreconf +# gnome-base/gnome-common +# sys-devel/autoconf-archive + +PATCHES=( + # Make some panels and dependencies optional; requires eautoreconf + # https://bugzilla.gnome.org/686840, 697478, 700145 + "${FILESDIR}"/3.24.2-optional.patch + "${FILESDIR}"/3.24.2-optional-wayland.patch + "${FILESDIR}"/3.24.2-optional-networkmanager.patch + "${FILESDIR}"/3.24.2-optional-cups.patch + # Fix some absolute paths to be appropriate for Gentoo + "${FILESDIR}"/3.24.2-gentoo-paths.patch + # https://bugzilla.gnome.org/show_bug.cgi?id=780544 + "${FILESDIR}"/3.24.2-fix-without-gdkwayland.patch +) + +src_configure() { + gnome2_src_configure \ + --disable-update-mimedb \ + --disable-static \ + --enable-documentation \ + $(use_enable bluetooth) \ + $(use_enable colord color) \ + $(use_enable cups) \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable gnome-online-accounts goa) \ + $(use_enable ibus) \ + $(use_enable kerberos) \ + $(use_enable networkmanager) \ + $(use_with v4l cheese) \ + $(use_enable input_devices_wacom wacom) \ + $(use_enable wayland) +} + +src_install() { + gnome2_src_install completiondir="$(get_bashcompdir)" +} diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml new file mode 100644 index 000000000000..4e40862668dd --- /dev/null +++ b/gnome-base/gnome-control-center/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="colord">Support color management using + <pkg>x11-misc/colord</pkg></flag> + <flag name="gnome-online-accounts">Enable configuration panel for + <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag> + <flag name="ibus">Enable support for enhanced input methods through + <pkg>app-i18n/ibus</pkg></flag> + </use> +</pkgmetadata> diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest new file mode 100644 index 000000000000..95161af8d720 --- /dev/null +++ b/gnome-base/gnome-core-apps/Manifest @@ -0,0 +1,7 @@ +EBUILD gnome-core-apps-3.20.0.ebuild 1446 SHA256 eefcc9ac4e20f0e1f9dab0d5edf9fed454f0868f1af3292e5a274efed2da509f SHA512 265e62a1341dc6dcd4da66ae67e11ae43a5b434fac1b18c329646871201663cee4c7fa1cb1b16526193057d7da9345a38d62e9f82c2f64be8323b2411ef3bd8f WHIRLPOOL 4f0cf6c4069386bad816125d1cd9601c6294d430c41068052ad22503143b13b4f8c22e419f755e4dff545d3588559a499f3c162816d48f07c255f5074fdf9aa1 +EBUILD gnome-core-apps-3.22.0.ebuild 1441 SHA256 01c39465983c9120f306309511a45f4a4f2ef297fe994ddc63da049ea6dc6ac3 SHA512 c6f03547eec08fa810e44bbc711ede75d128d760bbaa6a1e2de5832d81b673cb709baef89378c6ee8ac9690f0feebec260b254cf84f73c938205098bc6a67471 WHIRLPOOL 5a95db1efc9cf8b630a729b4738dbb92c9e776f69c77b76635bfaecd052399fa2095668b435b42a72aaf10284ee291d6650812052d2a09c56f5b2ae09dc2b258 +EBUILD gnome-core-apps-3.22.2.ebuild 1577 SHA256 85dd5072469b0e401abc9a6dc52d5d72909b4b7af9c4c69bb3baaa970b550d1b SHA512 cd1d1c939e04a1b6850b25c7c0a8a0279a5b90f490b61b9b0015fc4eea0e40926cb9e9e9164fd59bab071cb2caba7ae55233a3d47f3c95e95819e6f2a98954d2 WHIRLPOOL 4c5f9c108ec03c5b1d6a314f4cb2064cec517d70d17dda5c0d85937b6deaef1e96fe148417463cddb0dedf57d5bfa704aee22540ec68b79e8802c75258ad14bf +EBUILD gnome-core-apps-3.24.0.ebuild 1571 SHA256 381b602f3e2fabfb959e9aae32ef4961c7b13ba3423d1018e15bd0954911af63 SHA512 e33c6f3231804e2b764b4ec9b4ca8adf1197913820a4a6743c4462e907e22736191bb4c9e1dd40b6d005173247ec7e0a5fd1f9bb0fb515d51cd49ddc2d824069 WHIRLPOOL d1dc2592354ec212472338ecd13c294cbb62bf99646dfc24dda0e63f3b4d01ce8f085296b0c837e29565810390914bc6ddfd325563ce25a751088ac341e39e37 +MISC ChangeLog 4807 SHA256 c3661fd8c5482b629ee526d9d99825f7a10a0644cce30d4428daeff964c54861 SHA512 bf2feeca0d0c0b229c83356eb185504d7d930ca568b066a09af58f67a4d27257a55d1e308d19aabebfe46b61b1ef4ecb87dd7e2c1499e30a4bccc7e84e92a73e WHIRLPOOL ba1f3ccc5703b3a3309f36f123563b0320650b2545ab05a61f4646a8f1e226370feeb83a4e6bd164ab81f81937dc9a64dbd808c38fa472047a5e33525f221c21 +MISC ChangeLog-2015 4977 SHA256 c3ebb555f9896974a111660a7546e72866bd860b8b003d261524fcfab721ba67 SHA512 1e0820a748599a607a1253444277ee430dab318467f04dc0e4051aa78e8c249154efe312991366a631c12df814f9ee1300b3699ac1e6a026996ab8bb521d372c WHIRLPOOL 0f5a9b2873a26259a8ce485b362c7fad6dbf1bbaed65d938f8ee7272c5e42ce8ff3a639f08f98e31dc693318db28c58eaecc257a6ca136f668459e290fc2160c +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild new file mode 100644 index 000000000000..d7f6d2f5522e --- /dev/null +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="3.0" +IUSE="+bluetooth +cdr cups" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86" + +# Note to developers: +# This is a wrapper for the core apps tightly integrated with GNOME 3 +# gtk-engines:2 is still around because it's needed for gtk2 apps +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV}[cups?] + + >=gnome-base/gnome-session-${PV} + >=gnome-base/gnome-menus-3.10.1:3 + >=gnome-base/gnome-settings-daemon-${PV}[cups?] + >=gnome-base/gnome-control-center-${PV}[cups?] + + >=app-crypt/gcr-${PV} + >=gnome-base/nautilus-${PV} + >=gnome-base/gnome-keyring-${PV} + >=gnome-extra/evolution-data-server-${PV} + + >=app-crypt/seahorse-${PV} + >=app-editors/gedit-${PV} + >=app-text/evince-${PV} + >=gnome-extra/gnome-contacts-${PV} + >=media-gfx/eog-${PV} + >=media-video/totem-3.18 + >=net-im/empathy-3.12.12 + >=x11-terms/gnome-terminal-${PV} + + >=gnome-extra/gnome-user-docs-${PV} + >=gnome-extra/yelp-${PV} + + >=x11-themes/adwaita-icon-theme-${PV%??} + >=x11-themes/gnome-themes-standard-${PV} + + bluetooth? ( >=net-wireless/gnome-bluetooth-${PV} ) + cdr? ( >=app-cdr/brasero-3.12.1 ) + + !gnome-base/gnome-applets +" +DEPEND="" + +S="${WORKDIR}" diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.22.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.22.0.ebuild new file mode 100644 index 000000000000..53f2309d14c5 --- /dev/null +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.22.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="3.0" +IUSE="+bluetooth +cdr cups" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +# Note to developers: +# This is a wrapper for the core apps tightly integrated with GNOME 3 +# gtk-engines:2 is still around because it's needed for gtk2 apps +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV}[cups?] + + >=gnome-base/gnome-session-${PV} + >=gnome-base/gnome-menus-3.10.1:3 + >=gnome-base/gnome-settings-daemon-${PV}[cups?] + >=gnome-base/gnome-control-center-${PV}[cups?] + + >=app-crypt/gcr-3.20.0 + >=gnome-base/nautilus-3.20.0 + >=gnome-base/gnome-keyring-3.20.0 + >=gnome-extra/evolution-data-server-${PV} + + >=app-crypt/seahorse-3.20.0 + >=app-editors/gedit-${PV} + >=app-text/evince-${PV} + >=gnome-extra/gnome-contacts-${PV} + >=media-gfx/eog-3.20.5 + >=media-video/totem-${PV} + >=net-im/empathy-3.12.12 + >=x11-terms/gnome-terminal-${PV} + + >=gnome-extra/gnome-user-docs-${PV} + >=gnome-extra/yelp-${PV} + + >=x11-themes/adwaita-icon-theme-${PV} + >=x11-themes/gnome-themes-standard-${PV} + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.0 ) + cdr? ( >=app-cdr/brasero-3.12.1 ) + + !gnome-base/gnome-applets +" +DEPEND="" + +S="${WORKDIR}" diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild new file mode 100644 index 000000000000..e286334dd136 --- /dev/null +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="3.0" +IUSE="+bluetooth +cdr cups" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86" + +# Note to developers: +# This is a wrapper for the core apps tightly integrated with GNOME 3 +# gtk-engines:2 is still around because it's needed for gtk2 apps +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV}[cups?] + + >=gnome-base/gnome-session-${PV} + >=gnome-base/gnome-settings-daemon-3.22.1[cups?] + >=gnome-base/gnome-control-center-3.22.1[cups?] + + >=app-crypt/gcr-3.20.0 + >=gnome-base/nautilus-3.22.1 + >=gnome-base/gnome-keyring-3.20.0 + >=gnome-extra/evolution-data-server-${PV} + + >=app-crypt/seahorse-3.20.0 + >=app-editors/gedit-3.22.0 + >=app-text/evince-3.22.1 + >=gnome-extra/gnome-contacts-3.22.1 + >=media-gfx/eog-3.20.5 + >=media-video/totem-3.22.0 + >=x11-terms/gnome-terminal-3.22.1 + + >=gnome-extra/gnome-user-docs-3.22.0 + >=gnome-extra/yelp-3.22.0 + + >=x11-themes/adwaita-icon-theme-3.22.0 + >=x11-themes/gnome-themes-standard-${PV} + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.0 ) + cdr? ( >=app-cdr/brasero-3.12.1 ) + + !gnome-base/gnome-applets +" +DEPEND="" + +# >=gnome-base/gnome-menus-3.13.3:3 # not used by core gnome anymore, just gnome-classic extensions +# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore + +S="${WORKDIR}" diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild new file mode 100644 index 000000000000..cbe71dc74215 --- /dev/null +++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="3.0" +IUSE="+bluetooth +cdr cups" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" + +# Note to developers: +# This is a wrapper for the core apps tightly integrated with GNOME 3 +# gtk-engines:2 is still around because it's needed for gtk2 apps +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV}[cups?] + + >=gnome-base/gnome-session-${PV} + >=gnome-base/gnome-settings-daemon-${PV}[cups?] + >=gnome-base/gnome-control-center-${PV}[cups?] + + >=app-crypt/gcr-3.20.0 + >=gnome-base/nautilus-${PV} + >=gnome-base/gnome-keyring-3.20.0 + >=gnome-extra/evolution-data-server-${PV} + + >=app-crypt/seahorse-3.20.0 + >=app-editors/gedit-3.22.1 + >=app-text/evince-${PV} + >=gnome-extra/gnome-contacts-3.22.1 + >=media-gfx/eog-${PV} + >=media-video/totem-${PV} + >=x11-terms/gnome-terminal-${PV} + + >=gnome-extra/gnome-user-docs-${PV} + >=gnome-extra/yelp-3.22.0 + + >=x11-themes/adwaita-icon-theme-${PV} + >=x11-themes/gnome-themes-standard-3.22.3 + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.0 ) + cdr? ( >=app-cdr/brasero-3.12.1 ) + + !gnome-base/gnome-applets +" +DEPEND="" + +# >=gnome-base/gnome-menus-3.13.3:3 # not used by core gnome anymore, just gnome-classic extensions +# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore + +S="${WORKDIR}" diff --git a/gnome-base/gnome-core-apps/metadata.xml b/gnome-base/gnome-core-apps/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/gnome-core-apps/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest new file mode 100644 index 000000000000..6f2795534984 --- /dev/null +++ b/gnome-base/gnome-core-libs/Manifest @@ -0,0 +1,5 @@ +EBUILD gnome-core-libs-3.22.2.ebuild 1087 SHA256 6829ced18d0822f90d6432d6e27d708c2818c228732b900b64bc8ce9be56f6d0 SHA512 4e69a5b10cffe7e9aca337371d6c105ae6d3dcf802b074bbb4477b3586b0d447baaea4027f204c8c04c22bbde9c1ca762fdb17a73c669a4245dd788688bbd844 WHIRLPOOL 79b28e9f1879ad15b5c5a43d1656c011343de3743c8aebe471db6e23f5f51a093222d5e6d4001fe7c298cb1f9065138d86efa15dc76949442d60e6974b67d991 +EBUILD gnome-core-libs-3.24.0.ebuild 1083 SHA256 ca8a72d2a96c9f62c47bc37041c300ed1531caf23c812350dbc5432cb91648c1 SHA512 1d07361fcd70ce3d90ff0fd02b8619161810f19fb1c1be7bca51509085ccb4ba36406e675e10a85023bee1bbf67a71c14879e670d29d773e9b8cb37d46645275 WHIRLPOOL 2528fb6fcf4d653f9b0ea78cf225bc644d621becdade8e0e4d201c75e19ba9ca815e0d1ee8d3d44cbddf188fe41c98c399de893760d6f60d0c1368b764e4451b +MISC ChangeLog 4840 SHA256 ebf37d20acc160d575068b5e3bffde59dc6e5e6702c32fadf1f4ec8f0528bb84 SHA512 ee5215a81cb2daaff4da84751ed898850eb6fc59b754ec532e4b4fdcab155cc7807933e85f7a03ce005c61c8dd88fc444e38f5ee38703b9f7ce6ed61bfc45f6d WHIRLPOOL f87e245e7d4e4b2fd2a3b17c6f0425c6126c48e7b8dac1695d5b3c99da084efa115b8dddfa8204f7eb6eef83495456f9fc4811ef1c2ea2f8cab86076d9306e07 +MISC ChangeLog-2015 4172 SHA256 a8bdc541db9598e504f27c82caa5d4cbc7fbc9d1e423b4af625390c10821df6b SHA512 37fbbd9e8cb9d9f91a776746080f255190a2124c2b2e479527bd55adba6cbc3199918d7d220d1beb2528c7577e23d6be67584ddacf5240bf168f331971d403bf WHIRLPOOL 1232adf75fa2444b614c8144520d1d92fef1d089f0fdab6e6fcd8b9f570ec011535b5d62e594afbad7cfad847cde972a52f8d34811de44a146aa97ae547ed3dd +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.22.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.22.2.ebuild new file mode 100644 index 000000000000..b3dc6e221e02 --- /dev/null +++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.22.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Sub-meta package for the core libraries of GNOME 3" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="3.0" +IUSE="cups python" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" + +# Note to developers: +# This is a wrapper for the core libraries used by GNOME 3 +RDEPEND=" + >=dev-libs/glib-2.50.2:2 + >=x11-libs/gdk-pixbuf-2.36.0:2 + >=x11-libs/pango-1.40.3 + >=media-libs/clutter-1.26.0:1.0 + >=x11-libs/gtk+-3.22.3:3[cups?] + >=dev-libs/atk-2.22.0 + >=gnome-base/librsvg-2.40.16 + >=gnome-base/gnome-desktop-3.22.2:3 + >=x11-libs/startup-notification-0.12 + + >=gnome-base/gvfs-1.30.2 + >=gnome-base/dconf-0.26.0 + + >=media-libs/gstreamer-1.8.3:1.0 + >=media-libs/gst-plugins-base-1.8.3:1.0 + >=media-libs/gst-plugins-good-1.8.3:1.0 + + python? ( >=dev-python/pygobject-3.22.0:3 ) +" +DEPEND="" + +# >=x11-libs/libwnck-3.20.1:3 - not used by core packages anymore + +S="${WORKDIR}" diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.24.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.24.0.ebuild new file mode 100644 index 000000000000..af22bc2b50b7 --- /dev/null +++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.24.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Sub-meta package for the core libraries of GNOME 3" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="3.0" +IUSE="cups python" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# Note to developers: +# This is a wrapper for the core libraries used by GNOME 3 +RDEPEND=" + >=dev-libs/glib-2.52:2 + >=x11-libs/gdk-pixbuf-2.36.6:2 + >=x11-libs/pango-1.40.9 + >=media-libs/clutter-1.26.2:1.0 + >=x11-libs/gtk+-3.22.16:3[cups?] + >=dev-libs/atk-2.24 + >=gnome-base/librsvg-2.40.18 + >=gnome-base/gnome-desktop-${PV}:3 + >=x11-libs/startup-notification-0.12 + + >=gnome-base/gvfs-1.32 + >=gnome-base/dconf-0.26 + + >=media-libs/gstreamer-1.10.5:1.0 + >=media-libs/gst-plugins-base-1.10.5:1.0 + >=media-libs/gst-plugins-good-1.10.5:1.0 + + python? ( >=dev-python/pygobject-${PV}:3 ) +" +DEPEND="" + +# >=x11-libs/libwnck-3.20.1:3 - not used by core packages anymore + +S="${WORKDIR}" diff --git a/gnome-base/gnome-core-libs/metadata.xml b/gnome-base/gnome-core-libs/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/gnome-core-libs/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest new file mode 100644 index 000000000000..c8f363e91bb8 --- /dev/null +++ b/gnome-base/gnome-desktop/Manifest @@ -0,0 +1,11 @@ +AUX gnome-desktop-2.32.1-gold.patch 493 SHA256 6c7391376054199bfd57532e642c89b8a18396e12c79417549926e0b7e76bba6 SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b WHIRLPOOL 2ade696dfb67f6e12c4db3c1d82d85a22177a56eace8266ffc40d184e3c923c0b6c0d029a2733e783d8d012913cefd1e13feb2fc0a7b5f74dc75794ca84d4408 +AUX gnome-desktop-2.32.1-thumbnails.patch 3530 SHA256 3a2294ff8f8082d3be9d709efbc4757c518cbad57980cdc7f4efeef366a756bb SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263 WHIRLPOOL cb09db77b55cc34ed6a74babdeb0a71b7a3c8de0c3897615bf8a6dc3b037d5dfd4a56084a913855e5b97a0c12375c1c7941435d8e5385c0a683a5533983e8030 +DIST gnome-desktop-2.32.1.tar.bz2 1633847 SHA256 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 WHIRLPOOL 0889e79b1b3956b0ef1330f661676b77bdb40e8110657ea7f4035618ea023fc4b35364629d68741f042c0b971db9fa4c7731065717612486f7546e07fe048a0d +DIST gnome-desktop-3.22.2.tar.xz 1064496 SHA256 51d7ebf7a6c359be14c3dd7a022213e931484653815eb10b0131bef4c8979e1c SHA512 11ca2e8f6d8c104e11faee614d52039576a69a0e701cde296ec8ce0cdfdedf29a820771b1ee08dafa37f20612f06201875365c9976b48d8b82a137c7e5438046 WHIRLPOOL b94dadaed355e367e5067e53b081146fe29867fcd742ce7d6faa1e56a76ebce6c0ad758906f35fb5025f068b5e86147de052cf21d7e1e1423c183b3ca4381b89 +DIST gnome-desktop-3.24.2.tar.xz 1064808 SHA256 8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e SHA512 691817fda97fc1c560c72213668eb4c2a8d03cc2433470a78149b3f785e95d9b4b681bceb733a67e1bfda649a6aed7ca4569b4891ee89f824a28d7a95f2782c2 WHIRLPOOL fe88bb7975b2240bb48d59d5d4fc75587403846faa2dc550b89c652f32423aa062a748e8c66565ccf5c6180c645f134422fa6eb0550c038432883956e358035a +EBUILD gnome-desktop-2.32.1-r2.ebuild 2321 SHA256 f926705b1d53a37b2f20a96a57b65ff4fdbb934b28e6e37d0a1ba2335e2998bf SHA512 2631840d679cfdd6522a073012093a9cf532b990016ed6b4317d2a505c1c4dbdfe3b6a80deda8c7f37a69cd4a9edf718266e7c5ffac95f6e3378bc43212b9234 WHIRLPOOL 3a3f53bceb9d9a4b4b66cf772b1b1f60f29fa5968a157a7cf38fad6dd523067182ddd176b08f63e5565c3872452c91f91515802a69baaf07bc327f96f762905c +EBUILD gnome-desktop-3.22.2.ebuild 1599 SHA256 513ddecb168cde4fd68b04d7e02ace478e25d520857a3937564e2ac42e39da4f SHA512 95b56cad878377f21fa2acf7892c0c4c01b8b9bb33881a33aaa117276893c7f97d2114b6f00efb0e14d74fb2c84da75161e1e4a793772076ce19005745b3ffd8 WHIRLPOOL 06f49f2de5f4338c6bb86159c9160f887f54caa72d6fdf9dd4b4970ca1fd1a0860d2b50c9762ddb5768d49e72ea9f22eb8044f1a8fc498526c32ef6493611e2b +EBUILD gnome-desktop-3.24.2.ebuild 1601 SHA256 6ac9bbe1370cfc3d07c823365dd48890f2c81662dbad1421164259b6e70895c8 SHA512 2e10ab1c71ceb9ad3f5ddf3887e08d8fc403ba1935974553cc6fea3aafd0ce7f99f9e4c62c4a75701ad6c4228d8288117e8db13acf5e7c9862457c3be4c9272a WHIRLPOOL 9e73f0d33ed4d997204dcf83039eff1544976943d4349799ed5d2bf73fe396208edaf1d3fe73dab74556cbdae091ba0724650e15ed1c7380b64c23ca7bdd996c +MISC ChangeLog 5430 SHA256 2c50de3ba9d5017e18e8427e2db92508b3fd43d1de6e7ecf69dcdc5bd5b66583 SHA512 3f59673adf4a5f86348d8a874404365943e3a10ac135d7715b73dacfdf4a9ddf28189b0bca6d8925b38fff7db314acd1dc860aace6539135db869885df99093f WHIRLPOOL be6fccdf1aad7d32e4586d82af94730225376a5b7e1d61dfe583ea5e8e4d1efa15a8147c9af6786ab20072a87382fdc82c59214ae4137031fdaad2b89412da6f +MISC ChangeLog-2015 46499 SHA256 b4720086abde58eeb9f46533ec39e252efb8b384bf3e4eebb1840f6d334ebf37 SHA512 3e9382a43e803b8dfe1a83ef1500f5848e10fef562be1b03b493bc4cd14db992fe4b8488fbd07e5a472865bd333b17392cc0e451a3957ada8231528e379dd4d6 WHIRLPOOL c6c4c1ae6b7c2bb572b84816104cb1bf100f64799d4c63730c3567c42e96693cc42f994aa7b485a9eea20b3d7ff4d885efcd1244f7b7379e34982c755c5ba1d4 +MISC metadata.xml 354 SHA256 73750e0ce4735fe11fe306ef1978aa12cde2c7592438ec85c9a947964e0e7426 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea WHIRLPOOL a7c0ffa88276e95924428c7fd7a5efd8dd5312f38d914c2c76e0f075f64961a9b963aec13839df4ed43db4dd201ce828f15155d274aa57e2c9940af6d0a73161 diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch new file mode 100644 index 000000000000..2e845da46e5b --- /dev/null +++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch @@ -0,0 +1,16 @@ + libgnome-desktop/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libgnome-desktop/Makefile.in b/libgnome-desktop/Makefile.in +index 39209f6..a57b09e 100644 +--- a/libgnome-desktop/Makefile.in ++++ b/libgnome-desktop/Makefile.in +@@ -388,7 +388,7 @@ libgnome_desktop_2_la_SOURCES = \ + + libgnome_desktop_2_la_LIBADD = \ + $(XLIB_LIBS) \ +- $(GNOME_DESKTOP_LIBS) ++ $(GNOME_DESKTOP_LIBS) -lm + + libgnome_desktop_2_la_LDFLAGS = \ + -version-info $(LT_VERSION) \ diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch new file mode 100644 index 000000000000..583d7274379a --- /dev/null +++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch @@ -0,0 +1,118 @@ +Originally from https://github.com/mate-desktop/mate-desktop/commit/fcede97471263b7f145ceeb988f569d4aa9129b8 +Ported to gnome-desktop by Matthew Turnbull <sparky@bluefang-logic.com> + +Fixes nautilus-2 thumbnailing with >=glib-2.34 + +https://bugs.gentoo.org/show_bug.cgi?id=450930 + +diff -rupN a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c +--- a/libgnome-desktop/gnome-desktop-thumbnail.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail.c +@@ -526,8 +526,13 @@ gnome_desktop_thumbnail_factory_lookup ( + + file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL); + ++#if GLIB_CHECK_VERSION (2, 34, 0) ++ path = g_build_filename (g_get_user_cache_dir (), ++ "thumbnails", ++#else + path = g_build_filename (g_get_home_dir (), + ".thumbnails", ++#endif + (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large", + file, + NULL); +@@ -587,8 +592,13 @@ gnome_desktop_thumbnail_factory_has_vali + + file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL); + ++#if GLIB_CHECK_VERSION (2, 34, 0) ++ path = g_build_filename (g_get_user_cache_dir (), ++ "thumbnails/fail", ++#else + path = g_build_filename (g_get_home_dir (), + ".thumbnails/fail", ++#endif + appname, + file, + NULL); +@@ -917,12 +927,17 @@ make_thumbnail_dirs (GnomeDesktopThumbna + + res = FALSE; + ++#if GLIB_CHECK_VERSION (2, 34, 0) ++ thumbnail_dir = g_build_filename (g_get_user_cache_dir (), ++ "thumbnails", ++#else + thumbnail_dir = g_build_filename (g_get_home_dir (), + ".thumbnails", ++#endif + NULL); + if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR)) + { +- g_mkdir (thumbnail_dir, 0700); ++ g_mkdir_with_parents (thumbnail_dir, 0700); + res = TRUE; + } + +@@ -951,12 +966,17 @@ make_thumbnail_fail_dirs (GnomeDesktopTh + + res = FALSE; + ++#if GLIB_CHECK_VERSION (2, 34, 0) ++ thumbnail_dir = g_build_filename (g_get_user_cache_dir (), ++ "thumbnails", ++#else + thumbnail_dir = g_build_filename (g_get_home_dir (), + ".thumbnails", ++#endif + NULL); + if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR)) + { +- g_mkdir (thumbnail_dir, 0700); ++ g_mkdir_with_parents (thumbnail_dir, 0700); + res = TRUE; + } + +@@ -1025,8 +1045,13 @@ gnome_desktop_thumbnail_factory_save_thu + + file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL); + ++#if GLIB_CHECK_VERSION (2, 34, 0) ++ path = g_build_filename (g_get_user_cache_dir (), ++ "thumbnails", ++#else + path = g_build_filename (g_get_home_dir (), + ".thumbnails", ++#endif + (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large", + file, + NULL); +@@ -1129,8 +1154,13 @@ gnome_desktop_thumbnail_factory_create_f + + file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL); + ++#if GLIB_CHECK_VERSION (2, 34, 0) ++ path = g_build_filename (g_get_user_cache_dir (), ++ "thumbnails/fail", ++#else + path = g_build_filename (g_get_home_dir (), + ".thumbnails/fail", ++#endif + appname, + file, + NULL); +@@ -1221,8 +1251,13 @@ gnome_desktop_thumbnail_path_for_uri (co + file = g_strconcat (md5, ".png", NULL); + g_free (md5); + ++#if GLIB_CHECK_VERSION (2, 34, 0) ++ path = g_build_filename (g_get_user_cache_dir (), ++ "thumbnails", ++#else + path = g_build_filename (g_get_home_dir (), + ".thumbnails", ++#endif + (size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large", + file, + NULL); diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild new file mode 100644 index 000000000000..e716fbf0258d --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" +PYTHON_COMPAT=( python2_7 ) + +inherit gnome2 python-r1 + +DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" +HOMEPAGE="https://www.gnome.org/" + +LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" +SLOT="2" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="license-docs" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Note: gnome-desktop:2 and :3 install identical files in /usr/share/gnome/help +# and /usr/share/omf when --enable-desktop-docs is passed to configure. To avoid +# file conflict and pointless duplication, gnome-desktop:2[doc] will simply use +# the files that are installed by :3[doc] +# Note: depend on glib-2.34 to make sure users upgrade glib before gnome-desktop +# to get a fix for bug #450930 +RDEPEND=">=x11-libs/gtk+-2.18:2 + >=dev-libs/glib-2.34:2 + >=x11-libs/libXrandr-1.2 + >=gnome-base/gconf-2:2 + >=x11-libs/startup-notification-0.5 + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + >=dev-util/intltool-0.40 + virtual/pkgconfig + >=app-text/gnome-doc-utils-0.3.2 + ~app-text/docbook-xml-dtd-4.1.2 + x11-proto/xproto + >=x11-proto/randrproto-1.2 +" +PDEPEND=">=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}] + >=dev-python/pygobject-2.14:2[${PYTHON_USEDEP}] + license-docs? ( gnome-base/gnome-desktop:3[doc(+)] ) +" + +# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto +# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and +# eventually libXrandr shouldn't RDEPEND on randrproto) + +src_prepare() { + epatch "${FILESDIR}"/${P}-gold.patch + epatch "${FILESDIR}"/${P}-thumbnails.patch #450930 + gnome2_src_prepare +} + +src_configure() { + python_export_best + gnome2_src_configure \ + --with-gnome-distributor=Gentoo \ + --disable-scrollkeeper \ + --disable-static \ + --disable-deprecations \ + --disable-desktop-docs + # desktop-docs will be built by gnome-desktop:3 +} + +src_install() { + DOCS="AUTHORS ChangeLog HACKING NEWS README" + gnome2_src_install + # python-r1.eclass doesn't like versioned python shebangs + sed -e 's@#!\(.*python.*\)@#!/usr/bin/env python@' -i gnome-about/gnome-about + python_doscript gnome-about/gnome-about +} diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild new file mode 100644 index 000000000000..2ef37f4cb330 --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 virtualx + +DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" +HOMEPAGE="https://git.gnome.org/browse/gnome-desktop" + +LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" +SLOT="3/12" # subslot = libgnome-desktop-3 soname version +IUSE="debug +introspection udev" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris" + +# cairo[X] needed for gnome-bg +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.44.0:2[dbus] + >=x11-libs/gdk-pixbuf-2.33.0:2[introspection?] + >=x11-libs/gtk+-3.3.6:3[X,introspection?] + x11-libs/cairo:=[X] + x11-libs/libX11 + x11-misc/xkeyboard-config + >=gnome-base/gsettings-desktop-schemas-3.5.91 + introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) + udev? ( + sys-apps/hwids + virtual/libudev:= ) +" +RDEPEND="${COMMON_DEPEND} + !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.14 + >=dev-util/intltool-0.40.6 + dev-util/itstool + sys-devel/gettext + x11-proto/xproto + virtual/pkgconfig +" + +# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto + +src_configure() { + gnome2_src_configure \ + --disable-static \ + --with-gnome-distributor=Gentoo \ + --enable-desktop-docs \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable debug debug-tools) \ + $(use_enable introspection) \ + $(use_enable udev) +} + +src_test() { + virtx emake check +} diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild new file mode 100644 index 000000000000..5f8ef8c0217c --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 virtualx + +DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" +HOMEPAGE="https://git.gnome.org/browse/gnome-desktop" + +LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" +SLOT="3/12" # subslot = libgnome-desktop-3 soname version +IUSE="debug +introspection udev" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris" + +# cairo[X] needed for gnome-bg +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.44.0:2[dbus] + >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] + >=x11-libs/gtk+-3.3.6:3[X,introspection?] + x11-libs/cairo:=[X] + x11-libs/libX11 + x11-misc/xkeyboard-config + >=gnome-base/gsettings-desktop-schemas-3.5.91 + introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) + udev? ( + sys-apps/hwids + virtual/libudev:= ) +" +RDEPEND="${COMMON_DEPEND} + !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.14 + >=dev-util/intltool-0.40.6 + dev-util/itstool + sys-devel/gettext + x11-proto/xproto + virtual/pkgconfig +" + +# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto + +src_configure() { + gnome2_src_configure \ + --disable-static \ + --with-gnome-distributor=Gentoo \ + --enable-desktop-docs \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable debug debug-tools) \ + $(use_enable introspection) \ + $(use_enable udev) +} + +src_test() { + virtx emake check +} diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml new file mode 100644 index 000000000000..65b08cd27572 --- /dev/null +++ b/gnome-base/gnome-desktop/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="license-docs">Install help files documenting GNOME's + licenses</flag> + </use> +</pkgmetadata> diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest new file mode 100644 index 000000000000..bd53653493e9 --- /dev/null +++ b/gnome-base/gnome-extra-apps/Manifest @@ -0,0 +1,5 @@ +EBUILD gnome-extra-apps-3.22.2.ebuild 2294 SHA256 bd8bb0487ea86d55c5e4da18a583324bbc0be6b4afb6e84e3bf8ecbd3e398ab6 SHA512 3621f7dd842bf43f6f53fa84816796b32510250de026fd8bb9d028ee392c48d1797d61d2b1a610ea4540959ce22e4ac2e4d8af58a685bcfa38e51c05a515041a WHIRLPOOL c2db2b5503d08b0dfc2e5d5bc1e5319007c6ce04242a3a231f4ca966014dab8790fe2043db978b0088b380930c5f893b2290f62df8045e6be459145c077fe197 +EBUILD gnome-extra-apps-3.24.0.ebuild 2271 SHA256 2ca14f56f8d185fbe87009229364931c79296190ef5ad146da6985e143816d7c SHA512 9bba68301ecb21e31e582a21b3f1403c088ca6ca86969232d2f472e2ea31adf4dbbb4f5473f3273224184a00564a33fde060a331d295303d32d87b16ae146a91 WHIRLPOOL 5bbd9c20eecc3d47a3f4923d7a75116c657bb417b7fd6d4223dc239d580282e32b58eff5686f0ad1b9167605b0964d3dba641f695cf078132e523c0dd8f3918a +MISC ChangeLog 6008 SHA256 26fbfece9cddc1152b4671c0e62ad3bb09b962364fc9d3f4c60d31905de4b666 SHA512 17c2fde133ca7ef0442ab2696f92741a236f976a55300e11ac2985a6e0063681d210ab3e53b2350625ec560dca9cdead5a2c2290cfb07b42c769bfe097b744a7 WHIRLPOOL fa66348554805786a0f373b9ac4786af22a2e98c2d206280ae55836928f9c734271f72cc0472976307eb34415a32f8de1bb6001978096cdeab2af5d93164daaf +MISC ChangeLog-2015 7582 SHA256 6c32e9f614bede1a856ab9c12d4a09f55e5fe642b185b9b6efd748730b6a0e80 SHA512 38cab70d98f588a4c1ab8001319940913843f2b163203b13dd4425a65ec47d5e4055aca463dd3a6e6b20c807b5322721a9da3e1ef6a58585adebfe2f8ecdfcb9 WHIRLPOOL 3fc8c8befb95a55cf82e9fdf09d957c51b4f6895dce5c184649a358d38483c5644b90f682bbd063f8cd6a36596bd8a7580ae9a180c6790355495509d496a20e7 +MISC metadata.xml 617 SHA256 3d50361b21a89db64fb3307c90c5c68f6bf4d985cb7731e9552ad7a56f40c7ce SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be WHIRLPOOL 1e8bf0e0e2e11fcf54ef4dd5263d2c58e899c293224415e702a75cb972114017bea811c31ae9767eb9929fac63fe247853717f0322c56c4bb5d8e6e8dd401fc1 diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.22.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.22.2.ebuild new file mode 100644 index 000000000000..1936ed666835 --- /dev/null +++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.22.2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Sub-meta package for the applications of GNOME 3" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="3.0" +IUSE="+games +share +shotwell +tracker" + +KEYWORDS="amd64 x86" + +# Note to developers: +# This is a wrapper for the extra apps integrated with GNOME 3 +# Keep pkg order within a USE flag as upstream releng versions file +# TODO: Should we keep these here: gnome-power-manager, gucharmap, sound-juicer +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV} + + >=sys-apps/baobab-3.22.1 + >=media-video/cheese-3.22.1 + >=www-client/epiphany-3.22.2 + >=app-arch/file-roller-3.22.1 + >=gnome-extra/gnome-calculator-${PV} + >=gnome-extra/gnome-calendar-3.22.1 + >=gnome-extra/gnome-characters-3.22.0 + >=sys-apps/gnome-disk-utility-3.22.1 + >=media-gfx/gnome-font-viewer-3.22.0 + >=gnome-extra/gnome-power-manager-${PV} + >=media-gfx/gnome-screenshot-3.22.0 + >=gnome-extra/gnome-system-monitor-${PV} + >=gnome-extra/gnome-weather-3.20.2 + >=gnome-extra/gucharmap-9.0.2:2.90 + >=gnome-extra/sushi-3.21.91 + >=media-sound/sound-juicer-3.22.1 + >=net-misc/vino-3.22.0 + + >=gnome-base/dconf-editor-3.22.1 + >=app-dicts/gnome-dictionary-3.20.0 + >=mail-client/evolution-${PV} + >=net-analyzer/gnome-nettool-3.8.1 + >=gnome-extra/gnome-tweak-tool-3.22.0 + >=gnome-extra/nautilus-sendto-3.8.4 + >=net-misc/vinagre-3.22.0 + + games? ( + >=games-puzzle/five-or-more-${PV} + >=games-board/four-in-a-row-3.22.1 + >=games-board/gnome-chess-${PV} + >=games-puzzle/gnome-klotski-3.22.1 + >=games-board/gnome-mahjongg-3.22.0 + >=games-board/gnome-mines-${PV} + >=games-arcade/gnome-nibbles-3.22.1 + >=games-arcade/gnome-robots-3.22.1 + >=games-puzzle/gnome-sudoku-3.22.2 + >=games-puzzle/gnome-taquin-3.22.0 + >=games-puzzle/gnome-tetravex-3.22.0 + >=games-puzzle/hitori-3.22.0 + >=games-board/iagno-3.22.0 + >=games-puzzle/lightsoff-3.22.2 + >=games-puzzle/quadrapassel-3.22.0 + >=games-puzzle/swell-foop-${PV} + >=games-board/tali-3.22.0 + ) + share? ( >=gnome-extra/gnome-user-share-3.18.3 ) + shotwell? ( >=media-gfx/shotwell-0.24 ) + tracker? ( + >=app-misc/tracker-1.10.1 + >=gnome-extra/gnome-documents-3.22.0 + >=media-gfx/gnome-photos-${PV} + >=media-sound/gnome-music-3.22.1 ) +" +DEPEND="" +S=${WORKDIR} diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.0.ebuild new file mode 100644 index 000000000000..e7fe28b82abb --- /dev/null +++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.0.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Sub-meta package for the applications of GNOME 3" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="3.0" +IUSE="+games +share +shotwell +tracker" + +KEYWORDS="~amd64 ~x86" + +# Note to developers: +# This is a wrapper for the extra apps integrated with GNOME 3 +# Keep pkg order within a USE flag as upstream releng versions file +# TODO: Should we keep these here: gnome-power-manager, gucharmap, sound-juicer +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV} + + >=sys-apps/baobab-${PV} + >=media-video/cheese-${PV} + >=www-client/epiphany-${PV} + >=app-arch/file-roller-${PV} + >=gnome-extra/gnome-calculator-${PV} + >=gnome-extra/gnome-calendar-${PV} + >=gnome-extra/gnome-characters-${PV} + >=sys-apps/gnome-disk-utility-${PV} + >=media-gfx/gnome-font-viewer-${PV} + >=gnome-extra/gnome-power-manager-${PV} + >=media-gfx/gnome-screenshot-3.22.0 + >=gnome-extra/gnome-system-monitor-${PV} + >=gnome-extra/gnome-weather-${PV} + >=gnome-extra/gucharmap-10:2.90 + >=gnome-extra/sushi-${PV} + >=media-sound/sound-juicer-${PV} + >=net-misc/vino-3.22.0 + + >=gnome-base/dconf-editor-3.22.3 + >=app-dicts/gnome-dictionary-${PV} + >=mail-client/evolution-${PV} + >=net-analyzer/gnome-nettool-3.8.1 + >=gnome-extra/gnome-tweak-tool-${PV} + >=gnome-extra/nautilus-sendto-3.8.4 + >=net-misc/vinagre-3.22.0 + + games? ( + >=games-puzzle/five-or-more-3.22.2 + >=games-board/four-in-a-row-3.22.1 + >=games-board/gnome-chess-${PV} + >=games-puzzle/gnome-klotski-3.22.1 + >=games-board/gnome-mahjongg-3.22.0 + >=games-board/gnome-mines-${PV} + >=games-arcade/gnome-nibbles-${PV} + >=games-arcade/gnome-robots-3.22.1 + >=games-puzzle/gnome-sudoku-${PV} + >=games-puzzle/gnome-taquin-3.22.0 + >=games-puzzle/gnome-tetravex-3.22.0 + >=games-puzzle/hitori-3.22.0 + >=games-board/iagno-3.22.0 + >=games-puzzle/lightsoff-$PV + >=games-puzzle/quadrapassel-3.22.0 + >=games-puzzle/swell-foop-${PV} + >=games-board/tali-3.22.0 + ) + share? ( >=gnome-extra/gnome-user-share-3.18.3 ) + shotwell? ( >=media-gfx/shotwell-0.26 ) + tracker? ( + >=app-misc/tracker-1.12 + >=gnome-extra/gnome-documents-${PV} + >=media-gfx/gnome-photos-${PV} + >=media-sound/gnome-music-${PV} ) +" +DEPEND="" +S=${WORKDIR} diff --git a/gnome-base/gnome-extra-apps/metadata.xml b/gnome-base/gnome-extra-apps/metadata.xml new file mode 100644 index 000000000000..de5c58479821 --- /dev/null +++ b/gnome-base/gnome-extra-apps/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="games">Install Gnome Games</flag> + <flag name="share">Install the <pkg>gnome-extra/gnome-user-share</pkg> personal file sharing tool</flag> + <flag name="shotwell">Install the <pkg>media-gfx/shotwell</pkg> photo manager</flag> + <flag name="tracker">Install the <pkg>app-misc/tracker</pkg> indexer and the GNOME packages that require it</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest new file mode 100644 index 000000000000..1146aba390f7 --- /dev/null +++ b/gnome-base/gnome-keyring/Manifest @@ -0,0 +1,7 @@ +DIST gnome-keyring-3.20.0.tar.xz 1215324 SHA256 bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99 SHA512 f7e6195b4be52edaee3bc3181f006ec31ebd54f8000c98220520f4158f66580b60950e4f55247aefae6aa9320f6589c8a09c1e32853165915ae5ff1b40627c5b WHIRLPOOL 63ceaf842b4f9661eb732fbddec6f26dda7ae157e405eb0d0b377ff07dd01c0e0ae3b3c0dd07d2434199edb3730994231da936aaf472054ee5cb76f089439fb8 +DIST gnome-keyring-3.20.1.tar.xz 1219800 SHA256 97964e723f454be509c956ed5e38b5c2fd7363f43bd3f153b94a4a63eb888c8c SHA512 a60d8a4b17a9c6d8c581578881abaf7d79de43045a314b401e3bfd3974edb4ab94117dd430203b721058f432b24bf6296e0b7c4fba1e66cccd2c2e9441787177 WHIRLPOOL e05ccedf325cafdd3faa70c6873345b4febbf0dc9e45e611165b58b78e99659fd238dbddc5a24e470663cf6d8772eb0a07677257d1a4b35c5333f6cc872403af +EBUILD gnome-keyring-3.20.0.ebuild 2160 SHA256 18f92916cae6bcaa77843754236c9537d7ed77e7c0b8d78b76aec94d2b77854e SHA512 d2ad880164ec25e7853fe4ac395e0e93500d559452ffbfe3cc87bc7b5ffd490b3d1c6f3f77d5df9f61d50e0e6b55cef819d4bd4f49d4e96b01cd6237bd58f2f7 WHIRLPOOL 2c7b1fb70d1ae54fe859364fa9408644ad462d8d583bf6015ca1018316b6f6d91712ffcbdbacd0f03b5acd75fc1fef850760edfb6d111f1d0b1e6ae82f4044ce +EBUILD gnome-keyring-3.20.1.ebuild 2168 SHA256 788eeab1b5dd069ae9471038036e3ad3832043d35bc6badd4c566ffd15125f9c SHA512 1c928b3d7859590fad00ef8cce9bf804081f5b3c2ec18b07fbc76067f262d9b0b7a310eb8b5c22e1dbd40a29fad8f73a4eff63ca5b1a67c44b72b9c25a5eee93 WHIRLPOOL df97694b7454874f62620751782e352b13a9f255e55d85123783486535aca14814060e7c64b0f1234f64178461131017b9542a6b57cd0d0d359767ff33c7dd79 +MISC ChangeLog 7558 SHA256 e1d858e30da1db00bde95210abd8ec15de2c737b0e8aa5c248b15e515164d2f8 SHA512 7fe6b2c3221a63aa4651e72560d3a58712385235dc0d17bc4985e1580273021aec19270762d96f3633fa04aa40bed018d58d6666a501cd1eeed0cfd6294f4fbe WHIRLPOOL a36d43dc2306baa26e876b81bd47792729fb58d33e51d78555c8f9dd39d2c4ced8b809d894e31ae547161ddd923c150bb3444e07316dc8e71b2f00c6e1a0eec0 +MISC ChangeLog-2015 40789 SHA256 e744be956a19f91e02d490952b15dc98624d2c24a1cc5ab2567e4d976e1345c6 SHA512 ef27c734a5f6b224dabaef702d731d4bbb08a8e726852449f24337603f7b4f83884273d2d24a9391d1812033c806000836c7cfe75c556f8d057a36264bdca74a WHIRLPOOL ebfe04bec976ef2f9c30fc2dc4f1ede07bb6808836e01c4d86de7c79dd67fab6b312bdfba90d587c55a64b7775b14f58b1938fbaa0bce6f89c7ae99c0162cd9b +MISC metadata.xml 883 SHA256 7f875d089777be10faa6f0e2e122e557ad278bbe6b924c2b21664715c8bf8b95 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a WHIRLPOOL 3d1be4bed4019ce047bda331b2342a08a91e823eff266de3f99be6f987632bb37b46321415003479325022dc41dbefc9daf3f42f68fad6787ad4f5782966322d diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild new file mode 100644 index 000000000000..7ac2c9823bcb --- /dev/null +++ b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python2_7 ) + +inherit fcaps gnome2 pam python-any-r1 versionator virtualx + +DESCRIPTION="Password and keyring managing daemon" +HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +IUSE="+caps pam selinux +ssh-agent test" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 +RDEPEND=" + >=app-crypt/gcr-3.5.3:=[gtk] + >=dev-libs/glib-2.38:2 + app-misc/ca-certificates + >=dev-libs/libgcrypt-1.2.2:0= + caps? ( sys-libs/libcap-ng ) + pam? ( virtual/pam ) + selinux? ( sec-policy/selinux-gnome ) + >=app-crypt/gnupg-2.0.28:= +" +DEPEND="${RDEPEND} + >=app-eselect/eselect-pinentry-0.5 + app-text/docbook-xml-dtd:4.3 + dev-libs/libxslt + >=dev-util/intltool-0.35 + sys-devel/gettext + virtual/pkgconfig + test? ( ${PYTHON_DEPS} ) +" +PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512 + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + # Disable stupid CFLAGS with debug enabled + sed -e 's/CFLAGS="$CFLAGS -g"//' \ + -e 's/CFLAGS="$CFLAGS -O0"//' \ + -i configure.ac configure || die + + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + $(use_with caps libcap-ng) \ + $(use_enable pam) \ + $(use_with pam pam-dir $(getpam_mod_dir)) \ + $(use_enable selinux) \ + $(use_enable ssh-agent) \ + --enable-doc +} + +src_test() { + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die + GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check +} + +pkg_postinst() { + # cap_ipc_lock only needed if building --with-libcap-ng + # Never install as suid root, this breaks dbus activation, see bug #513870 + use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon + gnome2_pkg_postinst + + if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then + ewarn "Please select pinentry-gnome3 as default pinentry provider:" + ewarn " # eselect pinentry set pinentry-gnome3" + fi +} diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild new file mode 100644 index 000000000000..0311d3962d21 --- /dev/null +++ b/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python2_7 ) + +inherit fcaps gnome2 pam python-any-r1 versionator virtualx + +DESCRIPTION="Password and keyring managing daemon" +HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +IUSE="+caps pam selinux +ssh-agent test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 +RDEPEND=" + >=app-crypt/gcr-3.5.3:=[gtk] + >=dev-libs/glib-2.38:2 + app-misc/ca-certificates + >=dev-libs/libgcrypt-1.2.2:0= + caps? ( sys-libs/libcap-ng ) + pam? ( virtual/pam ) + selinux? ( sec-policy/selinux-gnome ) + >=app-crypt/gnupg-2.0.28:= +" +DEPEND="${RDEPEND} + >=app-eselect/eselect-pinentry-0.5 + app-text/docbook-xml-dtd:4.3 + dev-libs/libxslt + >=dev-util/intltool-0.35 + sys-devel/gettext + virtual/pkgconfig + test? ( ${PYTHON_DEPS} ) +" +PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512 + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + # Disable stupid CFLAGS with debug enabled + sed -e 's/CFLAGS="$CFLAGS -g"//' \ + -e 's/CFLAGS="$CFLAGS -O0"//' \ + -i configure.ac configure || die + + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + $(use_with caps libcap-ng) \ + $(use_enable pam) \ + $(use_with pam pam-dir $(getpam_mod_dir)) \ + $(use_enable selinux) \ + $(use_enable ssh-agent) \ + --enable-doc +} + +src_test() { + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die + GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check +} + +pkg_postinst() { + # cap_ipc_lock only needed if building --with-libcap-ng + # Never install as suid root, this breaks dbus activation, see bug #513870 + use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon + gnome2_pkg_postinst + + if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then + ewarn "Please select pinentry-gnome3 as default pinentry provider:" + ewarn " # eselect pinentry set pinentry-gnome3" + fi +} diff --git a/gnome-base/gnome-keyring/metadata.xml b/gnome-base/gnome-keyring/metadata.xml new file mode 100644 index 000000000000..f8058de62b5a --- /dev/null +++ b/gnome-base/gnome-keyring/metadata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <longdescription lang="en"> + GNOME Keyring is a collection of components in GNOME that store + secrets, passwords, keys, certificates and make them available to + applications. It is integrated with the user's login, so that + their secret storage can be unlocked when the user logins into their + session. It is based around a standard called PKCS#11, which is a + standard way for applications to manage certificates and keys on + smart cards or secure storage. + </longdescription> + <use> + <flag name="ssh-agent">Use GNOME Keyring to unlock SSH keys. + Recommended unless you are using ECDSA or Ed25519 keys.</flag> + </use> +</pkgmetadata> diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest new file mode 100644 index 000000000000..41399650b8f9 --- /dev/null +++ b/gnome-base/gnome-light/Manifest @@ -0,0 +1,7 @@ +EBUILD gnome-light-3.20.0.ebuild 1759 SHA256 97d81d056363e2171ab2b44105122cc32c5697d06ff469f3e9449092627642ed SHA512 b63aa9e15c3d9bc3c67ad7cdfffeb65a909ec3d2d9ccd48109f8bec104f1b165bf0da344aed988cc9dc330706ba2477561b5f4646f7208cad5488f76b41b5cd1 WHIRLPOOL 58932c62929881bfeedbfdae3dfda1b8ceb4c1d3c428cba0e1f8b6e3c3b9c98a0972c3d99283d33639e37393469d4c775dfe47b2a94cf5ee4fcfdde497f914c0 +EBUILD gnome-light-3.22.0.ebuild 1762 SHA256 71fab7551c067e0e0f52710c7b808c207753489aa5ad09f20ae4171589d31175 SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5 WHIRLPOOL 9c519ccf7be3b55b3d25b4fb9f05c94c9539cdc70a60a5e10730f09ef65219b4b74fbd6dff75b545f777215eb3f15a2e045867ebfe95598feccf9efa2dc80274 +EBUILD gnome-light-3.22.2.ebuild 1708 SHA256 62c944a245912c9cc29bbb2a476d874965de67d9f7d2a62c35aa428a8b968491 SHA512 5ed974788a11b4e11fb196f66488a3ab59133ad0ee10ed813878124da6f8c790d1299f71ba9da7d5c7b41ef292f1f436b92e81586cf24cc6568ec01368880fa7 WHIRLPOOL 50b947354e97bf8b9e7a9a2c0ca3227a2b012c61655449261d913cb99625960bd0a617388b099741bb3bacf489cc0c6d99e3f0f5ed9a44088e719e8f1a30ec07 +EBUILD gnome-light-3.24.0.ebuild 1709 SHA256 81750ef2e2b84662aa5c48fedf1d7e9b58ac2e0e3d3a2e98309cdf4e2c9e39c5 SHA512 1dde665871cc76cc788f30db21faad8a24bed02fd8a7d0b7eed70f391c4c91c564086a4eae6e04d97a67af756a340638d2ff5460e56039fc83d66227f1d4b898 WHIRLPOOL d2fe76290f78179253846f1c1979f8fe9f66c5fc5fe879e02edc94fabc146e30edd4ac218e12a4acf8daf5035cbc3db64229a44baa37d5f57d4acc40469b5e2e +MISC ChangeLog 5133 SHA256 a09b9dd629b278bf6e2c9c2862f38c8a60034a300d9fe3687fc9784f1d71bd8f SHA512 f469b7709a086d1e56c69d922eb9e76afc040546f833e61addab165ee4b5d84f8bfb3ebf6213b1ad98d645395c3de370bdb6b7728de4b0b4172366b442968dce WHIRLPOOL e057ac3f83a134b468244f5e31f9925323ecd5400a5f0f405e9efc4d6bf6b9f9ebaa3a504688d0d977c4217e5bad270413cd002dd0b0c043138254f300398e39 +MISC ChangeLog-2015 25032 SHA256 8dca8e493ede927e0b1b5b153b3d4cc2062d01fa12fa46d8aca42b93b578677f SHA512 4a2ffa5b18bd8cc7db19bdc9773164b6e17ab0e059f14c55ca37c582ade55f920bb60ea3e57305f5f7456492d9e4dd8cd46ce3276532c6e8331679f98e9b071b WHIRLPOOL 8f67c2a7d73fd01d474eda6274b8c8544bb090284af12447a55021f6a1419b1c8192da229c62937925416148c2a5aeea17b6b8f891d3d6ec5554638373a46917 +MISC metadata.xml 406 SHA256 a7a79708c3788187460706296c97decb739f49cce23a02a793b53f49024a9cbf SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047 WHIRLPOOL 149613909b75aa11dc23c3140646cd041530acf475b7a42eb64faf1a5282d621a121f7e5148d0ed10c0dc41bebbb3003c7796185aa01e75f58a553cf8498fcec diff --git a/gnome-base/gnome-light/gnome-light-3.20.0.ebuild b/gnome-base/gnome-light/gnome-light-3.20.0.ebuild new file mode 100644 index 000000000000..5fe78de927bf --- /dev/null +++ b/gnome-base/gnome-light/gnome-light-3.20.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit versionator + +P_RELEASE="$(get_version_components 2)" + +DESCRIPTION="Meta package for GNOME-Light, merge this package to install" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="2.0" +IUSE="cups +gnome-shell" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86" + +# XXX: Note to developers: +# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of +# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without +# any apps, but shouldn't be used by users unless they know what they are doing. +RDEPEND="!gnome-base/gnome + >=gnome-base/gnome-core-libs-${PV}[cups?] + + >=gnome-base/gnome-session-${PV} + >=gnome-base/gnome-menus-3.10.1:3 + >=gnome-base/gnome-settings-daemon-${PV}[cups?] + >=gnome-base/gnome-control-center-${PV}[cups?] + + >=gnome-base/nautilus-${PV} + + gnome-shell? ( + >=x11-wm/mutter-${PV} + >=gnome-base/gnome-shell-${PV} ) + + >=x11-themes/adwaita-icon-theme-${P_RELEASE} + >=x11-themes/gnome-themes-standard-${PV} + >=x11-themes/gnome-backgrounds-${P_RELEASE} + + >=x11-terms/gnome-terminal-${PV} +" +DEPEND="" +PDEPEND=">=gnome-base/gvfs-1.28.0" +S="${WORKDIR}" + +pkg_pretend() { + if ! use gnome-shell; then + # Users probably want to use e16, sawfish, etc + ewarn "You're installing neither GNOME Shell" + ewarn "You will have to install and manage a window manager by yourself" + fi +} + +pkg_postinst() { + # Remember people where to find our project information + elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" + elog "for information about the project and documentation." +} diff --git a/gnome-base/gnome-light/gnome-light-3.22.0.ebuild b/gnome-base/gnome-light/gnome-light-3.22.0.ebuild new file mode 100644 index 000000000000..ad70f051b6c9 --- /dev/null +++ b/gnome-base/gnome-light/gnome-light-3.22.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit versionator + +P_RELEASE="$(get_version_components 2)" + +DESCRIPTION="Meta package for GNOME-Light, merge this package to install" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="2.0" +IUSE="cups +gnome-shell" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" + +# XXX: Note to developers: +# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of +# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without +# any apps, but shouldn't be used by users unless they know what they are doing. +RDEPEND="!gnome-base/gnome + >=gnome-base/gnome-core-libs-${PV}[cups?] + + >=gnome-base/gnome-session-${PV} + >=gnome-base/gnome-menus-3.10.1:3 + >=gnome-base/gnome-settings-daemon-${PV}[cups?] + >=gnome-base/gnome-control-center-${PV}[cups?] + + >=gnome-base/nautilus-3.20.0 + + gnome-shell? ( + >=x11-wm/mutter-${PV} + >=gnome-base/gnome-shell-${PV} ) + + >=x11-themes/adwaita-icon-theme-${P_RELEASE} + >=x11-themes/gnome-themes-standard-${PV} + >=x11-themes/gnome-backgrounds-${P_RELEASE} + + >=x11-terms/gnome-terminal-${PV} +" +DEPEND="" +PDEPEND=">=gnome-base/gvfs-1.28.0" +S="${WORKDIR}" + +pkg_pretend() { + if ! use gnome-shell; then + # Users probably want to use e16, sawfish, etc + ewarn "You're installing neither GNOME Shell" + ewarn "You will have to install and manage a window manager by yourself" + fi +} + +pkg_postinst() { + # Remember people where to find our project information + elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" + elog "for information about the project and documentation." +} diff --git a/gnome-base/gnome-light/gnome-light-3.22.2.ebuild b/gnome-base/gnome-light/gnome-light-3.22.2.ebuild new file mode 100644 index 000000000000..f1799dbcd4bb --- /dev/null +++ b/gnome-base/gnome-light/gnome-light-3.22.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit versionator + +P_RELEASE="$(get_version_components 2)" + +DESCRIPTION="Meta package for GNOME-Light, merge this package to install" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="2.0" +IUSE="cups +gnome-shell" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86" + +# XXX: Note to developers: +# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of +# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without +# any apps, but shouldn't be used by users unless they know what they are doing. +RDEPEND="!gnome-base/gnome + >=gnome-base/gnome-core-libs-${PV}[cups?] + + >=gnome-base/gnome-session-${PV} + >=gnome-base/gnome-settings-daemon-${PV}[cups?] + >=gnome-base/gnome-control-center-${PV}[cups?] + + >=gnome-base/nautilus-${PV} + + gnome-shell? ( + >=x11-wm/mutter-${PV} + >=gnome-base/gnome-shell-${PV} ) + + >=x11-themes/adwaita-icon-theme-${P_RELEASE} + >=x11-themes/gnome-themes-standard-${PV} + >=x11-themes/gnome-backgrounds-${P_RELEASE} + + >=x11-terms/gnome-terminal-${PV} +" +DEPEND="" +PDEPEND=">=gnome-base/gvfs-1.30.2" +S="${WORKDIR}" + +pkg_pretend() { + if ! use gnome-shell; then + # Users probably want to use e16, sawfish, etc + ewarn "You're not installing GNOME Shell" + ewarn "You will have to install and manage a window manager by yourself" + fi +} + +pkg_postinst() { + # Remember people where to find our project information + elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" + elog "for information about the project and documentation." +} diff --git a/gnome-base/gnome-light/gnome-light-3.24.0.ebuild b/gnome-base/gnome-light/gnome-light-3.24.0.ebuild new file mode 100644 index 000000000000..8c7d85930318 --- /dev/null +++ b/gnome-base/gnome-light/gnome-light-3.24.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit versionator + +P_RELEASE="$(get_version_components 2)" + +DESCRIPTION="Meta package for GNOME-Light, merge this package to install" +HOMEPAGE="https://www.gnome.org/" +LICENSE="metapackage" +SLOT="2.0" +IUSE="cups +gnome-shell" + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" + +# XXX: Note to developers: +# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of +# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without +# any apps, but shouldn't be used by users unless they know what they are doing. +RDEPEND="!gnome-base/gnome + >=gnome-base/gnome-core-libs-${PV}[cups?] + + >=gnome-base/gnome-session-${PV} + >=gnome-base/gnome-settings-daemon-${PV}[cups?] + >=gnome-base/gnome-control-center-${PV}[cups?] + + >=gnome-base/nautilus-${PV} + + gnome-shell? ( + >=x11-wm/mutter-${PV} + >=gnome-base/gnome-shell-${PV} ) + + >=x11-themes/adwaita-icon-theme-${P_RELEASE} + >=x11-themes/gnome-themes-standard-3.22.3 + >=x11-themes/gnome-backgrounds-${P_RELEASE} + + >=x11-terms/gnome-terminal-${PV} +" +DEPEND="" +PDEPEND=">=gnome-base/gvfs-1.32" +S="${WORKDIR}" + +pkg_pretend() { + if ! use gnome-shell; then + # Users probably want to use e16, sawfish, etc + ewarn "You're not installing GNOME Shell" + ewarn "You will have to install and manage a window manager by yourself" + fi +} + +pkg_postinst() { + # Remember people where to find our project information + elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" + elog "for information about the project and documentation." +} diff --git a/gnome-base/gnome-light/metadata.xml b/gnome-base/gnome-light/metadata.xml new file mode 100644 index 000000000000..b0d8e7f76359 --- /dev/null +++ b/gnome-base/gnome-light/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="gnome-shell">Install <pkg>gnome-base/gnome-shell</pkg> and + <pkg>x11-wm/mutter</pkg> for the standard GNOME 3 desktop mode</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest new file mode 100644 index 000000000000..195742586673 --- /dev/null +++ b/gnome-base/gnome-menus/Manifest @@ -0,0 +1,12 @@ +AUX gnome-menus-3.13.3-multiple-desktop.patch 5094 SHA256 f22defd228de353d0c45ff69570c9dc7bdf20831a87f54aeb5c9e5ab3df0d232 SHA512 6d7b3cb6d3e445355ea4c77a2930ef93792d5ce1ec44e449576700cea00f1f9e0fd2f1445a7d41675ed5a976501b458a8e650fd0c8e1adb0c1b364832d6f0972 WHIRLPOOL 1a14a08d1579b5e9f332a57e1fc11a9b7e07e3c0223e1fde923714ea3f6dfce1072dcaf1da389e4e7742d4fe15441d00ae938100c38a7b955703b1f65ab9a68b +AUX gnome-menus-3.13.3-multiple-desktop2.patch 781 SHA256 2693e4f411e6b9a5f1f93bf3aaae70e88e23ae5139c00084e1154d489b1a48de SHA512 e48c3a35fae90e35bffc1a36713d3b5122de7edb5369a4e34b04c49030a0c33937ad24099814e3003c887d5a0369b9cc927445f965ec2a2cfa9ac55858404f4d WHIRLPOOL a3df6605ffc23b0924044fbe5e8719abfbf0a99f2f3581aaf154e4296a29dbcae0eb9e1d6c8cbeae487470562657e8c6df7860bf53a95e29e2d8bbf16bdfea2a +AUX gnome-menus-3.8.0-ignore_kde_standalone.patch 1665 SHA256 5b27f8f02786db7383287bb233cc990934524e152778802e4c815307424e5d48 SHA512 db461006883594de834fff029b3aa769afa6955bc94062865d8c71ec224fdd64867693763c3ecb98921c98c7410bacf18dc2110b5322e1956c877e7fcf61bef0 WHIRLPOOL 5661aa027bcad2e380ca46f94143b043f43adc3ebe6ddcd9d21d951b3ab2a7d28167aa9faca183dd39d707428514b09fbe736dc0fa8bf72972230da5ab83f84e +DIST gnome-menus-3.10.1-patches.tar.xz 5708 SHA256 fd97cd902aac72ca8aa783c65ae1664842bcf2227262848662e93e1c44e9f6ac SHA512 bfdca2ba70525b71059262d4d19a2567c3d74c7f255ff823e5c24e631b764ab05be954ec16630729220a22f2425f8d2a8ecb1b22641346f53d5af9d9f90feebc WHIRLPOOL 01942eb7cf017ffa42d1c4189320ec7be9a8e25127074151b0a929b22f8d66b43a257f7c96506cdcf28aee35ffdf009f4f20f30ac38faa0aee59b99149618a8e +DIST gnome-menus-3.10.1.tar.xz 423052 SHA256 46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71 SHA512 e6f0fe223e60f6c33a2ed2cd958035e5560d4063fbe7485263c4ad0eba82e18948d19f7dbe84dd0db5c339e94366759a0f98da533e2798c3ed9cc9a87f73c7e0 WHIRLPOOL f4d4266c7d3d06a4551b3a4aaa987c5e3d8ecf867afa5ea6c7c41de4675d4973e2a87dd80a604acfbcc29f14c0f1e70156faa93d13429f33218bf5e790eee1d0 +DIST gnome-menus-3.13.3.tar.xz 404664 SHA256 7c446eb8ff381df52b8ba04e5886497595e84d1bc46caf7af764d894736c654e SHA512 d631eb17ddc1b33227d0e5862a9344a8605ee1e9ebc1f12ce4ac98895adaf8a82ef2a49415d99bc194a02f30f30c3d6d49759f280fbc246c9e482711fd5021d2 WHIRLPOOL fda219f4fd24b4c05059acc156609b3a5c002d34ba2d1a0bd3bd14f3a93e867974068195ebb4717385550548ada9e9d182a30a028d26320db9364dd6939ad2d0 +EBUILD gnome-menus-3.10.1-r1.ebuild 1509 SHA256 1333368747eaae5de8d755308412ee7473339512a979d1f41deb31a64d90ded3 SHA512 9816e9b145242f1b4d97845505303bad5c00b83549112e3bdb94eebf166ac9ed7ac44d5a6900f1df32ae8965c18a937a6408c53c69c44b200646e3c8874c0cfd WHIRLPOOL ee6c6bf694813471d2b6e1395950399db6c4fb38dffdf2ec5390ed4e57d8fac256020f23c9b818c0b1449d8ab9faad9b6c2c9a4fc64e58253b441edb28ac8017 +EBUILD gnome-menus-3.13.3-r1.ebuild 1382 SHA256 6d5ec5c2b061e652586afe77dcb50ddf24ac549331be9290879eb6fc869685ea SHA512 13517cd1fc4b57e6f63d114a273639cfafa3faeb16aaa977a3a9213a12e39fc8cc6a50f8b40b1f7e4f36265d586ac0a7fa76d285d382514ba64a81a42c11fe54 WHIRLPOOL 073d2bfbe4403b264f276c08e6c1da5bc3d731e4246873bdcc4c7302e2dc97f7cc71575065e6bea356a9de720a370395bf403f36cd4fd65c209fc413c76f5de5 +EBUILD gnome-menus-3.13.3.ebuild 1238 SHA256 39131be99c0d66c34cfff05d3729ce8f64bb934f52eb11cf79755ce9c20f2620 SHA512 d961500f12aa96ae6d0bef93b116d43070fb8a2db5491986c7128b6c0a56c914cbb698d941de194c2060a9bdff28a951196ec4589723e8c4e72b7126e437d3c3 WHIRLPOOL 6f0a14e160e991ce6b31de5980301296cdc7a3ecd684346e4da646014ab8683aa4eadfc91fbda51040622aa90bbb9262a474b2638a6bd920a8381e4647587ee7 +MISC ChangeLog 3595 SHA256 52ce5b45f7df9396079744a5dae6d7843ab73bc6bb740b266d2f96ef755271ea SHA512 1266960714577056e7af8a2e9450f89422876a2ac06a4e4a9b46c2f2e391725dcf284a38a94c125028688b625f2d4392d298b113d0bc2e3dbbbc52b438f1964a WHIRLPOOL 5480a3979827af4609fee6a62ea7902a546e68f33850c78d41c78cdb4de510f06416f375ba5c1c6a80848f5a7db98416e5cbaa00515fc149208574331d1e4e56 +MISC ChangeLog-2015 32293 SHA256 3b375d6175c3dc8e3d6f0d440226a4a0bf258528962e2b857ea69db00472a158 SHA512 97a4dffdd925fc8ceea8e6b18517a949d7905f822d2377ad8a3fe36a89370438b4705e523de2cda112263606983ddb58e99c5f9b72ed2eceaa39eb75a93ffd6a WHIRLPOOL 706f16b4f355d25f5867ce4516b93fee215791f885eb5a201f096c7ad4553d5d697232d323e8434725159045a51f5ae14bce0efb39253175cc75de0fe2db33a7 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch new file mode 100644 index 000000000000..8ec7006fce5b --- /dev/null +++ b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch @@ -0,0 +1,171 @@ +From b4546ab43c2c7ef6fb6cb7e5db83dc3975b56e8e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com> +Date: Mon, 27 Oct 2014 18:41:34 +0200 +Subject: desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP + +This is based on glib commit: +5a5e16e93c4f11e635918ecdb41681f63fd05a39 +--- + libmenu/desktop-entries.c | 110 ++++++++++++++++++++++------------------------ + 1 file changed, 52 insertions(+), 58 deletions(-) + +diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c +index 326f311..bd4f886 100644 +--- a/libmenu/desktop-entries.c ++++ b/libmenu/desktop-entries.c +@@ -85,32 +85,27 @@ unix_basename_from_path (const char *path) + return path; + } + +-static const char * +-get_current_desktop (void) ++static const gchar * const * ++get_current_desktops (void) + { +- static char *current_desktop = NULL; ++ static gchar **result; + +- /* Support XDG_CURRENT_DESKTOP environment variable; this can be used +- * to abuse gnome-menus in non-GNOME desktops. */ +- if (!current_desktop) ++ if (g_once_init_enter (&result)) + { +- const char *desktop; ++ const gchar *desktops; ++ gchar **tmp; + +- desktop = g_getenv ("XDG_CURRENT_DESKTOP"); ++ desktops = g_getenv ("XDG_CURRENT_DESKTOP"); + +- /* Note: if XDG_CURRENT_DESKTOP is set but empty, do as if it +- * was not set */ +- if (!desktop || desktop[0] == '\0') +- current_desktop = g_strdup ("GNOME"); +- else +- current_desktop = g_strdup (desktop); +- } ++ if (desktops) ++ desktops = ""; + +- /* Using "*" means skipping desktop-related checks */ +- if (g_strcmp0 (current_desktop, "*") == 0) +- return NULL; ++ tmp = g_strsplit (desktops, ":", 0); ++ ++ g_once_init_leave (&result, tmp); ++ } + +- return current_desktop; ++ return (const gchar **) result; + } + + static GIcon * +@@ -151,52 +146,58 @@ key_file_get_icon (GKeyFile *key_file) + static gboolean + key_file_get_show_in (GKeyFile *key_file) + { +- const gchar *current_desktop; +- gchar **strv; ++ const gchar * const *current_desktops; ++ gchar **only_show_in; ++ gchar **not_show_in; + gboolean show_in = TRUE; +- int i; +- +- current_desktop = get_current_desktop (); +- if (!current_desktop) +- return TRUE; +- +- strv = g_key_file_get_string_list (key_file, +- DESKTOP_ENTRY_GROUP, +- "OnlyShowIn", +- NULL, +- NULL); +- if (strv) ++ gint i; ++ ++ current_desktops = get_current_desktops (); ++ only_show_in = g_key_file_get_string_list (key_file, ++ DESKTOP_ENTRY_GROUP, ++ "OnlyShowIn", ++ NULL, ++ NULL); ++ not_show_in = g_key_file_get_string_list (key_file, ++ DESKTOP_ENTRY_GROUP, ++ "NotShowIn", ++ NULL, ++ NULL); ++ ++ for (i = 0; current_desktops[i]; i++) + { +- show_in = FALSE; +- for (i = 0; strv[i]; i++) ++ gint j; ++ ++ if (only_show_in) + { +- if (!strcmp (strv[i], current_desktop)) ++ show_in = FALSE; ++ for (j = 0; only_show_in[j]; j++) + { +- show_in = TRUE; +- break; ++ if (g_str_equal (only_show_in[j], current_desktops[i])) ++ { ++ show_in = TRUE; ++ goto out; ++ } + } + } +- } +- else +- { +- strv = g_key_file_get_string_list (key_file, +- DESKTOP_ENTRY_GROUP, +- "NotShowIn", +- NULL, +- NULL); +- if (strv) ++ ++ if (not_show_in) + { + show_in = TRUE; +- for (i = 0; strv[i]; i++) ++ for (j = 0; not_show_in[j]; j++) + { +- if (!strcmp (strv[i], current_desktop)) ++ if (g_str_equal (not_show_in[j], current_desktops[i])) + { + show_in = FALSE; ++ goto out; + } + } + } + } +- g_strfreev (strv); ++ ++out: ++ g_strfreev (only_show_in); ++ g_strfreev (not_show_in); + + return show_in; + } +@@ -579,14 +580,7 @@ gboolean + desktop_entry_get_show_in (DesktopEntry *entry) + { + if (entry->type == DESKTOP_ENTRY_DESKTOP) +- { +- const char *current_desktop = get_current_desktop (); +- +- if (current_desktop == NULL) +- return TRUE; +- else +- return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, current_desktop); +- } ++ return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, NULL); + return ((DesktopEntryDirectory*)entry)->showin; + } + +-- +cgit v0.11.2 + diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch new file mode 100644 index 000000000000..966b060eac27 --- /dev/null +++ b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch @@ -0,0 +1,27 @@ +From 4befe76fbdb76aa6a986297ef71d1601b2ced42e Mon Sep 17 00:00:00 2001 +From: Josselin Mouette <joss@debian.org> +Date: Sun, 14 Dec 2014 20:36:36 +0100 +Subject: desktop-entries: fix trivial bug in handling of multiple desktops in + XDG_CURRENT_DESKTOP. + +https://bugzilla.gnome.org/show_bug.cgi?id=741505 +--- + libmenu/desktop-entries.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c +index bd4f886..a463d79 100644 +--- a/libmenu/desktop-entries.c ++++ b/libmenu/desktop-entries.c +@@ -97,7 +97,7 @@ get_current_desktops (void) + + desktops = g_getenv ("XDG_CURRENT_DESKTOP"); + +- if (desktops) ++ if (!desktops) + desktops = ""; + + tmp = g_strsplit (desktops, ":", 0); +-- +cgit v0.11.2 + diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch new file mode 100644 index 000000000000..ab6cb92d7dda --- /dev/null +++ b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch @@ -0,0 +1,37 @@ +From bf91222f05076f32c0a21aa22f8629dc6ce19eb4 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr> +Date: Mon, 25 Feb 2013 16:36:44 +0330 +Subject: [PATCH] gnome-menus-3.7.90-ignore_kde_standalone + +--- + layout/gnome-applications.menu | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu +index 9242eff..94ea6d4 100644 +--- a/layout/gnome-applications.menu ++++ b/layout/gnome-applications.menu +@@ -277,7 +277,19 @@ + <And> + <Not><Category>Core</Category></Not> + <Not><Category>Screensaver</Category></Not> +- ++ <Not><Category>X-KDE-settings-accessibility</Category></Not> ++ <Not><Category>X-KDE-settings-components</Category></Not> ++ <Not><Category>X-KDE-settings-desktop</Category></Not> ++ <Not><Category>X-KDE-settings-looknfeel</Category></Not> ++ <Not><Category>X-KDE-settings-network</Category></Not> ++ <Not><Category>X-KDE-settings-webbrowsing</Category></Not> ++ <Not><Category>X-KDE-settings-peripherals</Category></Not> ++ <Not><Category>X-KDE-settings-hardware</Category></Not> ++ <Not><Category>X-KDE-settings-power</Category></Not> ++ <Not><Category>X-KDE-settings-security</Category></Not> ++ <Not><Category>X-KDE-settings-sound</Category></Not> ++ <Not><Category>X-KDE-settings-system</Category></Not> ++ <Not><Category>X-KDE-information</Category></Not> + <!-- Really Fedora ??? --> + <Not><Filename>gnome-eog.desktop</Filename></Not> + <Not><Filename>gnome-file-roller.desktop</Filename></Not> +-- +1.8.1.2 + diff --git a/gnome-base/gnome-menus/gnome-menus-3.10.1-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.10.1-r1.ebuild new file mode 100644 index 000000000000..57afc35dc8dc --- /dev/null +++ b/gnome-base/gnome-menus/gnome-menus-3.10.1-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="no" + +inherit eutils gnome2 + +DESCRIPTION="Library for the Desktop Menu fd.o specification" +HOMEPAGE="https://git.gnome.org/browse/gnome-menus" +SRC_URI="${SRC_URI} + https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.10.1-patches.tar.xz" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="3" +KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + +IUSE="debug +introspection test" + +COMMON_DEPEND=" + >=dev-libs/glib-2.29.15:2 + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) +" +# Older versions of slot 0 install the menu editor and the desktop directories + +RDEPEND="${COMMON_DEPEND} + !<gnome-base/gnome-menus-3.0.1-r1:0 +" +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig + test? ( dev-libs/gjs ) +" + +src_prepare() { + # Don't show KDE standalone settings desktop files in GNOME others menu + epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch" + + # Fixes for crashes and memory leaks from upstream git master + epatch ../"${PN}-3.10.1-patches"/*.patch + + gnome2_src_prepare +} + +src_configure() { + DOCS="AUTHORS ChangeLog HACKING NEWS README" + + # Do NOT compile with --disable-debug/--enable-debug=no + # It disables api usage checks + gnome2_src_configure \ + $(usex debug --enable-debug=yes --enable-debug=minimum) \ + $(use_enable introspection) \ + --disable-static +} diff --git a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild new file mode 100644 index 000000000000..675fccc08fec --- /dev/null +++ b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" + +inherit eutils gnome2 + +DESCRIPTION="Library for the Desktop Menu fd.o specification" +HOMEPAGE="https://git.gnome.org/browse/gnome-menus" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="3" +KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + +IUSE="+introspection test" + +COMMON_DEPEND=" + >=dev-libs/glib-2.29.15:2 + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) +" +# Older versions of slot 0 install the menu editor and the desktop directories +RDEPEND="${COMMON_DEPEND} + !<gnome-base/gnome-menus-3.0.1-r1:0 +" +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig + test? ( dev-libs/gjs ) +" + +src_prepare() { + # Don't show KDE standalone settings desktop files in GNOME others menu + epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch" + + # desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP + # (from 'master') + epatch "${FILESDIR}"/${P}-multiple-desktop{,2}.patch + + gnome2_src_prepare +} + +src_configure() { + DOCS="AUTHORS ChangeLog HACKING NEWS README" + + # 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-menus/gnome-menus-3.13.3.ebuild b/gnome-base/gnome-menus/gnome-menus-3.13.3.ebuild new file mode 100644 index 000000000000..21dd0cd86385 --- /dev/null +++ b/gnome-base/gnome-menus/gnome-menus-3.13.3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" + +inherit eutils gnome2 + +DESCRIPTION="Library for the Desktop Menu fd.o specification" +HOMEPAGE="https://git.gnome.org/browse/gnome-menus" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="3" +KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + +IUSE="+introspection test" + +COMMON_DEPEND=" + >=dev-libs/glib-2.29.15:2 + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) +" +# Older versions of slot 0 install the menu editor and the desktop directories +RDEPEND="${COMMON_DEPEND} + !<gnome-base/gnome-menus-3.0.1-r1:0 +" +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig + test? ( dev-libs/gjs ) +" + +src_prepare() { + # Don't show KDE standalone settings desktop files in GNOME others menu + epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch" + gnome2_src_prepare +} + +src_configure() { + DOCS="AUTHORS ChangeLog HACKING NEWS README" + + # 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-menus/metadata.xml b/gnome-base/gnome-menus/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/gnome-menus/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/gnome-mime-data/Manifest b/gnome-base/gnome-mime-data/Manifest new file mode 100644 index 000000000000..467c9bc9ac2d --- /dev/null +++ b/gnome-base/gnome-mime-data/Manifest @@ -0,0 +1,5 @@ +DIST gnome-mime-data-2.18.0.tar.bz2 607012 SHA256 37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7 SHA512 132996786254799341eeaa7894749cf4a95e391e31d985b1527b2f3dfeeeb01e7cc000753fc21d559db07fcc92018f4839f170eb149cb457fe06058ad3d986d5 WHIRLPOOL 3364d3fb129a617a4be27cf7816d2365f42d9ff681ce812b2fa0206c5c05c75991e8482657f6aa53c8d4cd4123afe0805291d00b4b1f27b125b73bff6e1ba19a +EBUILD gnome-mime-data-2.18.0.ebuild 619 SHA256 766cc983217cfea1602855d6f5a04a62a17ef0867cfd526538ad5b089aa430b2 SHA512 7c32b9a15d0fcf07c44e3465987cdbfc4c05c9479b30fb97b5033b839a2540913a9c590d86a4001690b17d055fdac7e0f87c258f49691875f04faabe5163da84 WHIRLPOOL 63f20fc1612fe4bbdc123fa8a691e2bc69e03fc98130a7a7f581b79ecf093cdc408f6ea873de51d634b9d1233dd862d832944f38de84c12a394b023573692dc9 +MISC ChangeLog 2634 SHA256 ae37ffc79e9e881c55a178bbe1aac3d8295780f537b649ff60a786f2b8c96a15 SHA512 0f84a30a6d9ae999377316a8efb0bd19daf06411c9f729686faffd2746be5b6eba8cbbb2e1ed3d45c458c9067f31334384955e6bfc55a698d1afffb29eed19b6 WHIRLPOOL 7b4befb21231b4b02415d8d0d2275765d97575957702598f073840d02779b4d5e574d6101004070fd2adeb60149ec7ba046e8bcd23870d60c2a690ca490f0195 +MISC ChangeLog-2015 9034 SHA256 45a15eacfada49b00facc0e630526b6542f43dcb9d151d66ca1b31bf9732c9d8 SHA512 3059ac005971f0220d8d5bf708bef64c69c870f0b8b67dad01b3ab2b775055569635c3a09ffd0ba2bb56c2967052b790a0d31a5e0ee741bd24e29e634176ccae WHIRLPOOL 1813151dd735c1502572873de676f99189f1c1cbd1e44f46841642eb9a8ed5bd6a2cc5276cabd265b905f157488080bfa790904c03a7ce9b42e567b5c072fe34 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild new file mode 100644 index 000000000000..e805a50562ac --- /dev/null +++ b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit gnome2 + +DESCRIPTION="MIME data for Gnome" +HOMEPAGE="https://www.gnome.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND="" +DEPEND=" + virtual/pkgconfig + >=dev-util/intltool-0.35 +" + +src_prepare() { + intltoolize --force || die "intltoolize failed" + gnome2_src_prepare +} diff --git a/gnome-base/gnome-mime-data/metadata.xml b/gnome-base/gnome-mime-data/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/gnome-mime-data/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest new file mode 100644 index 000000000000..642286c2c59b --- /dev/null +++ b/gnome-base/gnome-session/Manifest @@ -0,0 +1,15 @@ +AUX 10-user-dirs-update-gnome-r1 299 SHA256 4baf3771a18f87db323580d868f232bf33830f72dcc54b4b3aa3d9bc9cce05e5 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a WHIRLPOOL 0dca330c2bedd4cfb056d162550680f4fcf89b94598ace9e02d0289d9e6a4414aa184b2444ce768e8f757ee9ce492fa9288616c25ca8885dbe92dffec28fd9f6 +AUX 15-xdg-data-gnome-r1 262 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc WHIRLPOOL dbf53f428300ec213eb7397f88cdb54a7c4c4f6bf9d45a07e84894db83e95906cb45a217d437db1e875c000c77c5658b97b6f21050c8d89d20b0750a102aac2e +AUX 3.22.3-wayland-login-shell.patch 1253 SHA256 c45a23e9b1673e79df07f586f9f4e4a276f2b399b62c2610d38577f20dc95e46 SHA512 3abcdf697b3d1160b37031232e223759e24aff23b97dd1b8e4f1347071bf1575832ac00eae0414d2b9839636b85aaceb028bfbc2e488e38ff5fd17d3497a1b6e WHIRLPOOL 7edfbe43ed9499dc5da71509620ff6991f69f93dcb112d5002f4b760ea19b7f9ee7dc197fcf95b55fc013b599c2cecc615ed4dbe3f8cae416adedea4ea879764 +AUX 3.22.3-xorg-default-translations.patch 15908 SHA256 83362800086601b9f60024c1f455f0123f05475862de2ca7b88d5c76c75ae5d2 SHA512 e71b0dc296b4fd43b6bdc2251d8f1d9eb9d5f5e369100e66427254038de7e2e8e6cc8fed3173a618cf1a2677dc4346c1061a99926f3d8e2f40e2789d4f32f7a3 WHIRLPOOL 7b85589c2e4c6cd2e74bc5f3e75c8c6149b23c8ce29c4e0db1190c180be004ac7a52b8bd1af26f3d526eff7ba9e80eda1174ee5bde8f2344e3bb83395eaeddfd +AUX 3.22.3-xorg-default.patch 1929 SHA256 7142210207012fa8669a84fc78ab1b5a1db9f7e0d632291fd49b3118ef5f89bc SHA512 025ba94a21a3c42b816083e6d99c85ece695487af1153990c1fec63bbb215284efb95a2c8d505afe36b0e4575b0796ca57fe83ae715a8593c8db886b7eacfca1 WHIRLPOOL 864a8403069bf9c55c3d79fc780ad90cec4c4637ba8dc0b91b0680f011563e567b6287054b53fd9bb2b5f52c750c97f70dd70fe0a238963eb80fac34172586d4 +AUX 90-xcursor-theme-gnome 384 SHA256 e54babb8c0d0ad33eaa0f80985c802b0656fad9d1d60df2f1aa979f38356d8e0 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b WHIRLPOOL 68bc6c55d6a10cd14539eae6cc34f746c2bc485f96112317213f89c579a9ae7b259c0969155e2c8b30e88d62e19196bcdec559bb2cf3a3816034957c1fa5997e +AUX Gnome 2391 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3 SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 WHIRLPOOL 7c3d492309bd3916b24ab48e0fc31a7924ce1ce6661f27770e6b8cc3c902fd06c1f22f6950d46dcac97b8d82a9f95f0b5cc12235dd0e78bc34b4cb2a5f0a7da0 +AUX defaults.list-r3 18178 SHA256 85c225ec5fe9c4e0d337ce003441cc419f54259a46122128cfd958a7bfd2b45b SHA512 1c8cd1a07f0aaacaef2adf7d009a90996b177b348dd6780fc9692728424d8803e517ae4d357fa2324e447b8d082836b60565497b505d54e0559704757b6ecbf3 WHIRLPOOL f07aa9c1390a217b53a49038b0a631da347b5e937f8c7ea1c56d83af4a5c5e1b32d0cb30d75d881b2af0e8e5711bc7907f916976a3c816a5909f2087a8341b38 +DIST gnome-session-3.22.3.tar.xz 777420 SHA256 cc486fc84d892fa744a382b5ea8b9b40fc5045bc0d5feccfb02e80137eab77e5 SHA512 2350ddc485f9e47df9d9351e413b847336506a694e34daa672111784f64d6d24d3e5e6fc25ad03dd13b318b139809ba2312a542801993db586937650b1422ccd WHIRLPOOL 35e78d60b16ee9027d2c664f2a222a48083736e032e1be41fd015403fb8e9dcf4b2560299b1c9c9e81bde95cb9ed86da41ed0cc44a816f71e83a1a4e1a704fb9 +DIST gnome-session-3.24.1.tar.xz 780632 SHA256 3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee SHA512 507f9f1cddab37f1b66c72291e1885397f7e8b6bfb7c365f6f1ff827649a71380706fe0e3a8c6e74c3c159349a0eea0aabe3d5c7bbae5b29aeb2d49ae715affb WHIRLPOOL e82c8526c90e965c956b3153621722bfa5216a6f00bbeec7fccb2479bfed33f6b1e9e0f1748d293762bda86d87155e35ebfcb0f45b5ede5174decf00fe8d85ee +EBUILD gnome-session-3.22.3.ebuild 4440 SHA256 deb86f0e04c21aedea971e97293d45af22a7ea43f174aea788157ff832aa9114 SHA512 cd0afcddfce169e155010f7354feb91d4538fd8b38b22be46a23a81a92a6aa3d98729347e753313580afe28c5503449702921729878d5595bb9bb27d58d8b000 WHIRLPOOL 24bdaf532ab16617728211f5f74ed530ea98886114aee75f73e2b3540fbb97ab26a1946debbea37c93b87d170e3da5f1e3ae942d2f720f2c2d45dbc30ef1a7d8 +EBUILD gnome-session-3.24.1.ebuild 3555 SHA256 762d78adb1fbffaeb382e7cace9dec46de0199212b3f7b98bbe7cd31e86ff433 SHA512 aac4a9df9ad8d5237015c2c86246fa8453679586becf5da829e9572e0f21f6e83e90029b0bff72c5e9965f4a2af11128aa50c046f9b9e15c91c76be87b33b6ab WHIRLPOOL ce0b7539c86599f6875b0433de117911a12cd5c4acb32fd509f5dbfc909916573e24c0d24208efe062b3b8110198273190b45367faece2c228bbb35d7277c25c +MISC ChangeLog 5985 SHA256 adb5a74fc9fbf91bd56111b79bfaf581b76689128bf7cfe6983d1b7fee65a8f1 SHA512 e71f599b28e6cd96ca2666c3bfb1ae1b716fe18e59c8362f075513e78553dd15032caf1616699401c123102a09974bf24cb3736735b635f2602114dfde6e145a WHIRLPOOL 644388f0cdfa90e2edc4bbe736d84f5b2ad5e990479593ecf28e6c8a865f059508e8a2eb4596f32cf62e8e3c00f03651c2be9fcd62c224fd4c6b74b324a76041 +MISC ChangeLog-2015 54021 SHA256 599c9482627fb5bf448d2085cf5088e419c1dc4c999056b1c8b6155369e848d7 SHA512 d40b1e9c97426c4c4eaf88fa93da8ecec8da5a8a895933d94cf8cc1a815f70c5acef1ab130e3129a24b3c3866e0fd67ef0591c6b634c19303cc033aecaa27d16 WHIRLPOOL 78963eeb87ae58b21a2faf53478197a9959abf60de7993021f54e22ab1e01cbda12be55d5ceb6b706acbfbfe429df4eea72166a097a8d3cfc131171c0b74f218 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 new file mode 100644 index 000000000000..61fd08c51141 --- /dev/null +++ b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 @@ -0,0 +1,10 @@ +#!/bin/sh + +# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc. +# That file is read by glib to get XDG_PICTURES_DIR, etc + +if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then + if type xdg-user-dirs-update &>/dev/null; then + xdg-user-dirs-update + fi +fi diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 new file mode 100644 index 000000000000..5eaa6985d9dc --- /dev/null +++ b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then + if [ -z "$XDG_DATA_DIRS" ]; then + export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ + else + export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS" + fi +fi diff --git a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch new file mode 100644 index 000000000000..f82825f4822e --- /dev/null +++ b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch @@ -0,0 +1,43 @@ +From 97229b322d30cf531e7b7cc7757f83ed80e831bc Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Thu, 5 Jan 2017 10:02:58 -0500 +Subject: [PATCH 1/3] gnome-session: make sure wayland sessions get a login + shell + +Users expect their shell profiles to get sourced at startup, which +doesn't happen with wayland sessions. + +This commit brings back that feature, by making the gnome-session +wrapper script run a login shell. + +https://bugzilla.gnome.org/show_bug.cgi?id=736660 +--- + gnome-session/gnome-session.in | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in +index 530299d..04ea741 100644 +--- a/gnome-session/gnome-session.in ++++ b/gnome-session/gnome-session.in +@@ -1,5 +1,18 @@ + #!/bin/sh + ++if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && ++ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && ++ [ -n "$SHELL" ] && ++ grep -q "$SHELL" /etc/shells && ++ ! (echo "$SHELL" | grep -q "false") && ++ ! (echo "$SHELL" | grep -q "nologin"); then ++ if [ "$1" != '-l' ]; then ++ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" ++ else ++ shift ++ fi ++fi ++ + SETTING=$(gsettings get org.gnome.system.locale region) + REGION=${SETTING#\'} + REGION=${REGION%\'} +-- +2.10.1 + diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch new file mode 100644 index 000000000000..8c259de9d157 --- /dev/null +++ b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch @@ -0,0 +1,619 @@ +From abc07aa67043d0013dfcf812101208296bbfa4ac Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Sat, 18 Mar 2017 11:42:40 +0200 +Subject: [PATCH 3/3] po: Forward port "GNOME on Wayland" translations + +--- + po/POTFILES.in | 2 +- + po/bg.po | 4 ++++ + po/cs.po | 4 ++++ + po/da.po | 4 ++++ + po/de.po | 4 ++++ + po/el.po | 4 ++++ + po/es.po | 4 ++++ + po/eu.po | 4 ++++ + po/fa.po | 4 ++++ + po/fi.po | 4 ++++ + po/fr.po | 4 ++++ + po/fur.po | 4 ++++ + po/gd.po | 4 ++++ + po/gl.po | 4 ++++ + po/gu.po | 4 ++++ + po/he.po | 4 ++++ + po/hr.po | 4 ++++ + po/hu.po | 4 ++++ + po/id.po | 4 ++++ + po/is.po | 4 ++++ + po/it.po | 4 ++++ + po/kk.po | 4 ++++ + po/ko.po | 4 ++++ + po/lt.po | 4 ++++ + po/lv.po | 4 ++++ + po/nb.po | 4 ++++ + po/pl.po | 4 ++++ + po/pt.po | 4 ++++ + po/pt_BR.po | 4 ++++ + po/ru.po | 4 ++++ + po/sk.po | 4 ++++ + po/sr.po | 4 ++++ + po/sr@latin.po | 4 ++++ + po/sv.po | 4 ++++ + po/tr.po | 4 ++++ + po/uk.po | 4 ++++ + po/vi.po | 4 ++++ + po/zh_CN.po | 4 ++++ + 38 files changed, 149 insertions(+), 1 deletion(-) + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index cc1170a..0feb5cf 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -2,9 +2,9 @@ + # Please keep this file sorted alphabetically. + data/gnome-custom-session.desktop.in + data/gnome.desktop.in +-data/gnome-xorg.desktop.in + data/gnome-dummy.session.desktop.in.in + data/gnome.session.desktop.in.in ++data/gnome-wayland.desktop.in + [type: gettext/glade]data/session-selector.ui + gnome-session/gsm-fail-whale-dialog.c + gnome-session/gsm-manager.c +diff --git a/po/bg.po b/po/bg.po +index 7d243fc..7bb73b6 100644 +--- a/po/bg.po ++++ b/po/bg.po +@@ -50,6 +50,10 @@ msgstr "GNOME с Xorg" + msgid "GNOME dummy" + msgstr "GNOME — фиктивна" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME с Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Друга сесия" +diff --git a/po/cs.po b/po/cs.po +index a9acc59..4efd144 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -54,6 +54,10 @@ msgstr "GNOME na Xorg" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME na Waylandu" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Vlastní sezení" +diff --git a/po/da.po b/po/da.po +index de709ac..62a49c3 100644 +--- a/po/da.po ++++ b/po/da.po +@@ -65,6 +65,10 @@ msgstr "GNOME på Xorg" + msgid "GNOME dummy" + msgstr "GNOME-attrap" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME på Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Tilpasset session" +diff --git a/po/de.po b/po/de.po +index 051c9ee..a283114 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -61,6 +61,10 @@ msgstr "GNOME unter Xorg" + msgid "GNOME dummy" + msgstr "GNOME Platzhalter" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME unter Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Benutzerdefinierte Sitzung" +diff --git a/po/el.po b/po/el.po +index 99f92ba..9f1d419 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -72,6 +72,10 @@ msgstr "GNOME σε Xorg" + msgid "GNOME dummy" + msgstr "Εικονικό GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME σε Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Προσαρμοσμένη συνεδρία" +diff --git a/po/es.po b/po/es.po +index 79e3a6d..a9b73b2 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -56,6 +56,10 @@ msgstr "GNOME en Xorg" + msgid "GNOME dummy" + msgstr "GNOME «dummy»" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME en Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sesión personalizada" +diff --git a/po/eu.po b/po/eu.po +index da3969d..6b57df1 100644 +--- a/po/eu.po ++++ b/po/eu.po +@@ -48,6 +48,10 @@ msgstr "GNOME Xorg gainean" + msgid "GNOME dummy" + msgstr "Probako GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME Wayland gainean" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Saio pertsonalizatua" +diff --git a/po/fa.po b/po/fa.po +index 1737204..8b1b6e5 100644 +--- a/po/fa.po ++++ b/po/fa.po +@@ -50,6 +50,10 @@ msgstr "گنوم بر روی Xorg" + msgid "GNOME dummy" + msgstr "گنوم ساختگی" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "گنوم بر روی Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "نشست سفارشی" +diff --git a/po/fi.po b/po/fi.po +index a3cd0ca..8b5025c 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -51,6 +51,10 @@ msgstr "Gnome Xorgia käyttäen" + msgid "GNOME dummy" + msgstr "Gnome-malli-istunto (dummy)" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Gnome Waylandia käyttäen" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Omavalintainen istunto" +diff --git a/po/fr.po b/po/fr.po +index e209804..5fe647a 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -54,6 +54,10 @@ msgstr "GNOME sur Xorg" + msgid "GNOME dummy" + msgstr "GNOME factice" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME sur Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Session personnalisée" +diff --git a/po/fur.po b/po/fur.po +index 8245a6f..1dc5f85 100644 +--- a/po/fur.po ++++ b/po/fur.po +@@ -42,6 +42,10 @@ msgstr "GNOME su Xorg" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME su Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Session personalizade" +diff --git a/po/gd.po b/po/gd.po +index beb1618..ebb67bc 100644 +--- a/po/gd.po ++++ b/po/gd.po +@@ -48,6 +48,10 @@ msgstr "GNOME air Xorg" + msgid "GNOME dummy" + msgstr "Caochag GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME air Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Seisean gnàthaichte" +diff --git a/po/gl.po b/po/gl.po +index 02b9879..2d9c944 100644 +--- a/po/gl.po ++++ b/po/gl.po +@@ -51,6 +51,10 @@ msgstr "GNOME en Xorg" + msgid "GNOME dummy" + msgstr "GNOME de proba" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME en Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sesión personalizada" +diff --git a/po/gu.po b/po/gu.po +index c83ed6b..fa92f6a 100644 +--- a/po/gu.po ++++ b/po/gu.po +@@ -44,6 +44,10 @@ msgstr "Xorg પર GNOME" + msgid "GNOME dummy" + msgstr "GNOME ડમી" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Wayland પર GNOME" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "વૈવિધ્ય સત્ર" +diff --git a/po/he.po b/po/he.po +index 22045b6..c197658 100644 +--- a/po/he.po ++++ b/po/he.po +@@ -45,6 +45,10 @@ msgstr "GNOME על גבי Xorg" + msgid "GNOME dummy" + msgstr "מדומה של GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME על גבי Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "הפעלה מותאמת אישית" +diff --git a/po/hr.po b/po/hr.po +index db64d1a..46ba1af 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -41,6 +41,10 @@ msgstr "GNOME na Xorgu" + msgid "GNOME dummy" + msgstr "GNOME lažno" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME na Waylandu" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Prilagođena sesija" +diff --git a/po/hu.po b/po/hu.po +index 403b0a1..f207056 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -49,6 +49,10 @@ msgstr "GNOME Xorgon" + msgid "GNOME dummy" + msgstr "GNOME példa" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME Wayland-en" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Egyéni környezet" +diff --git a/po/id.po b/po/id.po +index 04848d8..3519b35 100644 +--- a/po/id.po ++++ b/po/id.po +@@ -46,6 +46,10 @@ msgstr "GNOME pada Xorg" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME pada Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sesi Gubahan" +diff --git a/po/is.po b/po/is.po +index 5cfbfa2..a95c1e7 100644 +--- a/po/is.po ++++ b/po/is.po +@@ -44,6 +44,10 @@ msgstr "GNOME á Xorg" + msgid "GNOME dummy" + msgstr "GNOME sýnishorn" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME á Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sérsniðin seta" +diff --git a/po/it.po b/po/it.po +index 3a95eff..6119ff2 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -46,6 +46,10 @@ msgstr "GNOME su Xorg" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME su Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sessione personalizzata" +diff --git a/po/kk.po b/po/kk.po +index 7168f0d..8fede72 100644 +--- a/po/kk.po ++++ b/po/kk.po +@@ -43,6 +43,10 @@ msgstr "Xorg негізіндегі GNOME" + msgid "GNOME dummy" + msgstr "GNOME жалған сессиясы" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Wayland негізіндегі GNOME" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Таңдауыңызша сесия" +diff --git a/po/ko.po b/po/ko.po +index 8c90323..359a65d 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -49,6 +49,10 @@ msgstr "그놈 (Xorg)" + msgid "GNOME dummy" + msgstr "그놈 더미" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "그놈, 웨일랜드" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "사용자 지정 세션" +diff --git a/po/lt.po b/po/lt.po +index 9a4bfb9..221c293 100644 +--- a/po/lt.po ++++ b/po/lt.po +@@ -49,6 +49,10 @@ msgstr "GNOME Xorg aplinkoje" + msgid "GNOME dummy" + msgstr "GNOME netikra" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME Wayland aplinkoje" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Pasirinktinis seansas" +diff --git a/po/lv.po b/po/lv.po +index 14e4180..688efe2 100644 +--- a/po/lv.po ++++ b/po/lv.po +@@ -52,6 +52,10 @@ msgstr "GNOME ar Xorg" + msgid "GNOME dummy" + msgstr "GNOME makets" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME ar Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Pielāgota sesija" +diff --git a/po/nb.po b/po/nb.po +index afad648..471fb14 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -41,6 +41,10 @@ msgstr "GNOME på Xorg" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME på Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Egendefinert økt" +diff --git a/po/pl.po b/po/pl.po +index 92b0cfe..1b92056 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -48,6 +48,10 @@ msgstr "GNOME (Xorg)" + msgid "GNOME dummy" + msgstr "Pusta sesja GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME (Wayland)" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Niestandardowa sesja" +diff --git a/po/pt.po b/po/pt.po +index fc4bb99..573908d 100644 +--- a/po/pt.po ++++ b/po/pt.po +@@ -50,6 +50,10 @@ msgstr "GNOME em Xorg" + msgid "GNOME dummy" + msgstr "GNOME de teste" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME no Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sessão personalizada" +diff --git a/po/pt_BR.po b/po/pt_BR.po +index 6a2a88a..7d6a66a 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -59,6 +59,10 @@ msgstr "GNOME sobre Xorg" + msgid "GNOME dummy" + msgstr "GNOME experimental" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME sobre Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sessão personalizada" +diff --git a/po/ru.po b/po/ru.po +index 4378126..52eda37 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -52,6 +52,10 @@ msgstr "GNOME на Xorg" + msgid "GNOME dummy" + msgstr "Фиктивный сеанс GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME на Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Другой сеанс" +diff --git a/po/sk.po b/po/sk.po +index 0f75b10..49fbf5d 100644 +--- a/po/sk.po ++++ b/po/sk.po +@@ -53,6 +53,10 @@ msgstr "GNOME cez Xorg" + msgid "GNOME dummy" + msgstr "Fingované GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME cez Wayland" ++ + # GtkWindow title + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" +diff --git a/po/sr.po b/po/sr.po +index 7ec002a..2a71f45 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -48,6 +48,10 @@ msgstr "Гном на Икс серверу" + msgid "GNOME dummy" + msgstr "Гномов лажњак" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Гном на Вејланду" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Прилагођена сесија" +diff --git a/po/sr@latin.po b/po/sr@latin.po +index 677444e..b148d70 100644 +--- a/po/sr@latin.po ++++ b/po/sr@latin.po +@@ -48,6 +48,10 @@ msgstr "Gnom na Iks serveru" + msgid "GNOME dummy" + msgstr "Gnomov lažnjak" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Gnom na Vejlandu" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Prilagođena sesija" +diff --git a/po/sv.po b/po/sv.po +index 2894eec..3072075 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -50,6 +50,10 @@ msgstr "GNOME med Xorg" + msgid "GNOME dummy" + msgstr "GNOME-attrapp" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME med Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Anpassad session" +diff --git a/po/tr.po b/po/tr.po +index 3ede169..87bba43 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -54,6 +54,10 @@ msgstr "Xorg üzerinde GNOME" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Wayland üzerinde GNOME" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Özel Oturum" +diff --git a/po/uk.po b/po/uk.po +index de980dc..c98fd8d 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -46,6 +46,10 @@ msgstr "GNOME через Xorg" + msgid "GNOME dummy" + msgstr "Несправжній GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME через Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Власний сеанс" +diff --git a/po/vi.po b/po/vi.po +index 1cdee0a..cf249e3 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -46,6 +46,10 @@ msgstr "GNOME trên Xorg" + msgid "GNOME dummy" + msgstr "Giả lập GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME trên Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Phiên làm việc tự chọn" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 6f07716..8d36444 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -55,6 +55,10 @@ msgstr "运行于 Xorg 的 GNOME" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "基于 Wayland 的 GNOME" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "自定义会话" +-- +2.10.1 + diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default.patch new file mode 100644 index 000000000000..02eea39715cc --- /dev/null +++ b/gnome-base/gnome-session/files/3.22.3-xorg-default.patch @@ -0,0 +1,58 @@ +From a709a07bff91a7b2dd4e4a412090850a73937999 Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Mon, 7 Mar 2016 13:36:32 -0500 +Subject: [PATCH 2/3] data: switch back to Xorg by default + +Consensus seems to be that switching to wayland for user sessions +by default is a bit premature. + +This commit moves it back to Xorg by default. + +We'll save wayland by default for 3.22 + +https://bugzilla.gnome.org/show_bug.cgi?id=763266 +--- + data/Makefile.am | 4 ++-- + data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + rename data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} (85%) + +diff --git a/data/Makefile.am b/data/Makefile.am +index ae08730..d0a7310 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -9,7 +9,7 @@ hwcompatdir = $(pkgdatadir) + hwcompat_DATA = hardware-compatibility + + xsessiondir = $(datadir)/xsessions +-xsession_in_files = gnome.desktop.in gnome-xorg.desktop.in ++xsession_in_files = gnome.desktop.in + + if BUILD_SESSION_SELECTOR + xsession_in_files += gnome-custom-session.desktop.in +@@ -18,7 +18,7 @@ endif + xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) + + wayland_sessiondir = $(datadir)/wayland-sessions +-wayland_session_in_files = gnome.desktop.in ++wayland_session_in_files = gnome-wayland.desktop.in + wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop) + + sessiondir = $(datadir)/gnome-session/sessions +diff --git a/data/gnome-xorg.desktop.in b/data/gnome-wayland.desktop.in +similarity index 85% +rename from data/gnome-xorg.desktop.in +rename to data/gnome-wayland.desktop.in +index d00b3dc..852be87 100644 +--- a/data/gnome-xorg.desktop.in ++++ b/data/gnome-wayland.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] +-_Name=GNOME on Xorg ++_Name=GNOME on Wayland + _Comment=This session logs you into GNOME + Exec=gnome-session + TryExec=gnome-session +-- +2.10.1 + diff --git a/gnome-base/gnome-session/files/90-xcursor-theme-gnome b/gnome-base/gnome-session/files/90-xcursor-theme-gnome new file mode 100644 index 000000000000..13bc453c7854 --- /dev/null +++ b/gnome-base/gnome-session/files/90-xcursor-theme-gnome @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then + XCURSOR_THEME=`dconf read /org/gnome/desktop/interface/cursor-theme` 2> /dev/null + if [ x"$XCURSOR_THEME" = "x" ]; then + export XCURSOR_THEME="Adwaita" + else + # 'dconf read' wraps string output in single quotes + eval export "XCURSOR_THEME=$XCURSOR_THEME" + fi +fi diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome new file mode 100644 index 000000000000..55d39b633257 --- /dev/null +++ b/gnome-base/gnome-session/files/Gnome @@ -0,0 +1,109 @@ +#!/bin/sh +# +# This file has bitrotted badly. Someone needs to clean this up. +# + +if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then + export XDG_MENU_PREFIX=gnome- +fi + +for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done +# +# Distributors: +# You should modify the paths here to fit your distro +# If you need to do so, send me (jirka@5z.com) a patch +# and I'll try to make the script detect the distro stuff +# + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +userxkbmap=$HOME/.Xkbmap + +sysresources=/etc/X11/Xresources +sysmodmap=/etc/X11/Xmodmap +sysxkbmap=/etc/X11/Xkbmap + +rh6sysresources=/etc/X11/xinit/Xresources +rh6sysmodmap=/etc/X11/xinit/Xmodmap + +if [ -x "$HOME/.gnomerc" ]; then + command="$HOME/.gnomerc" +elif [ -x /etc/X11/gdm/gnomerc ]; then + command="/etc/X11/gdm/gnomerc" +else + # as fallback in case the config is screwed + command=`which gnome-session` +fi + +# merge in defaults +if [ -f "$rh6sysresources" ]; then + xrdb -merge "$rh6sysresources" +fi + +if [ -f "$sysresources" ]; then + xrdb -merge "$sysresources" +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +# merge in keymaps +if [ -f "$sysxkbmap" ]; then + setxkbmap `cat "$sysxkbmap"` + XKB_IN_USE=yes +fi + +if [ -f "$userxkbmap" ]; then + setxkbmap `cat "$userxkbmap"` + XKB_IN_USE=yes +fi + +# +# Eeek, this seems like too much magic here +# +if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then + if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then + xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` + if [ -n "$xkbsymbols" ]; then + setxkbmap -symbols "$xkbsymbols" + XKB_IN_USE=yes + fi + fi +fi + +# xkb and xmodmap don't play nice together +if [ -z "$XKB_IN_USE" ]; then + if [ -f "$rh6sysmodmap" ]; then + xmodmap "$rh6sysmodmap" + fi + + if [ -f "$sysmodmap" ]; then + xmodmap "$sysmodmap" + fi + + if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" + fi +fi + +unset XKB_IN_USE + +# run all system xinitrc shell scripts. +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for i in /etc/X11/xinit/xinitrc.d/* ; do + if [ -x "$i" ]; then + . "$i" + fi + done +fi + +exec $command diff --git a/gnome-base/gnome-session/files/defaults.list-r3 b/gnome-base/gnome-session/files/defaults.list-r3 new file mode 100644 index 000000000000..5dfa6be6af16 --- /dev/null +++ b/gnome-base/gnome-session/files/defaults.list-r3 @@ -0,0 +1,335 @@ +[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-org.gnome.Nautilus.desktop; +x-content/blank-dvd=brasero-org.gnome.Nautilus.desktop; +x-content/blank-cd=brasero-org.gnome.Nautilus.desktop; +x-content/blank-hddvd=brasero-org.gnome.Nautilus.desktop; +application/x-dia-diagram=dia.desktop; +image/bmp=eog.desktop; +image/gif=eog.desktop; +image/jpeg=eog.desktop; +image/jpg=eog.desktop; +image/pjpeg=eog.desktop; +image/png=eog.desktop; +image/svg+xml=eog.desktop; +image/svg+xml-compressed=eog.desktop; +image/x-bmp=eog.desktop; +image/x-gray=eog.desktop; +image/x-icb=eog.desktop; +image/x-ico=eog.desktop; +image/x-pcx=eog.desktop; +image/x-png=eog.desktop; +image/x-portable-anymap=eog.desktop; +image/x-portable-bitmap=eog.desktop; +image/x-portable-graymap=eog.desktop; +image/x-portable-pixmap=eog.desktop; +image/x-xbitmap=eog.desktop; +image/x-xpixmap=eog.desktop; +image/vnd.wap.wbmp=eog.desktop; +image/g3fax=gimp.desktop; +image/x-compressed-xcf=gimp.desktop; +image/x-fits=gimp.desktop; +image/x-icon=gimp.desktop; +image/x-psd=gimp.desktop; +image/x-sgi=gimp.desktop; +image/x-sun-raster=gimp.desktop; +image/x-tga=gimp.desktop; +image/x-xcf=gimp.desktop; +image/x-xwindowdump=gimp.desktop; +application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop; +text/html=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop; +application/pdf=evince.desktop; +application/x-bzpdf=evince.desktop; +application/x-gzpdf=evince.desktop; +application/postscript=evince.desktop; +application/x-bzpostscript=evince.desktop; +application/x-gzpostscript=evince.desktop; +image/x-eps=evince.desktop; +image/x-bzeps=evince.desktop; +image/x-gzeps=evince.desktop; +application/x-dvi=evince.desktop; +application/x-bzdvi=evince.desktop; +application/x-gzdvi=evince.desktop; +image/vnd.djvu=evince.desktop; +image/tiff=evince.desktop; +application/x-cbr=evince.desktop; +application/x-cbz=evince.desktop; +application/x-cb7=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-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=gedit.destkop +text/x-php=gedit.destkop +text/x-python=gedit.destkop +text/x-sql=org.gnome.gedit.desktop; +text/xml=org.gnome.gedit.desktop; +application/javascript=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=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop; +x-directory/normal=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop; +inode/directory=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop; +application/x-gnome-saved-search=nautilus-folder-handler.desktop;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=sound-juicer.desktop; +application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop; +application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.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;epiphany.desktop; +x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop; +x-scheme-handler/mailto=evolution.desktop; diff --git a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild new file mode 100644 index 000000000000..4e89bd630b17 --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" +inherit gnome2 + +DESCRIPTION="Gnome session manager" +HOMEPAGE="https://git.gnome.org/browse/gnome-session" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="doc elibc_FreeBSD ipv6 systemd" + +# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and +# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* +# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). +# gdk-pixbuf used in the inhibit dialog +COMMON_DEPEND=" + >=dev-libs/glib-2.46.0:2[dbus] + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.18.0:3 + >=dev-libs/json-glib-0.10 + >=gnome-base/gnome-desktop-3.18:3= + elibc_FreeBSD? ( dev-libs/libexecinfo ) + + media-libs/mesa[egl,gles2] + + media-libs/libepoxy + x11-libs/libSM + x11-libs/libICE + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXext + x11-libs/libXrender + x11-libs/libXtst + x11-misc/xdg-user-dirs + x11-misc/xdg-user-dirs-gtk + x11-apps/xdpyinfo + + systemd? ( >=sys-apps/systemd-183:0= ) +" +# Pure-runtime deps from the session files should *NOT* be added here +# Otherwise, things like gdm pull in gnome-shell +# gnome-themes-standard is needed for the failwhale dialog themeing +# sys-apps/dbus[X] is needed for session management +RDEPEND="${COMMON_DEPEND} + gnome-base/gnome-settings-daemon + >=gnome-base/gsettings-desktop-schemas-0.1.7 + x11-themes/adwaita-icon-theme + sys-apps/dbus[X] + !systemd? ( + sys-auth/consolekit + >=dev-libs/dbus-glib-0.76 + ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + >=dev-util/intltool-0.40.6 + >=sys-devel/gettext-0.10.40 + virtual/pkgconfig + !<gnome-base/gdm-2.20.4 + doc? ( + app-text/xmlto + dev-libs/libxslt ) + gnome-base/gnome-common +" +# gnome-common needed for eautoreconf +# gnome-base/gdm does not provide gnome.desktop anymore + +PATCHES=( + # Make gnome wayland session launch inside a login shell for /etc/env.d and other stuff to work, bug 604110 + "${FILESDIR}/${PV}-wayland-login-shell.patch" + # Restore Xorg as the default GNOME session instead of Wayland for the 3.22 release, bug 611146 + "${FILESDIR}/${PV}-xorg-default.patch" # remove ewarn about this below when removing for 3.24 + "${FILESDIR}/${PV}-xorg-default-translations.patch" +) + +src_configure() { + # 1. Avoid automagic on old upower releases + # 2. xsltproc is always checked due to man configure + # switch, even if USE=-doc + # 3. Disable old gconf support as other distributions did long time + # ago + gnome2_src_configure \ + --disable-deprecation-flags \ + --disable-gconf \ + --enable-session-selector \ + $(use_enable doc docbook-docs) \ + $(use_enable ipv6) \ + $(use_enable systemd) \ + $(use_enable !systemd consolekit) \ + UPOWER_CFLAGS="" \ + UPOWER_LIBS="" + # gnome-session-selector pre-generated man page is missing + #$(usex !doc XSLTPROC=$(type -P true)) +} + +src_install() { + gnome2_src_install + + dodir /etc/X11/Sessions + exeinto /etc/X11/Sessions + doexe "${FILESDIR}/Gnome" + + insinto /usr/share/applications + newins "${FILESDIR}/defaults.list-r3" 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() { + gnome2_pkg_postinst + + ewarn "The Gentoo GNOME team has decided to retain Xorg session default instead of" + ewarn "Wayland for GNOME 3.22 stable version, even if USE=wayland is set on applicable" + ewarn "packages. You can still choose the 'GNOME on Wayland' session explicitly, if" + ewarn "desired. GNOME 3.24 will default to Wayland again as upstream GNOME does, if" + ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will be a choice." + + 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 +} diff --git a/gnome-base/gnome-session/gnome-session-3.24.1.ebuild b/gnome-base/gnome-session/gnome-session-3.24.1.ebuild new file mode 100644 index 000000000000..9eaa8c16f0e8 --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-3.24.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Gnome session manager" +HOMEPAGE="https://git.gnome.org/browse/gnome-session" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="doc elibc_FreeBSD ipv6 systemd" + +# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and +# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* +# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). +# gdk-pixbuf used in the inhibit dialog +COMMON_DEPEND=" + >=dev-libs/glib-2.46.0:2[dbus] + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.18.0:3 + >=dev-libs/json-glib-0.10 + >=gnome-base/gnome-desktop-3.18:3= + elibc_FreeBSD? ( dev-libs/libexecinfo ) + + media-libs/mesa[egl,gles2] + + media-libs/libepoxy + x11-libs/libSM + x11-libs/libICE + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXext + x11-libs/libXrender + x11-libs/libXtst + x11-misc/xdg-user-dirs + x11-misc/xdg-user-dirs-gtk + x11-apps/xdpyinfo + + systemd? ( >=sys-apps/systemd-183:0= ) +" +# Pure-runtime deps from the session files should *NOT* be added here +# Otherwise, things like gdm pull in gnome-shell +# gnome-themes-standard is needed for the failwhale dialog themeing +# sys-apps/dbus[X] is needed for session management +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-settings-daemon-3.23.2 + >=gnome-base/gsettings-desktop-schemas-0.1.7 + x11-themes/adwaita-icon-theme + sys-apps/dbus[X] + !systemd? ( + sys-auth/consolekit + >=dev-libs/dbus-glib-0.76 + ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + >=dev-util/intltool-0.40.6 + >=sys-devel/gettext-0.10.40 + virtual/pkgconfig + !<gnome-base/gdm-2.20.4 + doc? ( + app-text/xmlto + dev-libs/libxslt ) +" +# gnome-common needed for eautoreconf +# gnome-base/gdm does not provide gnome.desktop anymore + +src_configure() { + # 1. Avoid automagic on old upower releases + # 2. xsltproc is always checked due to man configure + # switch, even if USE=-doc + # 3. Disable old gconf support as other distributions did long time + # ago + gnome2_src_configure \ + --disable-deprecation-flags \ + --disable-gconf \ + --enable-session-selector \ + $(use_enable doc docbook-docs) \ + $(use_enable ipv6) \ + $(use_enable systemd) \ + $(use_enable !systemd consolekit) \ + UPOWER_CFLAGS="" \ + UPOWER_LIBS="" + # gnome-session-selector pre-generated man page is missing + #$(usex !doc XSLTPROC=$(type -P true)) +} + +src_install() { + gnome2_src_install + + dodir /etc/X11/Sessions + exeinto /etc/X11/Sessions + doexe "${FILESDIR}/Gnome" + + insinto /usr/share/applications + newins "${FILESDIR}/defaults.list-r3" 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() { + gnome2_pkg_postinst + + 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 +} diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/gnome-session/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest new file mode 100644 index 000000000000..9a6145d2639a --- /dev/null +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -0,0 +1,15 @@ +AUX 3.22.2-udevrulesdir-configure.patch 1858 SHA256 782b0514b340f8784718a7faa8e0101439df78e450a1538be0a06740930bb85b SHA512 f2435821bedcf8858c7017053ce0a55591d75da741ee00a1ba54ce70ab6839fe34183425d07a0ebf6ceb18051bdc4d21dd3027b893acfb8eecf05d02d826a020 WHIRLPOOL a38928768044da08bc8afda966d588b5a1edb69bc512ef17f88e86424411bcd04afc4600a65f9017c3facdb924d0b853223d89ad2bc7e1b9be51c62ab6492c4d +AUX 3.24.2-optional.patch 4458 SHA256 f25b04306b261df7b3dad8017762bbf7bf37592f9b16dcb9c872ddcc74d54a8e SHA512 f413f6697dc939fd9c28bd0297cdd04b7642c8cd8c078ecc7b99447d2fe3685e1247f96a318077becbc55db67adf594aef238b11167b19c84412c8e619884eae WHIRLPOOL 47723e658526bda65f5ad07035a094fec71d145186e519b6ed45522566a7fdcb03dcb87564f2f9360fcbfc491598d8af385b6dcce0be48f1a8bbbaa9b1be0410 +AUX 3.24.2-reduce-memory-usage.patch 6121 SHA256 134ad864967d235285ffabfcec8be3da6682b2f8c41865d768c8db39fd9edcf9 SHA512 c6b172e171461d79f2dfc37b26a0f17a44b2bba0ce6392053129a9137b76c35956d9ab88e22e111d2613c0ff6ee2affc87756c8e0c4fd28d928d948feebd2a41 WHIRLPOOL 80bfb12f43c5d0fb3afe24546fe4d4145e0b016aa722f4f97fdd3d3e16b84b9bebe52a1af102abed29fe83e0acd47bbf210ad0926873617a1b1c9776261c7428 +AUX 3.24.2-remove-unneeded-gtk-init.patch 2101 SHA256 d35369d941630890c646a551d9909a492587825797e0a8412f9ade64562ba4b3 SHA512 6da74748bbee31bb2b98ba090927c0e787552cabe2ef028781f3e12ccf9b444bf41480f561a307cc71777efaca23ce2f65e2ebb559a33b6a0d9a4270e9da5016 WHIRLPOOL 6f8fed9f64f2892063f314062c0c4fcecb767dfaf9c951ecb06c3bb8c50dc2bfc82d8ffaeb5a3556777e86ac53f072dec1a5ecbad53f3a59501366bfdaee39df +AUX 3.24.2-udevrulesdir-configure.patch 1918 SHA256 8806dc4eaad81fb9484bac819d41aeb8ad5cad6bd9d97ee17feda601c28a8c34 SHA512 4d30c85add1c667a4c2fd712c7bf208f358a9313baf29172407eab4236817c86b30d8fca0141541abf8ff0ccd09f51065ceee12a2dbb39827d4facac255c8564 WHIRLPOOL bca5dd46e2a77126814c568f21276c84322ca85d8aa10130c99800dca7dd8f3e5f689b7875834140ea0ac5d2a62639f7a7badab915d7b02ddad5c28d5010868e +AUX 3.24.3-fix-wayland-build.patch 1836 SHA256 4e7466dbcc105931fb9f080f25a5bcb32b1791c4da72ecd1045d7199512e63e6 SHA512 edf8bcea8fa705cc0a212c1523ebc948751aba61fd2060245439fbf9825b2416bb79c35b1873b49deddb77eff21ee41644e2c6bf311f88607343227ca3526193 WHIRLPOOL f5c97c66ee4f44b2f111e15c041dbc429a609e993f0c2507f21538ce74221e0b1cbfb7f0a499a510eab2e6141862178327e47ea8b13164d02a3055c186879d5a +AUX 3.24.3-optional.patch 5311 SHA256 1f8c2f03bc9818ae34f0069595954ddf7bf4ac69b1e67ecc8d08e6f31ace1661 SHA512 a466e658f5c02070620aaf6b96f1c2516664d20092ba555f5fa3cd01e5738e79ba4418062380923401c9e8b7b52478b3468335100757babe4326102d55eb4717 WHIRLPOOL 67ee624a8e9426bf0564a459b328cf17c8c817da99a6338780a28e0df1995fe7568d3b6e007ce48a8121fba1b8db3dacf6df36a7951fc49ff6ea6f6d0a9685c6 +AUX gnome-settings-daemon-3.22.0-optional.patch 4101 SHA256 0deeb95d05dd494b75b60299c77ecbc630adee0ef183fa805dd6cfc057d3884c SHA512 0f064dd2ea491f725eca74e2efe9534459719f8bccd8ba03f381a6f4979624c157ef299b805a38fcd11244232eeb66fb7074f57d0803b0781e458b5a47bfe765 WHIRLPOOL 1a3fbd3df9eeeed10f742fe281b32888509d9cb8fbf819e93286cf7e951fb9c97a1783c288d9caf623be3e632fe316256d9223fbb00657cbd3c66d7d73fbaca6 +DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 SHA256 0a1c1f9bce59a86617c45f77bd9cb99c6db38b96678a89d7ad2ab6b7bc6a1a01 SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3 WHIRLPOOL edae1afc97a314f3d90c7d77d9a456e74e9fe9059353e15a5a9b8318c32d2ebad792e7c9b7acaf54a8f3ea11a5de629f06d7bdb9cb3d5bff4f0621fe6a50683a +DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 SHA256 68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593 SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6 WHIRLPOOL 90fa96f9e1c641a63ba4eac2160f6fbc141f31009eaa93be7a4d3737d086553bb5f3fec7a75c32c2e9a364071216a36c578948f60d89867b6e12f8d12948dab4 +EBUILD gnome-settings-daemon-3.22.2-r1.ebuild 4185 SHA256 b4ff8bf3680f50b9b3cd318c1e4a7d7d677e800a36b7980362006a0f6f0325f9 SHA512 676d36c8d9bd465792a1e1cb911ad727d4e6d00458507cb083a266f4e6bb8b2ca7a8c6a92247eeec152d77f78f6af6555a9c89ad8d150d54809e5b8b948c1ac4 WHIRLPOOL 856c33368daab6004a1686c083bb35b65d7e811feb059b040881753d98e11dee3386b0e0d8e966f7c4221a7bfc24aedd78b700d936392f032c801eced14fc31a +EBUILD gnome-settings-daemon-3.24.3.ebuild 4924 SHA256 97296f6a0a978308e2fe6387975f8d408fa6e2e83efa0dee3be18034df02062d SHA512 3094c9e2b3f2c87d05f50ae3d8bf8a8c2da8cf47f79ee6a5c21f2776f721c220bb0410fa15d6814353857c278b8a38831fda863a3452fda0fa6aa8ccfdc5bb4d WHIRLPOOL a4ce06dbb355e374678c100084e18130d5dfeba08e655ffc5135afaae8e94625c22cf07ff90b664592311e61a4ad09ae6a3500e5329ff038942e7a4dfdbcc462 +MISC ChangeLog 7906 SHA256 fd75c6d961bce9c5b623311df153d57b7c1cbf09287ae45ac922545d11edae63 SHA512 c77e1e9f8b1ebbdd1357ee20360755d1c23f0524a0b28caf9be5f980c63f9283dd044290b41a44ccab907c85ec42592ae49de9de82edd1a3e5b936654bc814a6 WHIRLPOOL f55f257163bbeac19986c04e906ebc1e642b3452b15efda85733b60185644033d93511f969bab8a2317250ef0d2ea78cc48dff5d2f89d0b36c69671730b68889 +MISC ChangeLog-2015 32547 SHA256 800f750df17f8720f31b334e915d3c7a6b1f0c380d58dae080f63fca041df240 SHA512 0f0df6deea852f19bfa168d48960c861a897b2e216a04d17b1afaee0ee4d75b5ebf784b046ecb442be8ef121cbbb44db2ec946264de4f40506deb61202c48867 WHIRLPOOL e83557121b98fad4f5a7a4c4f800eacc053b4d854f8b0b4522ba5815256318c9150f5794ba94cd3196628be386cec373e739f0e324372f31152daade418ef6a8 +MISC metadata.xml 591 SHA256 db444b7a20a1714e29ea75adfc53363e4505555215065b2259ecba9e42abe374 SHA512 8cd323d8cfa69cb2630805fca3cffcf373980ea9da041e5088dc6cef83acf4b001dead2cce394e41f0d57152b4b0f06498918d54324367941049f4cf180be96a WHIRLPOOL 05235372b0d25cb7afdac8914de41c45b9e88375d7ad8723c6d0f3590c0fa4471e2bc1827ae04b161ef3ac9ac1862dab9bb529a6e1d07ea8ff3157fef809f594 diff --git a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch new file mode 100644 index 000000000000..d0436ecdc6e1 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch @@ -0,0 +1,48 @@ +From 19394974869513ab4a98d72593dce18f08105983 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Tue, 21 Mar 2017 01:30:52 +0200 +Subject: [PATCH] build: Get udevrulesdir from pkg-config + +Use the standard way to find the udev rules directory via pkg-config by default, +and support specifying it, should it be necessary. +This is the same logic as in colord. +--- + configure.ac | 9 +++++++++ + plugins/rfkill/Makefile.am | 1 - + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8d4f5cb..5390404 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -135,6 +135,15 @@ fi + AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) + + dnl --------------------------------------------------------------------------- ++dnl - Where to install udev rules ++dnl --------------------------------------------------------------------------- ++AC_ARG_WITH([udevrulesdir], ++ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]), ++ [], ++ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d]) ++AC_SUBST([udevrulesdir], [$with_udevrulesdir]) ++ ++dnl --------------------------------------------------------------------------- + dnl - ALSA integration (default enabled) + dnl --------------------------------------------------------------------------- + ALSA_PKG="" +diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am +index fed7adc..05f2c78 100644 +--- a/plugins/rfkill/Makefile.am ++++ b/plugins/rfkill/Makefile.am +@@ -59,7 +59,6 @@ plugin_in_files = rfkill.gnome-settings-plugin.in + + plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) + +-udevrulesdir = $(prefix)/lib/udev/rules.d + udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules + + EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA) +-- +2.10.1 + diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch new file mode 100644 index 000000000000..64c47a92e3f0 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch @@ -0,0 +1,145 @@ +From 22f6a45b665e604f874e82a817d45bb976d8c5ae Mon Sep 17 00:00:00 2001 +From: Timo Tambet <ttambet@gmail.com> +Date: Sat, 25 Feb 2017 14:48:19 +0200 +Subject: [PATCH 1/1] [PATCH] Make colord and wacom support optional + +--- + configure.ac | 56 +++++++++++++++++++++++++++++++---------------- + plugins/Makefile.am | 9 ++++++-- + plugins/dummy/Makefile.am | 5 ++++- + 3 files changed, 48 insertions(+), 22 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0d169c8f..792195aa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD, + gtk+-x11-3.0 + x11) + +-PKG_CHECK_MODULES(COLOR, +- colord >= 1.0.2 +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION +- libcanberra-gtk3 +- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION +- lcms2 >= $LCMS_REQUIRED_VERSION +- libnotify) ++AC_ARG_ENABLE([color], ++ AS_HELP_STRING([--disable-color], ++ [turn off color plugin]), ++ [], ++ [enable_color=yes]) ++ ++AS_IF([test "$enable_color" = "yes"], ++ [PKG_CHECK_MODULES(COLOR, ++ colord >= 1.0.2 ++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION ++ libcanberra-gtk3 ++ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION ++ lcms2 >= $LCMS_REQUIRED_VERSION ++ libnotify) ++ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) ++ ]) ++AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") + + PKG_CHECK_MODULES(DATETIME, + libnotify >= $LIBNOTIFY_REQUIRED_VERSION +@@ -268,23 +278,31 @@ case $host_os in + if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then + have_wacom=no + else +- if test x$enable_gudev != xno; then +- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION" +- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) +- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION]) +- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) +- else ++ have_wacom=no ++ AS_IF([test "$enable_gudev" != "no"], ++ [AC_ARG_ENABLE([wacom], ++ AS_HELP_STRING([--disable-wacom], ++ [turn off wacom plugin]), ++ [], ++ [enable_wacom=no]) dnl Default value ++ AS_IF([test "$enable_wacom" = "xyes"], ++ [ ++ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) ++ PKG_CHECK_MODULES(WACOM, [gtk+-3.0, pango >= $PANGO_REQUIRED_VERSION]) ++ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) ++ have_wacom=yes ++ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) ++ ]) ++ ], [ + AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) +- fi +- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) +- have_wacom=yes ++ ]) + fi + ;; + *) +- have_wacom=no +- ;; ++ have_wacom=no ++ ;; + esac +-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) ++AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) + + dnl --------------------------------------------------------------------------- + dnl - common +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 9324b406..ee78d6d0 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -4,7 +4,6 @@ enabled_plugins = \ + a11y-keyboard \ + a11y-settings \ + clipboard \ +- color \ + datetime \ + dummy \ + power \ +@@ -22,13 +21,19 @@ enabled_plugins = \ + + disabled_plugins = $(NULL) + ++if BUILD_COLOR ++enabled_plugins += color ++else ++disabled_plugins += color ++endif ++ + if SMARTCARD_SUPPORT + enabled_plugins += smartcard + else + disabled_plugins += smartcard + endif + +-if HAVE_WACOM ++if BUILD_WACOM + enabled_plugins += wacom + else + disabled_plugins += wacom +diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am +index cb5856cf..06ac595a 100644 +--- a/plugins/dummy/Makefile.am ++++ b/plugins/dummy/Makefile.am +@@ -22,10 +22,13 @@ gsd_dummy_LDADD = $(DUMMY_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la + desktopdir = $(sysconfdir)/xdg/autostart + + desktop_DATA = ++if !BUILD_COLOR ++desktop_DATA += org.gnome.SettingsDaemon.Color.desktop ++endif + if !SMARTCARD_SUPPORT + desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop + endif +-if !HAVE_WACOM ++if !BUILD_WACOM + desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop + endif + if !BUILD_PRINT_NOTIFICATIONS +-- +2.11.1 + diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch new file mode 100644 index 000000000000..9e683b06d3ba --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch @@ -0,0 +1,177 @@ +From 386f456eda7a027dfc706ebb675602d6f067f5c6 Mon Sep 17 00:00:00 2001 +From: Christian Hergert <chergert@redhat.com> +Date: Mon, 27 Mar 2017 00:17:59 -0700 +Subject: [PATCH 5/5] common: avoid loading Adwaita CSS theme into memory + +The various Gtk programs are not dependent on any specific theme being +loaded. Therefore, the parsing the Adwaita CSS theme (which is quite a +detailed theme) is unnecessary and a few MB of overhead to each gsd +subprocess. + +By setting the GTK_THEME environment variable in main() and providing an +alternate CSS file (which is empty), we can force Gtk to never load the +default theme, but instead our empty theme. This is important as otherwise +GtkSettings can force-load Adwaita upon first use, and that fragments the +heap. + +https://bugzilla.gnome.org/show_bug.cgi?id=780555 +--- + configure.ac | 1 + + plugins/common/Makefile.am | 10 ++++++++++ + plugins/common/Makefile.am.gresources | 34 ++++++++++++++++++++++++++++++++++ + plugins/common/daemon-skeleton-gtk.h | 28 ++++++++++++++++++++++++++++ + plugins/common/gsd.gresources.xml | 6 ++++++ + plugins/common/gtk.css | 0 + 6 files changed, 79 insertions(+) + create mode 100644 plugins/common/Makefile.am.gresources + create mode 100644 plugins/common/gsd.gresources.xml + create mode 100644 plugins/common/gtk.css + +diff --git a/configure.ac b/configure.ac +index 475821d..df86831 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -73,6 +73,7 @@ AC_SUBST([GSD_PLUGIN_LDFLAGS]) + + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) ++AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources]) + + LT_LIB_M + AC_SUBST(LIBM) +diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am +index 239c601..706be12 100644 +--- a/plugins/common/Makefile.am ++++ b/plugins/common/Makefile.am +@@ -33,6 +33,8 @@ libcommon_la_SOURCES = \ + gsd-device-mapper.h \ + gsd-input-helper.c \ + gsd-input-helper.h \ ++ gsd-resources.c \ ++ gsd-resources.h \ + gsd-settings-migrate.c \ + gsd-settings-migrate.h \ + gsd-shell-helper.c \ +@@ -68,3 +70,11 @@ EXTRA_DIST = $(scripts_DATA) daemon-skeleton.h daemon-skeleton-gtk.h + + CLEANFILES = \ + $(GSD_COMMON_ENUM_FILES) ++ ++DISTCLEANFILES = ++ ++glib_resources_c = gsd-resources.c ++glib_resources_h = gsd-resources.h ++glib_resources_xml = gsd.gresources.xml ++glib_resources_namespace = gsd ++include Makefile.am.gresources +diff --git a/plugins/common/Makefile.am.gresources b/plugins/common/Makefile.am.gresources +new file mode 100644 +index 0000000..1441d0e +--- /dev/null ++++ b/plugins/common/Makefile.am.gresources +@@ -0,0 +1,34 @@ ++resources_xml=$(addprefix $(srcdir)/,$(glib_resources_xml)) ++resources_srcdir=$(dir $(resources_xml)) ++ ++DISTCLEANFILES += $(glib_resources_h) $(glib_resources_c) ++BUILT_SOURCES += $(glib_resources_h) $(glib_resources_c) ++CLEANFILES += stamp-resources $(glib_resources_c) $(glib_resources_h) ++EXTRA_DIST += \ ++ $(glib_resources_xml) \ ++ $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(resources_srcdir) --generate-dependencies $(resources_xml)) \ ++ $(NULL) ++ ++stamp-resources: $(glib_resources_c) $(resources_xml) ++ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \ ++ --target=xgen-gr.h \ ++ --sourcedir=$(resources_srcdir) \ ++ --generate-header \ ++ --c-name $(glib_resources_namespace) \ ++ $(resources_xml) \ ++ && (cmp -s xgen-gr.h $(glib_resources_h) || cp -f xgen-gr.h $(glib_resources_h)) \ ++ && rm -f xgen-gr.h \ ++ && echo timestamp > $(@F) ++ ++$(glib_resources_h): stamp-resources ++ @true ++ ++$(glib_resources_c): $(resources_xml) $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(resources_srcdir) --generate-dependencies $(resources_xml)) ++ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \ ++ --target=xgen-gr.c \ ++ --sourcedir=$(resources_srcdir) \ ++ --generate-source \ ++ --c-name $(glib_resources_namespace) \ ++ $(resources_xml) \ ++ && (cmp -s xgen-gr.c $(glib_resources_c) || cp -f xgen-gr.c $(glib_resources_c)) \ ++ && rm -f xgen-gr.c +diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h +index 3bfd618..3ba0422 100644 +--- a/plugins/common/daemon-skeleton-gtk.h ++++ b/plugins/common/daemon-skeleton-gtk.h +@@ -163,6 +163,30 @@ register_with_gnome_session (void) + NULL); + } + ++static void ++set_empty_gtk_theme (gboolean set) ++{ ++ static char *old_gtk_theme = NULL; ++ ++ if (set) { ++ /* Override GTK_THEME to reduce overhead of CSS engine. By using ++ * GTK_THEME environment variable, GtkSettings is not allowed to ++ * initially parse the Adwaita theme. ++ * ++ * https://bugzilla.gnome.org/show_bug.cgi?id=780555 */ ++ old_gtk_theme = g_strdup (g_getenv ("GTK_THEME")); ++ g_setenv ("GTK_THEME", "Disabled", TRUE); ++ } else { ++ /* GtkSettings has loaded, so we can drop GTK_THEME used to initialize ++ * our internal theme. Only the main thread accesses the GTK_THEME ++ * environment variable, so this is safe to release. */ ++ if (old_gtk_theme != NULL) ++ g_setenv ("GTK_THEME", old_gtk_theme, TRUE); ++ else ++ g_unsetenv ("GTK_THEME"); ++ } ++} ++ + int + main (int argc, char **argv) + { +@@ -172,6 +196,8 @@ main (int argc, char **argv) + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + ++ set_empty_gtk_theme (TRUE); ++ + /* Work around https://bugzilla.gnome.org/show_bug.cgi?id=674885 */ + g_type_ensure (G_TYPE_DBUS_CONNECTION); + g_type_ensure (G_TYPE_DBUS_PROXY); +@@ -187,6 +213,8 @@ main (int argc, char **argv) + exit (1); + } + ++ set_empty_gtk_theme (FALSE); ++ + if (verbose) + g_setenv ("G_MESSAGES_DEBUG", "all", TRUE); + +diff --git a/plugins/common/gsd.gresources.xml b/plugins/common/gsd.gresources.xml +new file mode 100644 +index 0000000..e4ac1cd +--- /dev/null ++++ b/plugins/common/gsd.gresources.xml +@@ -0,0 +1,6 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<gresources> ++ <gresource prefix="/org/gtk/libgtk/theme/Disabled"> ++ <file>gtk.css</file> ++ </gresource> ++</gresources> +diff --git a/plugins/common/gtk.css b/plugins/common/gtk.css +new file mode 100644 +index 0000000..e69de29 +-- +2.10.2 + diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch new file mode 100644 index 000000000000..e47ba34c60dc --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch @@ -0,0 +1,77 @@ +From b567ec92d5b3004ad52fa02fb02990fcafb63373 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Mon, 27 Mar 2017 18:47:54 +0200 +Subject: [PATCH 1/3] housekeeping: Don't init GTK+ + +We don't use it. + +https://bugzilla.gnome.org/show_bug.cgi?id=780555 +--- + plugins/housekeeping/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/housekeeping/main.c b/plugins/housekeeping/main.c +index 5ccd83d..89c12f7 100644 +--- a/plugins/housekeeping/main.c ++++ b/plugins/housekeeping/main.c +@@ -4,4 +4,4 @@ + #define MANAGER GsdHousekeepingManager + #include "gsd-housekeeping-manager.h" + +-#include "daemon-skeleton-gtk.h" ++#include "daemon-skeleton.h" +-- +2.10.2 + + +From 92d45cd2ce2c4f252db21993f30777433ed84623 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Mon, 27 Mar 2017 18:49:35 +0200 +Subject: [PATCH 2/3] print-notifications: Don't init GTK+ + +We don't use it. + +https://bugzilla.gnome.org/show_bug.cgi?id=780555 +--- + plugins/print-notifications/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/print-notifications/main.c b/plugins/print-notifications/main.c +index 57155d0..a0dd406 100644 +--- a/plugins/print-notifications/main.c ++++ b/plugins/print-notifications/main.c +@@ -4,4 +4,4 @@ + #define MANAGER GsdPrintNotificationsManager + #include "gsd-print-notifications-manager.h" + +-#include "daemon-skeleton-gtk.h" ++#include "daemon-skeleton.h" +-- +2.10.2 + + +From e7e4b2145efebf132f1398da77790849becd7f6b Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Mon, 27 Mar 2017 18:50:01 +0200 +Subject: [PATCH 3/3] wacom: Don't init GTK+ + +We don't use it. + +https://bugzilla.gnome.org/show_bug.cgi?id=780555 +--- + plugins/wacom/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/wacom/main.c b/plugins/wacom/main.c +index a19a71b..ad1367c 100644 +--- a/plugins/wacom/main.c ++++ b/plugins/wacom/main.c +@@ -4,4 +4,4 @@ + #define MANAGER GsdWacomManager + #include "gsd-wacom-manager.h" + +-#include "daemon-skeleton-gtk.h" ++#include "daemon-skeleton.h" +-- +2.10.2 + diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch new file mode 100644 index 000000000000..16988f945d21 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch @@ -0,0 +1,48 @@ +From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Mon, 29 May 2017 00:38:57 +0300 +Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config + +Use the standard way to find the udev rules directory via pkg-config by default, +and support specifying it, should it be necessary. +This is the same logic as in colord. +--- + configure.ac | 9 +++++++++ + plugins/rfkill/Makefile.am | 1 - + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1107578..475821d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -104,6 +104,15 @@ fi + AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) + + dnl --------------------------------------------------------------------------- ++dnl - Where to install udev rules ++dnl --------------------------------------------------------------------------- ++AC_ARG_WITH([udevrulesdir], ++ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]), ++ [], ++ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d]) ++AC_SUBST([udevrulesdir], [$with_udevrulesdir]) ++ ++dnl --------------------------------------------------------------------------- + dnl - ALSA integration (default enabled) + dnl --------------------------------------------------------------------------- + ALSA_PKG="" +diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am +index 3c5ec47..bfc34c6 100644 +--- a/plugins/rfkill/Makefile.am ++++ b/plugins/rfkill/Makefile.am +@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile + $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + +-udevrulesdir = $(prefix)/lib/udev/rules.d + udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules + + EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files) +-- +2.10.2 + diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch new file mode 100644 index 000000000000..4a06889aaa23 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch @@ -0,0 +1,53 @@ +From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Fri, 18 Aug 2017 09:42:56 +0200 +Subject: [PATCH] Fix build issue when gudev is detected in the absence of + wayland + +See https://bugs.gentoo.org/show_bug.cgi?id=627966 +--- + configure.ac | 5 +++++ + plugins/common/Makefile.am | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 908b3a3a..c89d5e2d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland, + AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: auto)]), + enable_wayland=$enableval, enable_wayland=auto) + if test x$enable_wayland != xno; then ++ AS_IF([test "$have_udev" = no], ++ [AC_MSG_ERROR([udev is required for Wayland support])]) ++ + PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, have_wayland=no) + if test x$have_wayland = xyes; then + AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is available]) ++ GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0" + else + if test x$enable_wayland = xyes; then + AC_MSG_ERROR([Wayland enabled but not found]) + fi + fi + fi ++AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes) + + dnl ================================================================ + dnl Plugins +diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am +index 107e4d3b..760f3198 100644 +--- a/plugins/common/Makefile.am ++++ b/plugins/common/Makefile.am +@@ -40,7 +40,7 @@ libcommon_la_SOURCES = \ + gsd-shell-helper.c \ + gsd-shell-helper.h + +-if HAVE_GUDEV ++if HAVE_WAYLAND + libcommon_la_SOURCES += \ + gsd-device-manager-udev.c \ + gsd-device-manager-udev.h +-- +2.14.1 + diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch new file mode 100644 index 000000000000..608784c43bb4 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch @@ -0,0 +1,169 @@ +From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001 +From: Ole Reifschneider <mail@ole-reifschneider.de> +Date: Tue, 15 Aug 2017 18:51:42 +0200 +Subject: [PATCH 1/6] Make colord and wacom support optional + +Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> +Signed-off-by: Timo Tambet <ttambet@gmail.com> +Signed-off-by: Yuh-Horng Chen <yhchens@gmail.com> +--- + configure.ac | 54 ++++++++++++++++++++++++++++++---------------- + plugins/Makefile.am | 9 ++++++-- + plugins/common/Makefile.am | 7 ++++-- + plugins/dummy/Makefile.am | 5 ++++- + 4 files changed, 52 insertions(+), 23 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 73fe91e6..d8778c93 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD, + gtk+-x11-3.0 + x11) + +-PKG_CHECK_MODULES(COLOR, +- colord >= 1.0.2 +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION +- libcanberra-gtk3 +- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION +- lcms2 >= $LCMS_REQUIRED_VERSION +- libnotify) ++AC_ARG_ENABLE([color], ++ AS_HELP_STRING([--disable-color], ++ [turn off color plugin]), ++ [], ++ [enable_color=yes]) ++ ++AS_IF([test "$enable_color" = "yes"], ++ [PKG_CHECK_MODULES(COLOR, ++ colord >= 1.0.2 ++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION ++ libcanberra-gtk3 ++ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION ++ lcms2 >= $LCMS_REQUIRED_VERSION ++ libnotify) ++ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) ++ ]) ++AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") + + PKG_CHECK_MODULES(DATETIME, + libnotify >= $LIBNOTIFY_REQUIRED_VERSION +@@ -268,23 +278,31 @@ case $host_os in + if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then + have_wacom=no + else +- if test x$enable_gudev != xno; then +- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION" +- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) +- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION]) +- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) +- else +- AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) +- fi +- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) +- have_wacom=yes ++ have_wacom=no ++ AS_IF([test "$enable_gudev" != "no"], ++ [AC_ARG_ENABLE([wacom], ++ AS_HELP_STRING([--disable-wacom], ++ [turn off wacom plugin]), ++ [], ++ [enable_wacom=no]) dnl Default value ++ AS_IF([test "$enable_wacom" = "yes"], ++ [ ++ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) ++ PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION]) ++ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) ++ have_wacom=yes ++ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) ++ ]) ++ ], [ ++ AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) ++ ]) + fi + ;; + *) + have_wacom=no + ;; + esac +-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) ++AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) + + dnl --------------------------------------------------------------------------- + dnl - common +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 9324b406..ee78d6d0 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -4,7 +4,6 @@ enabled_plugins = \ + a11y-keyboard \ + a11y-settings \ + clipboard \ +- color \ + datetime \ + dummy \ + power \ +@@ -22,13 +21,19 @@ enabled_plugins = \ + + disabled_plugins = $(NULL) + ++if BUILD_COLOR ++enabled_plugins += color ++else ++disabled_plugins += color ++endif ++ + if SMARTCARD_SUPPORT + enabled_plugins += smartcard + else + disabled_plugins += smartcard + endif + +-if HAVE_WACOM ++if BUILD_WACOM + enabled_plugins += wacom + else + disabled_plugins += wacom +diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am +index 239c6015..65de4007 100644 +--- a/plugins/common/Makefile.am ++++ b/plugins/common/Makefile.am +@@ -49,14 +49,17 @@ libcommon_la_CPPFLAGS = \ + -I$(top_builddir)/gnome-settings-daemon \ + -I$(top_srcdir)/data/ + +-libcommon_la_CFLAGS = $(COMMON_CFLAGS) ++libcommon_la_CFLAGS = \ ++ $(COMMON_CFLAGS) \ ++ $(LIBWACOM_CFLAGS) + + libcommon_la_LDFLAGS = \ + $(GSD_PLUGIN_LDFLAGS) + + libcommon_la_LIBADD = \ + $(top_builddir)/gnome-settings-daemon/libgsd.la \ +- $(COMMON_LIBS) ++ $(COMMON_LIBS) \ ++ $(LIBWACOM_LIBS) + + libexec_PROGRAMS = gsd-test-input-helper + +diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am +index cb5856cf..d8e8bc4e 100644 +--- a/plugins/dummy/Makefile.am ++++ b/plugins/dummy/Makefile.am +@@ -25,7 +25,10 @@ desktop_DATA = + if !SMARTCARD_SUPPORT + desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop + endif +-if !HAVE_WACOM ++if !BUILD_COLOR ++desktop_DATA += org.gnome.SettingsDaemon.Color.desktop ++endif ++if !BUILD_WACOM + desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop + endif + if !BUILD_PRINT_NOTIFICATIONS +-- +2.14.1 + diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch new file mode 100644 index 000000000000..9b5369bb3462 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch @@ -0,0 +1,111 @@ +From 2aa9a92b06418642339cf27a3df5051f63eb8ddb Mon Sep 17 00:00:00 2001 +From: Ole Reifschneider <mail@ole-reifschneider.de> +Date: Sat, 11 Apr 2015 23:10:21 +0200 +Subject: [PATCH] Make colord and wacom support optional + +--- + configure.ac | 41 ++++++++++++++++++++++++++++++----------- + plugins/Makefile.am | 9 +++++++-- + 2 files changed, 37 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6d9408a..628af0e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -245,7 +245,17 @@ dnl --------------------------------------------------------------------------- + dnl - color + dnl --------------------------------------------------------------------------- + +-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION]) ++AC_ARG_ENABLE([color], ++ AS_HELP_STRING([--disable-color], ++ [turn off color plugin]), ++ [], ++ [enable_color=yes]) ++ ++AS_IF([test "$enable_color" = "yes"], ++ [PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION]) ++ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) ++ ]) ++AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") + + dnl --------------------------------------------------------------------------- + dnl - datetime +@@ -270,22 +280,31 @@ case $host_os in + if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then + have_wacom=no + else +- if test x$enable_gudev != xno; then +- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) +- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION]) +- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) +- else +- AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) +- fi +- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) +- have_wacom=yes ++ have_wacom=no ++ AS_IF([test "$enable_gudev" != "no"], ++ [AC_ARG_ENABLE([wacom], ++ AS_HELP_STRING([--disable-wacom], ++ [turn off wacom plugin]), ++ [], ++ [enable_wacom=no]) dnl Default value ++ AS_IF([test "x$enable_wacom" = "xyes"], ++ [ ++ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) ++ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION]) ++ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) ++ have_wacom=yes ++ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) ++ ]) ++ ], [ ++ AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) ++ ]) + fi + ;; + *) + have_wacom=no + ;; + esac +-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) ++AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) + + dnl ============================================== + dnl smartcard section +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 9324b40..ee78d6d 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -4,7 +4,6 @@ enabled_plugins = \ + a11y-keyboard \ + a11y-settings \ + clipboard \ +- color \ + datetime \ + dummy \ + power \ +@@ -22,13 +21,19 @@ enabled_plugins = \ + + disabled_plugins = $(NULL) + ++if BUILD_COLOR ++enabled_plugins += color ++else ++disabled_plugins += color ++endif ++ + if SMARTCARD_SUPPORT + enabled_plugins += smartcard + else + disabled_plugins += smartcard + endif + +-if HAVE_WACOM ++if BUILD_WACOM + enabled_plugins += wacom + else + disabled_plugins += wacom +-- +2.10.1 + diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild new file mode 100644 index 000000000000..76625b33ba7b --- /dev/null +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit gnome2 python-any-r1 systemd udev virtualx + +DESCRIPTION="Gnome Settings Daemon" +HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland" +REQUIRED_USE=" + input_devices_wacom? ( udev ) + smartcard? ( udev ) +" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +COMMON_DEPEND=" + >=dev-libs/glib-2.37.7:2[dbus] + >=x11-libs/gtk+-3.15.3:3 + >=gnome-base/gnome-desktop-3.11.1:3= + >=gnome-base/gsettings-desktop-schemas-3.20 + >=gnome-base/librsvg-2.36.2:2 + media-fonts/cantarell + media-libs/alsa-lib + media-libs/fontconfig + media-libs/libcanberra[gtk3] + >=media-sound/pulseaudio-2 + >=sys-power/upower-0.99:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + >=x11-libs/libnotify-0.7.3:= + x11-libs/libX11 + x11-libs/libxkbfile + x11-libs/libXi + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXtst + x11-libs/libXxf86misc + x11-misc/xkeyboard-config + + >=app-misc/geoclue-2.3.1:2.0 + >=dev-libs/libgweather-3.9.5:2= + >=sci-geosciences/geocode-glib-3.10 + >=sys-auth/polkit-0.103 + + colord? ( + >=media-libs/lcms-2.2:2 + >=x11-misc/colord-1.0.2:= ) + cups? ( >=net-print/cups-1.4[dbus] ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + >=x11-libs/pango-1.20 + x11-drivers/xf86-input-wacom + virtual/libgudev:= ) + networkmanager? ( >=net-misc/networkmanager-1.0 ) + smartcard? ( >=dev-libs/nss-3.11.2 ) + udev? ( virtual/libgudev:= ) + wayland? ( dev-libs/wayland ) +" +# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly +# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x +# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x +# systemd needed for power and session management, bug #464944 +RDEPEND="${COMMON_DEPEND} + gnome-base/dconf + !openrc-force? ( sys-apps/systemd ) + !<gnome-base/gnome-control-center-2.22 + !<gnome-extra/gnome-color-manager-3.1.1 + !<gnome-extra/gnome-power-manager-3.1.3 +" +# xproto-7.0.15 needed for power plugin +# FIXME: tests require dbus-mock +DEPEND="${COMMON_DEPEND} + cups? ( sys-apps/sed ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + gnome-base/gnome-session ) + app-text/docbook-xsl-stylesheets + dev-libs/libxml2:2 + dev-libs/libxslt + sys-devel/gettext + >=dev-util/intltool-0.40 + virtual/pkgconfig + x11-proto/inputproto + x11-proto/xf86miscproto + >=x11-proto/xproto-7.0.15 +" + +PATCHES=( + # Make colord and wacom optional; requires eautoreconf + "${FILESDIR}"/${PN}-3.22.0-optional.patch + # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf + "${FILESDIR}"/${PV}-udevrulesdir-configure.patch +) + +python_check_deps() { + if use test; then + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + gnome2_src_configure \ + --disable-static \ + --enable-man \ + --with-udevrulesdir="$(get_udevdir)"/rules.d \ + $(use_enable colord color) \ + $(use_enable cups) \ + $(use_enable debug) \ + $(use_enable debug more-warnings) \ + $(use_enable networkmanager network-manager) \ + $(use_enable smartcard smartcard-support) \ + $(use_enable udev gudev) \ + $(use_enable input_devices_wacom wacom) \ + $(use_enable wayland) +} + +src_test() { + virtx emake check +} + +pkg_postinst() { + gnome2_pkg_postinst + + if ! systemd_is_booted; then + ewarn "${PN} needs Systemd to be *running* for working" + ewarn "properly. Please follow the this guide to migrate:" + ewarn "https://wiki.gentoo.org/wiki/Systemd" + fi + + if use openrc-force; then + ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," + ewarn "this can lead to unexpected problems and is not supported neither by" + ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," + ewarn "you will need to disable this USE flag system wide and retest before" + ewarn "opening any bug report." + fi +} diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild new file mode 100644 index 000000000000..3534c5fa68f0 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" +GNOME2_LA_PUNT="yes" +#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 +PYTHON_COMPAT=( python2_7 ) + +inherit gnome2 python-any-r1 systemd udev virtualx + +DESCRIPTION="Gnome Settings Daemon" +HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland" +REQUIRED_USE=" + input_devices_wacom? ( udev ) + smartcard? ( udev ) + wayland? ( udev ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +COMMON_DEPEND=" + >=dev-libs/glib-2.44.0:2[dbus] + >=x11-libs/gtk+-3.15.3:3[X,wayland?] + >=gnome-base/gnome-desktop-3.11.1:3= + >=gnome-base/gsettings-desktop-schemas-3.23.3 + >=gnome-base/librsvg-2.36.2:2 + media-fonts/cantarell + media-libs/alsa-lib + media-libs/fontconfig + media-libs/libcanberra[gtk3] + >=media-sound/pulseaudio-2 + >=sys-power/upower-0.99:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + >=x11-libs/libnotify-0.7.3:= + x11-libs/libX11 + x11-libs/libxkbfile + x11-libs/libXi + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXtst + x11-libs/libXxf86misc + x11-misc/xkeyboard-config + + >=app-misc/geoclue-2.3.1:2.0 + >=dev-libs/libgweather-3.9.5:2= + >=sci-geosciences/geocode-glib-3.10 + >=sys-auth/polkit-0.103 + + colord? ( + >=media-libs/lcms-2.2:2 + >=x11-misc/colord-1.0.2:= ) + cups? ( >=net-print/cups-1.4[dbus] ) + input_devices_wacom? ( + >=dev-libs/libwacom-0.7 + >=x11-libs/pango-1.20 + x11-drivers/xf86-input-wacom + virtual/libgudev:= ) + networkmanager? ( >=net-misc/networkmanager-1.0 ) + smartcard? ( >=dev-libs/nss-3.11.2 ) + udev? ( virtual/libgudev:= ) + wayland? ( dev-libs/wayland ) +" +# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly +# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x +# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x +# systemd needed for power and session management, bug #464944 +RDEPEND="${COMMON_DEPEND} + gnome-base/dconf + !openrc-force? ( sys-apps/systemd ) + !<gnome-base/gnome-control-center-2.22 + !<gnome-extra/gnome-color-manager-3.1.1 + !<gnome-extra/gnome-power-manager-3.1.3 + !<gnome-base/gnome-session-3.23.2 +" +# xproto-7.0.15 needed for power plugin +DEPEND="${COMMON_DEPEND} + cups? ( sys-apps/sed ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') + gnome-base/gnome-session ) + dev-libs/libxml2:2 + sys-devel/gettext + >=dev-util/intltool-0.40 + virtual/pkgconfig + x11-proto/inputproto + x11-proto/xf86miscproto + x11-proto/kbproto + >=x11-proto/xproto-7.0.15 +" + +# TypeErrors with python3; weird test errors with python2; all in power component that was made required now +RESTRICT="test" +# RESTRICT="!test? ( test )" + +PATCHES=( + # Make colord and wacom optional; requires eautoreconf + "${FILESDIR}"/${PV}-optional.patch + # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf + "${FILESDIR}"/3.24.2-udevrulesdir-configure.patch + # Reduce memory usage by not initing GTK+ where not needed + "${FILESDIR}"/3.24.2-remove-unneeded-gtk-init.patch + # Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf + "${FILESDIR}"/3.24.2-reduce-memory-usage.patch + # Fix build issue when gudev is present but not wayland, bug #627966 + "${FILESDIR}"/3.24.3-fix-wayland-build.patch +) + +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() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + gnome2_src_configure \ + --disable-static \ + --with-udevrulesdir="$(get_udevdir)"/rules.d \ + $(use_enable colord color) \ + $(use_enable cups) \ + $(use_enable debug) \ + $(use_enable debug more-warnings) \ + $(use_enable networkmanager network-manager) \ + $(use_enable smartcard smartcard-support) \ + $(use_enable udev gudev) \ + $(use_enable input_devices_wacom wacom) \ + $(use_enable wayland) +} + +src_test() { + virtx emake check +} + +pkg_postinst() { + gnome2_pkg_postinst + + if ! systemd_is_booted; then + ewarn "${PN} needs Systemd to be *running* for working" + ewarn "properly. Please follow the this guide to migrate:" + ewarn "https://wiki.gentoo.org/wiki/Systemd" + fi + + if use openrc-force; then + ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," + ewarn "this can lead to unexpected problems and is not supported neither by" + ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," + ewarn "you will need to disable this USE flag system wide and retest before" + ewarn "opening any bug report." + fi +} diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml new file mode 100644 index 000000000000..7ddc604ee2fa --- /dev/null +++ b/gnome-base/gnome-settings-daemon/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="colord">Support color management using + <pkg>x11-misc/colord</pkg></flag> + <flag name="openrc-force">Skip systemd dependency (#480336), + enabling this flag will become your setup to be fully + unsupported by upstream and downstream Gnome team. Do not + try to enable it unless completely needed</flag> + </use> +</pkgmetadata> diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest new file mode 100644 index 000000000000..02bff86da770 --- /dev/null +++ b/gnome-base/gnome-shell/Manifest @@ -0,0 +1,12 @@ +AUX 3.22.3-CVE-2017-8288.patch 1501 SHA256 a2c3541971edead24c0989f4f13dabfe58c1fb35510f1bd43d69f193eb1447cd SHA512 d077946918b5b7aa3e863e017dc71644c2a63220eb21589c0790ff34f35b2545e6fe2a4e19549f0fc1dc0a46104c766826bb3c98fade6e1c54eb7ba67fe33311 WHIRLPOOL e4d921f7380aedad7d770570f7cf4e4531662de4744df735bc4486010922c530010e327048d0483a524053510eedfbad827f1c66405ad74a6a521c4a29137f9d +AUX gnome-shell-3.12-bluetooth-flag.patch 1894 SHA256 1da61704c51128de9b17fcca022e9c4d8d1d3b7def9b3e7ef50e2bc6d13fa256 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80 WHIRLPOOL aa98031a3152d570342fb249c3609d6387b6dea1d451e71ecf880c7de412aa493ad414db7e15217bac0775625419fa8ede13c5f61e055ad735d60dbce86fd6e6 +AUX gnome-shell-3.22.0-defaults.patch 1228 SHA256 578e87d9bb02890bd1636a1b9b138903e73e785b38ca24883d57f1bf5fcc761f SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5 WHIRLPOOL aec9125161b71a76b89ead71f3d8bc5340e2d597e44da378082d41176dcde427aca4c5befe63c5b2991ec4d72f4bc03f8a014aefc090be6f3cf1c82b82f3d1b5 +AUX gnome-shell-3.22.0-gir-build-fix.patch 882 SHA256 214eb001d6ec6c5d2c98bdc677ce12098d57a00c99b31e3357e00fcde2e1407d SHA512 b534134cc76dce49c78621d9245e9c457f4eefc3ac89dc09f036a178524b0ad3608683f43a0920fdb1d36410aebbfdecd701725217b6239f4549ef4ba82b7213 WHIRLPOOL cc59ead3bce02b86bd3948f9dbdd4f93c3111a2144c20e5a46e41b7752d9271be7757283d6f58ffcfa3d55c8e1f321aaa0638ef2c72358885262edc1de4bddd7 +DIST gnome-shell-3.22.3.tar.xz 1952576 SHA256 d1e6bd80ddd1fef92d80b518d4dbeffa296e8f003402551b8c37c42744b7d42f SHA512 47d67910b321a182d3ecd41f20cd923ec433cc93ab04b0b31351ca0229505ecbf343b1307585e557ee757845dc09b2371b0c2197717ed532b71878c186337ee9 WHIRLPOOL 9487f2626cc3ec0b3410c5ec65ceabb114e82d256ab1190464c6c787ca7cfd9e617358c19f84d64955943434b96c0521b5e57ea868da1c291a4874f1f3181613 +DIST gnome-shell-3.24.3.tar.xz 1982088 SHA256 58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8 SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15 WHIRLPOOL 1c5c7bf1d37a8043deb81cafad26c7a72f76a63784d7db036c47aaedbcba8468b7509a171c0a7a0763e3e0a7929bf2ac41bd6ecd2377cfd2e7c79ca0a7ff7f9b +EBUILD gnome-shell-3.22.3-r2.ebuild 6637 SHA256 c68cd0b03d152dcbe2430aca7591db9227ee6a062fbe2914ca67709460fb0dbf SHA512 60914c7e4931a73e174ad470fa8581f519c68bee9cf98bc6fb499f483b52af0efc9ca818d8b0f09fd2500177588ab2f1f05472a27eeee0498ad23f2380dc93c6 WHIRLPOOL 31c074e912b577890337e4994cda81bd6684afee0467d8bf495d6fa1cade513bb0c5bed5813e5e70625ee0672ca22f52202cb02752a39c592f5660d42078ca62 +EBUILD gnome-shell-3.22.3.ebuild 6865 SHA256 1bb63244b6c424416018a5f582b69521a85d5bb0a02eed2752b71f67a761d7b9 SHA512 c454e77fda925908ff497818dc1559217628b0b4830fe8a8d70b3251c888f6d5e7c375e57bb2eacec8a6e25af01cfafc0ec6a7f3944a0cd6eb6853fcea9f06aa WHIRLPOOL caab8329c863643a71f4c785301d4553913f45d635ff046dec185c46ca0e7128325ceb48579859db9a2694dc607c763930124932f8097398a93a9298d520cdd8 +EBUILD gnome-shell-3.24.3.ebuild 6570 SHA256 9765b55300140b87cb0b57b8639dade7b1ad89d50f86a79746f0b82ff6a30729 SHA512 7942c27864865a9e2862642b6e1618f3f0c0625280c805899de45f03d10a85dfbc45f76a80a78bbfb5e8a634fe5cd156d41497709774cfbd79ab30badf58d5b2 WHIRLPOOL b3c9dda211c1127fcf01a7fc236ca4ede4827ec2d804cc8d970bbd36a1648db8454c236f0312616b8410222081b87a92be3287e2a9b21510c82ab438bad1f180 +MISC ChangeLog 9249 SHA256 b4ac9963534bdbdd84e689a99e986b425972d8b7baf2d2ad6616f0d1d56646bc SHA512 38b6e20d7c43ee6d51422283043668d0bf795be7f9620968a1bae2abce0bc9285b8cde067d5f130a68ea47a5d9301d3276adc8efe7cd941552bd64e40c064b51 WHIRLPOOL a917b7e8136c4648cac0817df62e0cbc0d7bff491a96720d9f463ac946622b3220da3bbad0d908d42a9d8b13b2693e8ba32f069e20ec17c72aca93ef81585092 +MISC ChangeLog-2015 21302 SHA256 e4fd445e6d1b9e3925be7c6098663408dcf218b1c0e77924970cdec94f332a84 SHA512 31777caf7ec1250c5df0f7f893e02ec2bf9a984160cfab9b37bb95b9b9b92fead0a337726961a97b77a658dec18aaa6fb5bf63b4aa49de5f16ab1553328c3717 WHIRLPOOL 7088c7ebd744ea98bf76d0fd752b77d607989a77d4ba6be37377db8348601d977f1e5fe75249957d74079e979742dcd07fce59d28eb8764679e9bd69409e09e3 +MISC metadata.xml 738 SHA256 73b0a27a745a882f19ba01cb13017da487dc29e024cb5fb76457e624224502cd SHA512 02db87e2ac6c43ed104ae911de8caf78632b861c4efd3bbf5b0cf7dfab1d4d79e023b724b140ca86e72961c06454479f4d814ad1ae5dfd481bfbc7a45af0c18b WHIRLPOOL f4b03387d599eb7fb5791041b0deb2bffea0747842100fa4744c640bb9de03e1eaa2cfb43aede205c251c0cff1496b0ae3e839a740413c308fdfff243c53d7dd diff --git a/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch b/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch new file mode 100644 index 000000000000..f9c74d62fddd --- /dev/null +++ b/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch @@ -0,0 +1,45 @@ +From 560e976ee9c59d75907b5ef6ed2bc336719e37d3 Mon Sep 17 00:00:00 2001 +From: Emilio Pozuelo Monfort <pochu27@gmail.com> +Date: Tue, 25 Apr 2017 17:27:42 +0200 +Subject: [PATCH] extensionSystem: handle reloading broken extensions + +Some extensions out there may fail to reload. When that happens, +we need to catch any exceptions so that we don't leave things in +a broken state that could lead to leaving extensions enabled in +the screen shield. + +https://bugzilla.gnome.org/show_bug.cgi?id=781728 +--- + js/ui/extensionSystem.js | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js +index ba33222..1feaa2f 100644 +--- a/js/ui/extensionSystem.js ++++ b/js/ui/extensionSystem.js +@@ -276,12 +276,20 @@ function _onVersionValidationChanged() { + // temporarily disable them all + enabledExtensions = []; + for (let uuid in ExtensionUtils.extensions) +- reloadExtension(ExtensionUtils.extensions[uuid]); ++ try { ++ reloadExtension(ExtensionUtils.extensions[uuid]); ++ } catch(e) { ++ logExtensionError(uuid, e); ++ } + enabledExtensions = getEnabledExtensions(); + + if (Main.sessionMode.allowExtensions) { + enabledExtensions.forEach(function(uuid) { +- enableExtension(uuid); ++ try { ++ enableExtension(uuid); ++ } catch(e) { ++ logExtensionError(uuid, e); ++ } + }); + } + } +-- +2.10.1 + diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch new file mode 100644 index 000000000000..2fa93af25cd0 --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch @@ -0,0 +1,50 @@ +From 3c9c3b19fcb212171036e1e57e749411b5fd7d65 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr> +Date: Thu, 28 Feb 2013 18:48:32 +0330 +Subject: [PATCH 2/3] Make bluetooth support optional + +https://bugs.gentoo.org/show_bug.cgi?id=398145 + +Ed Catmur 2012-01-08 13:46:22 UTC +libgnome-bluetooth-applet is a private library so they shouldn't be linking +against it anyway. I tried to work out how to tell libtool to add it to rpath +but got totally lost. + +I'll see if I can work out how to fix the automagic gnome-bluetooth dependency +so I can at least merge USE=-bluetooth. +--- + configure.ac | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9a30e65..aa710f0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -138,11 +138,21 @@ AS_IF([test x$enable_browser_plugin = xyes], [ + ]) + AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes) + ++AC_MSG_CHECKING([for bluetooth support]) ++AC_ARG_WITH([bluetooth], ++ AS_HELP_STRING([--without-bluetooth], ++ [Build without gnome-bluetooth library (default: auto)])) ++AS_IF([test "x$with_bluetooth" != "xno"], [ + PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0, +- [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet]) +- AC_SUBST([HAVE_BLUETOOTH],[1])], ++ [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet]) ++ AC_SUBST([HAVE_BLUETOOTH],[1]) ++ AC_MSG_RESULT([yes])], + [AC_DEFINE([HAVE_BLUETOOTH],[0]) +- AC_SUBST([HAVE_BLUETOOTH],[0])]) ++ AC_SUBST([HAVE_BLUETOOTH],[0]) ++ AC_MSG_RESULT([no])]) ++], [AC_DEFINE([HAVE_BLUETOOTH],[0]) ++ AC_SUBST([HAVE_BLUETOOTH],[0]) ++ AC_MSG_RESULT([no])]) + + PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0) + AC_SUBST(CALENDAR_SERVER_CFLAGS) +-- +1.9.0 + diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch new file mode 100644 index 000000000000..b80dbc3a0dce --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch @@ -0,0 +1,26 @@ +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> +--- + 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>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> ++ <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.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/files/gnome-shell-3.22.0-gir-build-fix.patch b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch new file mode 100644 index 000000000000..b0c5fb769e8f --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch @@ -0,0 +1,28 @@ +From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sat, 12 Nov 2016 00:21:25 +0100 +Subject: [PATCH] Add missing rpath to point to mutter specific libraries + +Reported-By: AlphatPC@gmail.com +X-Gentoo-Bug: 597842 +X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842 +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index e9aacfe..fd98ba5 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in stamp-shell-enum-types.h + rm -f $(@F).tmp + EXTRA_DIST += shell-enum-types.c.in + +-libgnome_shell_ldflags = -avoid-version ++libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR) + libgnome_shell_libadd = \ + -lm \ + $(GNOME_SHELL_LIBS) \ +-- +2.10.1 + diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild new file mode 100644 index 000000000000..66d73e5efc0e --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" +PYTHON_COMPAT=( python{3_4,3_5} ) + +inherit gnome2 multilib pax-utils python-r1 systemd + +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 +ibus +networkmanager nsplugin -openrc-force" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +KEYWORDS="amd64 ~ia64 x86" + +# libXfixes-5.0 needed for pointer barriers +# FIXME: +# * gstreamer support is currently automagic +COMMON_DEPEND=" + >=app-accessibility/at-spi2-atk-2.5.3 + >=dev-libs/atk-2[introspection] + >=app-crypt/gcr-3.7.5[introspection] + >=dev-libs/glib-2.45.3:2[dbus] + >=dev-libs/gjs-1.39 + >=dev-libs/gobject-introspection-1.49.1:= + dev-libs/libical:= + >=x11-libs/gtk+-3.15.0:3[introspection] + >=dev-libs/libcroco-0.6.8:0.6 + >=gnome-base/gnome-desktop-3.7.90:3=[introspection] + >=gnome-base/gsettings-desktop-schemas-3.21.3 + >=gnome-extra/evolution-data-server-3.17.2:= + >=media-libs/gstreamer-0.11.92:1.0 + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.19[introspection] + >=sys-auth/polkit-0.100[introspection] + >=x11-libs/libXfixes-5.0 + x11-libs/libXtst + >=x11-wm/mutter-3.22.1[introspection] + >=x11-libs/startup-notification-0.11 + + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + + dev-libs/dbus-glib + dev-libs/libxml2:2 + media-libs/libcanberra[gtk3] + media-libs/mesa + >=media-sound/pulseaudio-2 + >=net-libs/libsoup-2.40:2.4[introspection] + x11-libs/libX11 + x11-libs/gdk-pixbuf:2[introspection] + + x11-apps/mesa-progs + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) + networkmanager? ( + app-crypt/libsecret + >=gnome-extra/nm-applet-0.9.8 + >=net-misc/networkmanager-0.9.8:=[introspection] ) + nsplugin? ( >=dev-libs/json-glib-0.13.2 ) +" +# 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 is needed for gnome-session-quit +# 3. Control shell settings +# 4. Systemd needed for suspending support +# 5. xdg-utils needed for xdg-open, used by extension tool +# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows +# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c +# 8. IBus is needed for nls integration +RDEPEND="${COMMON_DEPEND} + app-accessibility/at-spi2-core:2[introspection] + >=app-accessibility/caribou-0.4.8 + dev-libs/libgweather:2[introspection] + >=sys-apps/accountsservice-0.6.14[introspection] + >=sys-power/upower-0.99:=[introspection] + x11-libs/pango[introspection] + + >=gnome-base/gnome-session-2.91.91 + >=gnome-base/gnome-settings-daemon-3.8.3 + + !openrc-force? ( >=sys-apps/systemd-31 ) + + x11-misc/xdg-utils + + media-fonts/dejavu + >=x11-themes/adwaita-icon-theme-3.19.90 + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) +" +# avoid circular dependency, see bug #546134 +PDEPEND=" + >=gnome-base/gdm-3.5[introspection] + >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] + browser-extension? ( gnome-extra/chrome-gnome-shell ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.45.3 + >=dev-util/gtk-doc-am-1.17 + gnome-base/gnome-common + sys-devel/autoconf-archive + >=sys-devel/gettext-0.19.6 + virtual/pkgconfig +" + +PATCHES=( + # Change favorites defaults, bug #479918 + "${FILESDIR}"/${PN}-3.22.0-defaults.patch + # Fix automagic gnome-bluetooth dep, bug #398145 + "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch + # Add missing path to libmutter-clutter when building .gir, bug #597842 + "${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch + # Little bug when user has toggled version validation in the session, bug #616698 + "${FILESDIR}"/${PV}-CVE-2017-8288.patch +) + +src_configure() { + # Do not error out on warnings + gnome2_src_configure \ + --enable-man \ + $(use_enable !openrc-force systemd) \ + $(use_with bluetooth) \ + $(use_enable networkmanager) \ + $(use_enable nsplugin browser-plugin) \ + BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins +} + +src_install() { + gnome2_src_install + python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" + python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" + + # Required for gnome-shell on hardened/PaX, bug #398941 + # Future-proof for >=spidermonkey-1.8.7 following polkit's example + if has_version '<dev-lang/spidermonkey-1.8.7'; then + pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs} + elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then + pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} + # Required for gnome-shell on hardened/PaX #457146 and #457194 + # PaX EMUTRAMP need to be on + elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then + pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs} + else + pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} + fi +} + +pkg_postinst() { + gnome2_pkg_postinst + + 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." + fi + + # https://bugs.gentoo.org/show_bug.cgi?id=563084 + if has_version "x11-drivers/nvidia-drivers[-kms]"; then + ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," + ewarn "otherwise Gnome will fail to start" + fi + + if ! systemd_is_booted; then + ewarn "${PN} needs Systemd to be *running* for working" + ewarn "properly. Please follow this guide to migrate:" + ewarn "https://wiki.gentoo.org/wiki/Systemd" + fi + + if use openrc-force; then + ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," + ewarn "this can lead to unexpected problems and is not supported neither by" + ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," + ewarn "you will need to disable this USE flag system wide and retest before" + ewarn "opening any bug report." + fi +} diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild new file mode 100644 index 000000000000..f4a7da3a7451 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python{3_4,3_5} ) + +inherit autotools gnome2 multilib pax-utils python-r1 systemd + +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 +ibus +networkmanager nsplugin -openrc-force" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +KEYWORDS="~alpha ~arm ~ia64 ~ppc ~ppc64" + +# libXfixes-5.0 needed for pointer barriers +# FIXME: +# * gstreamer support is currently automagic +COMMON_DEPEND=" + >=app-accessibility/at-spi2-atk-2.5.3 + >=dev-libs/atk-2[introspection] + >=app-crypt/gcr-3.7.5[introspection] + >=dev-libs/glib-2.45.3:2[dbus] + >=dev-libs/gjs-1.39 + >=dev-libs/gobject-introspection-1.49.1:= + dev-libs/libical:= + >=x11-libs/gtk+-3.15.0:3[introspection] + >=dev-libs/libcroco-0.6.8:0.6 + >=gnome-base/gnome-desktop-3.7.90:3=[introspection] + >=gnome-base/gsettings-desktop-schemas-3.21.3 + >=gnome-extra/evolution-data-server-3.17.2:= + >=media-libs/gstreamer-0.11.92:1.0 + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.19[introspection] + >=sys-auth/polkit-0.100[introspection] + >=x11-libs/libXfixes-5.0 + x11-libs/libXtst + >=x11-wm/mutter-3.22.1[introspection] + >=x11-libs/startup-notification-0.11 + + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + + dev-libs/dbus-glib + dev-libs/libxml2:2 + media-libs/libcanberra[gtk3] + media-libs/mesa + >=media-sound/pulseaudio-2 + >=net-libs/libsoup-2.40:2.4[introspection] + x11-libs/libX11 + x11-libs/gdk-pixbuf:2[introspection] + + x11-apps/mesa-progs + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) + networkmanager? ( + app-crypt/libsecret + >=gnome-extra/nm-applet-0.9.8 + >=net-misc/networkmanager-0.9.8:=[introspection] ) + nsplugin? ( >=dev-libs/json-glib-0.13.2 ) +" +# 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 is needed for gnome-session-quit +# 3. Control shell settings +# 4. Systemd needed for suspending support +# 5. xdg-utils needed for xdg-open, used by extension tool +# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows +# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c +# 8. IBus is needed for nls integration +RDEPEND="${COMMON_DEPEND} + app-accessibility/at-spi2-core:2[introspection] + >=app-accessibility/caribou-0.4.8 + dev-libs/libgweather:2[introspection] + >=sys-apps/accountsservice-0.6.14[introspection] + >=sys-power/upower-0.99:=[introspection] + x11-libs/pango[introspection] + + >=gnome-base/gnome-session-2.91.91 + >=gnome-base/gnome-settings-daemon-3.8.3 + + !openrc-force? ( >=sys-apps/systemd-31 ) + + x11-misc/xdg-utils + + media-fonts/dejavu + >=x11-themes/adwaita-icon-theme-3.19.90 + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) +" +# avoid circular dependency, see bug #546134 +PDEPEND=" + >=gnome-base/gdm-3.5[introspection] + >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] +" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.45.3 + >=dev-util/gtk-doc-am-1.17 + gnome-base/gnome-common + >=sys-devel/gettext-0.19.6 + virtual/pkgconfig + !!=dev-lang/spidermonkey-1.8.2* +" +# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time +# https://bugs.gentoo.org/show_bug.cgi?id=360413 + +src_prepare() { + # Change favorites defaults, bug #479918 + eapply "${FILESDIR}"/${PN}-3.22.0-defaults.patch + + # Fix automagic gnome-bluetooth dep, bug #398145 + eapply "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch + + # Add missing path to libmutter-clutter when building .gir, bug #597842 + eapply "${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + # Do not error out on warnings + gnome2_src_configure \ + --enable-man \ + $(use_enable !openrc-force systemd) \ + $(use_with bluetooth) \ + $(use_enable networkmanager) \ + $(use_enable nsplugin browser-plugin) \ + BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins +} + +src_install() { + gnome2_src_install + python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" + python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" + + # Required for gnome-shell on hardened/PaX, bug #398941 + # Future-proof for >=spidermonkey-1.8.7 following polkit's example + if has_version '<dev-lang/spidermonkey-1.8.7'; then + pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs} + elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then + pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} + # Required for gnome-shell on hardened/PaX #457146 and #457194 + # PaX EMUTRAMP need to be on + elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then + pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs} + else + pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} + fi +} + +pkg_postinst() { + gnome2_pkg_postinst + + 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 "<x11-drivers/ati-drivers-12"; then + ewarn "GNOME Shell has been reported to show graphical corruption under" + ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source" + ewarn "drivers." + 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." + fi + + # https://bugs.gentoo.org/show_bug.cgi?id=563084 + if has_version "x11-drivers/nvidia-drivers[-kms]"; then + ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," + ewarn "otherwise Gnome will fail to start" + fi + + if ! systemd_is_booted; then + ewarn "${PN} needs Systemd to be *running* for working" + ewarn "properly. Please follow this guide to migrate:" + ewarn "https://wiki.gentoo.org/wiki/Systemd" + fi + + if use openrc-force; then + ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," + ewarn "this can lead to unexpected problems and is not supported neither by" + ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," + ewarn "you will need to disable this USE flag system wide and retest before" + ewarn "opening any bug report." + fi +} diff --git a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild new file mode 100644 index 000000000000..5f5bdb00fb16 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" +PYTHON_COMPAT=( python{3_4,3_5} ) + +inherit gnome2 multilib pax-utils python-r1 systemd + +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 +ibus +networkmanager nsplugin -openrc-force" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" + +# libXfixes-5.0 needed for pointer barriers +# FIXME: +# * gstreamer support is currently automagic +COMMON_DEPEND=" + >=app-accessibility/at-spi2-atk-2.5.3 + >=dev-libs/atk-2[introspection] + >=app-crypt/gcr-3.7.5[introspection] + >=dev-libs/glib-2.45.3:2[dbus] + >=dev-libs/gjs-1.47.0 + >=dev-libs/gobject-introspection-1.49.1:= + dev-libs/libical:= + >=x11-libs/gtk+-3.15.0:3[introspection] + >=dev-libs/libcroco-0.6.8:0.6 + >=gnome-base/gnome-desktop-3.7.90:3=[introspection] + >=gnome-base/gsettings-desktop-schemas-3.21.3 + >=gnome-extra/evolution-data-server-3.17.2:= + >=media-libs/gstreamer-0.11.92:1.0 + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.19[introspection] + >=sys-auth/polkit-0.100[introspection] + >=x11-libs/libXfixes-5.0 + x11-libs/libXtst + >=x11-wm/mutter-3.24.0:0/0[introspection] + >=x11-libs/startup-notification-0.11 + + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + + dev-libs/dbus-glib + dev-libs/libxml2:2 + media-libs/libcanberra[gtk3] + media-libs/mesa + >=media-sound/pulseaudio-2 + >=net-libs/libsoup-2.40:2.4[introspection] + x11-libs/libX11 + x11-libs/gdk-pixbuf:2[introspection] + + x11-apps/mesa-progs + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) + networkmanager? ( + app-crypt/libsecret + >=gnome-extra/nm-applet-0.9.8 + >=net-misc/networkmanager-0.9.8:=[introspection] ) + nsplugin? ( >=dev-libs/json-glib-0.13.2 ) +" +# 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 is needed for gnome-session-quit +# 3. Control shell settings +# 4. Systemd needed for suspending support +# 5. xdg-utils needed for xdg-open, used by extension tool +# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows +# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c +# 8. IBus is needed for nls integration +RDEPEND="${COMMON_DEPEND} + app-accessibility/at-spi2-core:2[introspection] + >=app-accessibility/caribou-0.4.8 + dev-libs/libgweather:2[introspection] + >=sys-apps/accountsservice-0.6.14[introspection] + >=sys-power/upower-0.99:=[introspection] + x11-libs/pango[introspection] + + >=gnome-base/gnome-session-2.91.91 + >=gnome-base/gnome-settings-daemon-3.8.3 + + !openrc-force? ( >=sys-apps/systemd-31 ) + + x11-misc/xdg-utils + + media-fonts/dejavu + >=x11-themes/adwaita-icon-theme-3.19.90 + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) +" +# avoid circular dependency, see bug #546134 +PDEPEND=" + >=gnome-base/gdm-3.5[introspection] + >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] + browser-extension? ( gnome-extra/chrome-gnome-shell ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.45.3 + >=dev-util/gtk-doc-am-1.17 + gnome-base/gnome-common + sys-devel/autoconf-archive + >=sys-devel/gettext-0.19.6 + virtual/pkgconfig +" + +PATCHES=( + # Change favorites defaults, bug #479918 + "${FILESDIR}"/${PN}-3.22.0-defaults.patch + # Fix automagic gnome-bluetooth dep, bug #398145 + "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch + # Add missing path to libmutter-clutter when building .gir, bug #597842 + "${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch +) + +src_configure() { + # Do not error out on warnings + gnome2_src_configure \ + --enable-man \ + $(use_enable !openrc-force systemd) \ + $(use_with bluetooth) \ + $(use_enable networkmanager) \ + $(use_enable nsplugin browser-plugin) \ + BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins +} + +src_install() { + gnome2_src_install + python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" + python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" + + # Required for gnome-shell on hardened/PaX, bug #398941 + # Future-proof for >=spidermonkey-1.8.7 following polkit's example + if has_version '<dev-lang/spidermonkey-1.8.7'; then + pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs} + elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then + pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} + # Required for gnome-shell on hardened/PaX #457146 and #457194 + # PaX EMUTRAMP need to be on + elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then + pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs} + else + pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} + fi +} + +pkg_postinst() { + gnome2_pkg_postinst + + if ! has_version 'media-libs/gst-plugins-good:1.0' || \ + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then + ewarn "To make use of GNOME Shell's built-in screen recording utility," + ewarn "you need to either install media-libs/gst-plugins-good:1.0" + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." + fi + + if ! has_version "media-libs/mesa[llvm]"; then + elog "llvmpipe is used as fallback when no 3D acceleration" + elog "is available. You will need to enable llvm USE for" + elog "media-libs/mesa if you do not have hardware 3D setup." + fi + + # https://bugs.gentoo.org/show_bug.cgi?id=563084 + if has_version "x11-drivers/nvidia-drivers[-kms]"; then + ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," + ewarn "otherwise Gnome will fail to start" + fi + + if ! systemd_is_booted; then + ewarn "${PN} needs Systemd to be *running* for working" + ewarn "properly. Please follow this guide to migrate:" + ewarn "https://wiki.gentoo.org/wiki/Systemd" + fi + + if use openrc-force; then + ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," + ewarn "this can lead to unexpected problems and is not supported neither by" + ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," + ewarn "you will need to disable this USE flag system wide and retest before" + ewarn "opening any bug report." + fi +} diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml new file mode 100644 index 000000000000..3d91d2b59fe4 --- /dev/null +++ b/gnome-base/gnome-shell/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="browser-extension">Ensure the presence of extensions.gnome.org + native connector <pkg>gnome-extra/chrome-gnome-shell</pkg></flag> + <flag name="ibus">Enable support for enhanced input methods through + <pkg>app-i18n/ibus</pkg></flag> + <flag name="openrc-force">Skip systemd dependency (#480336), + enabling this flag will become your setup to be fully + unsupported by upstream and downstream Gnome team. Do not + try to enable it unless completely needed</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest new file mode 100644 index 000000000000..aa597613195f --- /dev/null +++ b/gnome-base/gnome-vfs/Manifest @@ -0,0 +1,17 @@ +AUX gnome-vfs-2.12.0-afs.patch 663 SHA256 a0bef85feae74a1ecc46f148a476d295e65c92b7a379546fb68186a7733e2e00 SHA512 38b1268e774ba2e7726295ee019f939b9dfc5d1a67f8e45d9bc30a2ae20f647acd9570740ad06cb17d83d9299f863aa14dd77a2ca2f9f4910b9c328111ae5ca1 WHIRLPOOL 80b524e57e89c1c6872d0a31d92f7ed27f4cec3d4bf04dac15770faf8c600ce92cf6e91cfb1e023635ae085caf525f6233be27bf193feb2e93d61452aca042a5 +AUX gnome-vfs-2.15.2-headers-define.patch 569 SHA256 ac0136ec0df6ba7efac5ac3403809383e7f681556f082537ee866d0398110918 SHA512 fc4c512ffe74368e83026b24d32c2c77a41f0430d24e782586938dde6061cbc023adcbe2bc21a19d2b584b6c22078ae6d3df7c839576270055aa6832337df60a WHIRLPOOL e547fd177ae3b54e98042339eca7013049493d5513582394de6a20ca7397c50427bd0aa650e90e92d54da2c9226e19c0793942d36c7d47d0da6f2c4eae170f1d +AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345 SHA512 527c24b8902c9a1049b08f6479d32674c8f382a9ae4d7c6f3de772c09347555fda680a3dbfe70fcc312db8aa939ccbc4a42d1a84fd6a9f4a51180943766f5261 WHIRLPOOL f7a60f04c5d86697c1e2f8e40251614bd7ad1a8ca9500d57d25a2570220804175b7d77eea1a51bb5d900aaa81c4f1f600a6530ffd7b45b378ce222846125fdb4 +AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 SHA256 478f55fe5e38714a22854351d46a031cacf1c003855865a8bdd1c2f1ececb5c5 SHA512 32cd2438a7b8d08a827ad8fc6118f67f14e4a67a176adfe3d6e5cc5a97934733c337d6bee41f06ab47920032fed0fd4cd5e761f9ad4ddc0617a2005f21bbf2ec WHIRLPOOL 7425385b4b5b15453fadaa48522da0adec2bb1ed63f7388a20430cd3f977cab21a6520474ccfe52fec2c0b8c1a4a44a91e83fddf274991577af545f5f8860512 +AUX gnome-vfs-2.20.1-automagic-deps.patch 643 SHA256 7d50fa5944125190ce0b0d47013bc4ff4fbfe2908520828dc9ced80d9b47ed02 SHA512 95ffa05d5212fd6156611e021a2dcd9ec940b6aa74c85d3c8a3ba01d840578af1f1af459ab724559b5a6331a757a74f1fa284455fce2c311c39e1855556bd745 WHIRLPOOL 5dfd0a11f1c566962d8efcefc97366d0039fad5319e8f578150edaafe53a740177a2c501a813287846f1ad3e95cec2acaa29c1d92710e5dd26e2faadf8e61a56 +AUX gnome-vfs-2.24.0-uuid-mount.patch 2452 SHA256 beb9aace30a3976fae53c1d6972e2dc1dbc1040de804197c01ecea296f3eda25 SHA512 f66dbba17937b2b1b00aed3804d0b927cd65a2f462853069e62d7973d3f3d88c2a0a2d153e1c95c27ecdf363ff0530f0e8d9849e7b168815ca3f1ad0baf98b96 WHIRLPOOL ba9c1a6310bb9d5366a1444393a7267916397c023115215d906e189d786a653e5b8719ffce15e50e7fcb4bb6baf7126bd8749f1f8e3255b4ec980715d1f790cc +AUX gnome-vfs-2.24.4-automake-1.13.patch 840 SHA256 a6637462eb518f0b97ac964977b2f947384b0fdc8fd7f1e860d32a28dc1c6062 SHA512 88e9ef1ff7cb513d576fa8d6441ff10c5072f277aef65f107c4f742690db9a4ebee0c986c3773d2055538c771672de84c3d08435cb1f8329dae633db395ae639 WHIRLPOOL 435dfc1036f3c84f1144683ccc06fcba716b773063e5b1d08c29e3f7cdc3476e52fabe8f45fda827a4fb32cf847b70fb5b2b4d0991160f2192aaf2a7c1a440b2 +AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 SHA256 aa87d5a019cb2ebfa3f66b64f7bebb19ed143a825d33e9d7370f89f9630b0214 SHA512 e9afd45ccbe6552daedc20403a0ea892a3dbf039439acc1bcabbecdcac57e808828a83076a6a29492ac74fa81b3f47a02b9d9d2a2387e445b03c8bf4f96e3bab WHIRLPOOL e0ab0bbd937be3b5ca3926f3175c27a6d50e9b5fd6fc1c1f4e395cfaccfbbeee573d4d6740708755d7a042bb54ad36e7229b9dd13498bc27b89202ad4d3557a4 +AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 SHA256 77dcd6c2dd00d05b036efee3014334e4d96bcbd40de9d4632290df6125dbfbbe SHA512 434a3491b55cfdd581bf3f542d464844941af72daa6933d957a85120d17ee72fff59e9d98e303bd17a3fd9f1694506186a52309d2ec3077680f7d45759e4ae77 WHIRLPOOL cf13feb6ef7d3178a5a4895a622702855cf4464fc92b8bbfeacef8650af8fda47ed3616a91f49cdd17398882d80416c957ab568b6a7e3dcdbd050e764184b177 +AUX gnome-vfs-2.24.4-gnutls27.patch 3235 SHA256 36ddcc5004189c3aea4edbd88fa3bbfe605737b21246110b144ffffcfc29c38c SHA512 a17ea282f22e22c2390c3a53efab2c99a3fbb2ee370c0c1a19a477ff76bdeae483bf1886f09680681b824254c14a8a411470c95319c4f3d5a7775f4369935b25 WHIRLPOOL 4c8a3e8f2202c31ebca9df4281f8212d65ab7ca04466034fbedb25c999644c55464950b3253c436fe0f5c65f3476894205d16178875834885d44a96f6ccde9b0 +AUX gnome-vfs-2.24.4-gnutls34.patch 1624 SHA256 5fe5e2e1ad8d8d36deb2d38db621d5b8350aafe3876f722467465c3b3fa304d3 SHA512 adbbe966be3f7193c838794fc8a8949433377c6730c55ed152c345858b4da3f97f5c372d6b4555814ea10f5c65b52cb8a625563a0329604a9d61ce57b08de620 WHIRLPOOL d26ad0b51c2a40f51bd8b85ae48b0a929a9163cde187a02a103d0210c1038bf833c51924584884ed1f0930f215f23c65b8c980420230b26c36ae76d4ff00b309 +AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 SHA256 4d1841e7c296f7774aea01649d28549b5d04db486c5c7cd0b4c0e63ba04e4dc0 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f WHIRLPOOL 253cf6b04c06bc03cd97ea10b7d6a5d82500b6c54aa835502e7ba6517abec5782e84997a34a2397b863ba2a37af07b697cb452c3486fd0d98a7cd67cd5fc7cfe +DIST gnome-vfs-2.24.4.tar.bz2 1890370 SHA256 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581 WHIRLPOOL 53376928ae04cc1d693e57afe18f2b91431b8c8d678cf58eedd057eb23e9f34010294faf83e3085126adf310da5a135076cf085f63f1db0d3a1add21cc0641a9 +EBUILD gnome-vfs-2.24.4-r5.ebuild 4286 SHA256 0b19adc93082ea5dcbf688da659381b4b1a6418c0c0e420ca922a4d1ea8d7794 SHA512 ae1bc176875331303df003159767ebeb90ce9a0b569f2a5703495ae61f902cbcc50157466c1d223f5e4f5b261510d4d4d9b1de6ce33dcfd665ccd32b8ca87f21 WHIRLPOOL 0cee53cfd2dd06135477775b92ff5aed30d0efa13d84a30ed100ca3a2470f14fdc07af14ad7a1a39a60dcb6b6011c5ce37af22fc0c68f00b7c2bd3ef6b0d54b0 +MISC ChangeLog 6894 SHA256 8c9a46963faa12bff1b5f657063184eca2c3016239d3284a75a50df3e17fd8e3 SHA512 b74706f195b8bdc3e84a80de24f8dcb8587b9f936ee65af83e5adb03c5493fe646662851c31f1390ec76189b6bb17aeaba6d634c3fc0f2496c24b08c674c1720 WHIRLPOOL 29015aa895328ed94e4540c62541b7b3bc3f894c23b417170438d69c6eadbfa514b22dd2a7ebc9ebb09ee33607c6d03ac8a45648492f7f4f48cecb676514aaf9 +MISC ChangeLog-2015 48278 SHA256 902e14dc381fb1c2df6eed7f85288fcc569b8af94beb5498af7ae5a1ce7299d1 SHA512 9470243581cdf8060c9d67fb28f43a8c19f4e958baa223cf1cf6955f34ad61fadb22d9e1607453b31d4e36bcbb1a279c770885d1944c404a897c7dfaa5d6fc62 WHIRLPOOL c2e1f17948b1eba7805d6594469080718b968db8ec548ecf7990840764cac8089fbfa15f4ee22f86c4e0b23260ca110ed882b41e789770a64db22218deb7e38d +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch new file mode 100644 index 000000000000..cdc88c24b6a3 --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch @@ -0,0 +1,12 @@ +diff -ur gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c +--- gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c 2005-08-23 01:34:36.000000000 +0800 ++++ gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c 2005-09-18 20:30:47.000000000 +0800 +@@ -35,7 +35,7 @@ + + static struct FSInfo fs_data[] = { + { "affs" , N_("AFFS Volume"), 0}, +- { "afs" , N_("AFS Network Volume"), 0 }, ++ { "afs" , N_("AFS Network Volume"), 1 }, + { "auto" , N_("Auto-detected Volume"), 0 }, + { "cd9660" , N_("CD-ROM Drive"), 0 }, + { "cdda" , N_("CD Digital Audio"), 0 }, diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch new file mode 100644 index 000000000000..f74db8edb1cd --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch @@ -0,0 +1,19 @@ +--- configure.in 2006-06-13 00:36:14.000000000 -0500 ++++ configure.in 2006-06-13 00:54:15.000000000 -0500 +@@ -191,6 +191,16 @@ + + AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h) + ++AC_CHECK_HEADERS([pwd.h]) ++if test "$ac_cv_header_pwd_h" = "yes"; then ++ AC_DEFINE(HAVE_PWD_H, [1], [pwd.h present]) ++fi ++ ++AC_CHECK_HEADERS([grp.h]) ++if test "$ac_cv_header_grp_h" = "yes"; then ++ AC_DEFINE(HAVE_GRP_H, [1], [grp.h present]) ++fi ++ + dnl + dnl file system type member in statfs struct + dnl diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch new file mode 100644 index 000000000000..6905060a4f71 --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch @@ -0,0 +1,12 @@ +diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c +--- gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c 2006-07-07 04:46:39.000000000 -0400 ++++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c 2006-09-21 11:22:49.000000000 -0400 +@@ -236,6 +236,8 @@ + gnome_vfs_volume_monitor_client_init (GnomeVFSVolumeMonitorClient *volume_monitor_client) + { + setup_dbus_connection (volume_monitor_client); ++ if (!volume_monitor_client->dbus_conn) ++ return; + read_drives_from_daemon (volume_monitor_client); + read_volumes_from_daemon (volume_monitor_client); + } diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch new file mode 100644 index 000000000000..876148b891f4 --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch @@ -0,0 +1,68 @@ +Index: configure.in +=================================================================== +--- configure.in (révision 5413) ++++ configure.in (copie de travail) +@@ -448,9 +448,13 @@ + dnl GSSAPI + dnl Check for Kerberos installation + have_gssapi=no ++ ++AC_ARG_ENABLE(krb5, ++ AS_HELP_STRING([--enable-krb5],[Enable Kerberos 5 support]), ++ [],[enable_krb5=yes]) + AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) +- +-if test "x$KRB5_CONFIG" != "xnone"; then ++ ++if test "x$KRB5_CONFIG" != "xnone" -a "x$enable_krb5" = "xyes"; then + GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" + GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" + +@@ -481,8 +485,12 @@ + break + ]) + LIBS="$saved_LIBS" +- CPPFLAGS="$saved_CPPFLAGS" +-fi ++ CPPFLAGS="$saved_CPPFLAGS" ++fi ++ ++if test "x$KRB5_CONFIG" = "xnone" -a "x$enable_krb5" = "xyes"; then ++ AC_MSG_ERROR([*** kerberos 5 support enabled but krb5-config not found ***]) ++fi + AC_SUBST(GSSAPI_LIBS) + AC_SUBST(GSSAPI_CFLAGS) + +@@ -1077,9 +1085,13 @@ + dnl ===================== + dnl ACL checks + dnl ===================== +-acl_backends="" ++acl_backends="none" + ACL_LIBS="" + ++AC_ARG_ENABLE(acl, ++ AS_HELP_STRING([--disable-acl],[Don't use libacl support]), ++ [],[enable_acl=yes]) ++ + AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"]) + AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"]) + AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"]) +@@ -1102,7 +1114,7 @@ + gvfs_cv_HAVE_POSIX_ACLS=yes, gvfs_cv_HAVE_POSIX_ACLS=no) + LIBS=$acl_LIBS]) + +-if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" ; then ++if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then + have_solaris_acl_support=yes + acl_backends="solaris" + +@@ -1110,7 +1122,7 @@ + AC_CHECK_HEADERS([pwd.h grp.h]) + fi + +-if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" ; then ++if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then + have_posix_acl_support=yes + acl_backends="posix" + diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch new file mode 100644 index 000000000000..11ac34c07214 --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch @@ -0,0 +1,19 @@ +--- configure.in. 2007-11-30 04:15:01.000000000 +0100 ++++ configure.in 2007-11-30 04:16:21.000000000 +0100 +@@ -1102,6 +1102,7 @@ + AS_HELP_STRING([--disable-acl],[Don't use libacl support]), + [],[enable_acl=yes]) + ++if test "x$enable_acl" = "xyes"; then + AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"]) + AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"]) + AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"]) +@@ -1189,6 +1190,8 @@ + fi + ++fi + AC_SUBST(ACL_LIBS) ++ + AM_CONDITIONAL(HAVE_POSIX_ACL, test x"$have_posix_acl_support" = x"yes") + AM_CONDITIONAL(HAVE_SOLARIS_ACL, test x"$have_solaris_acl_support" = x"yes") + diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch new file mode 100644 index 000000000000..e76a9837136a --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch @@ -0,0 +1,77 @@ +From 8427c2daf543353f42b932b5137b6ec590f6589b Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sat, 2 Oct 2010 00:42:31 +0200 +Subject: [PATCH 7/9] Prevent duplicated volumes, bug #193083 + +--- + libgnomevfs/gnome-vfs-unix-mounts.c | 39 +++++++++++++++++++++++++++++++++- + 1 files changed, 37 insertions(+), 2 deletions(-) + +diff --git a/libgnomevfs/gnome-vfs-unix-mounts.c b/libgnomevfs/gnome-vfs-unix-mounts.c +index 51a009b..3eee305 100644 +--- a/libgnomevfs/gnome-vfs-unix-mounts.c ++++ b/libgnomevfs/gnome-vfs-unix-mounts.c +@@ -40,6 +40,10 @@ + #ifdef HAVE_POLL_H + #include <poll.h> + #endif ++ ++#include <limits.h> ++#include <stdlib.h> ++ + #include <stdio.h> + #include <unistd.h> + #include <sys/time.h> +@@ -290,6 +294,15 @@ _gnome_vfs_get_current_unix_mounts (GList **return_list) + + mount_entry->mount_path = g_strdup (mntent->mnt_dir); + mount_entry->device_path = g_strdup (mntent->mnt_fsname); ++ ++ if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) { ++ char rpath[PATH_MAX]; ++ if (realpath (mntent->mnt_fsname, rpath)) { ++ g_free (mount_entry->device_path); ++ mount_entry->device_path = g_strdup (rpath); ++ } ++ } ++ + mount_entry->filesystem_type = g_strdup (mntent->mnt_type); + + g_hash_table_insert (mounts_hash, +@@ -571,9 +584,31 @@ _gnome_vfs_get_unix_mount_table (GList **return_list) + } + + mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1); +- ++ ++ if(strlen(mntent->mnt_fsname) >= 5 && !strncmp (mntent->mnt_fsname, "UUID=", 5)) { ++ mount_entry->device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mntent->mnt_fsname+5); ++ } ++ else if(strlen(mntent->mnt_fsname) >= 6 && !strncmp (mntent->mnt_fsname, "LABEL=", 6)) { ++ mount_entry->device_path = g_strdup_printf ("/dev/disk/by-label/%s", mntent->mnt_fsname+6); ++ } ++ else { ++ mount_entry->device_path = g_strdup (mntent->mnt_fsname); ++ } ++ ++ if (g_file_test (mount_entry->device_path, G_FILE_TEST_IS_SYMLINK)) { ++ char rpath[PATH_MAX]; ++ if (realpath (mount_entry->device_path, rpath)) { ++ g_free (mount_entry->device_path); ++ mount_entry->device_path = g_strdup (rpath); ++ } ++ else { ++ g_free (mount_entry->device_path); ++ g_free (mount_entry); ++ continue; ++ } ++ } ++ + mount_entry->mount_path = g_strdup (mntent->mnt_dir); +- mount_entry->device_path = g_strdup (mntent->mnt_fsname); + mount_entry->filesystem_type = g_strdup (mntent->mnt_type); + + #ifdef HAVE_HASMNTOPT +-- +1.7.3 + diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch new file mode 100644 index 000000000000..69f470a396a9 --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch @@ -0,0 +1,30 @@ + configure.in | 2 +- + test/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 7335451..7817998 100644 +--- a/configure.in ++++ b/configure.in +@@ -33,7 +33,7 @@ AC_SUBST(LIBGNOMEVFS_REVISION) + AC_SUBST(LIBGNOMEVFS_AGE) + AC_SUBST(LIBGNOMEVFS_VERSION) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_INIT_AUTOMAKE(gnome-vfs, $LIBGNOMEVFS_VERSION) + + dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work +diff --git a/test/Makefile.am b/test/Makefile.am +index 5b0992e..626bdec 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -65,7 +65,7 @@ TESTS = test-acl \ + test-async-cancel \ + test-escape \ + test-uri \ +- $(srcdir)/auto-test ++ auto-test + + libraries = \ + $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch new file mode 100644 index 000000000000..45ca015573f0 --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch @@ -0,0 +1,25 @@ +From b7dabab33e00bdbd8b566ca058a1bce7dec2b77d Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sat, 2 Oct 2010 01:45:21 +0200 +Subject: [PATCH 8/9] Do not build tests unless required + +--- + test/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/test/Makefile.am b/test/Makefile.am +index 5b0992e..a1aefa0 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -14,7 +14,7 @@ else + platform_only_programs = test-dns-sd test-symlinks test-parse-ls-lga + endif + +-noinst_PROGRAMS = \ ++check_PROGRAMS = \ + test-acl \ + test-address \ + test-async \ +-- +1.7.3 + diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch new file mode 100644 index 000000000000..2684c92ec098 --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch @@ -0,0 +1,24 @@ +From 390c1f6c06917f54cfacd5f85834d02c231cc2ea Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sat, 2 Oct 2010 01:46:31 +0200 +Subject: [PATCH 9/9] Disable broken test, bug #285706, upstream #618089 + +--- + test/Makefile.am | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/test/Makefile.am b/test/Makefile.am +index a1aefa0..c18f2e4 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -62,7 +62,6 @@ TESTS_ENVIRONMENT = GNOME_VFS_MODULE_PATH=$(top_builddir)/modules/.libs \ + SRCDIR=$(srcdir) + TESTS = test-acl \ + test-address \ +- test-async-cancel \ + test-escape \ + test-uri \ + $(srcdir)/auto-test +-- +1.7.3 + diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch new file mode 100644 index 000000000000..93ebd17c7eff --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch @@ -0,0 +1,68 @@ +Debian #529827 +GNOME #574589 +Gentoo #253729 +Patch by Gilles Dartiguelongue, fixed for correctly setting have_ssl + +Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 +Use pkg-config in place of gnutls own macro since it's not present anymore. + +As gnome-vfs-ssl.c also directly uses libgcrypt, we need to make sure that +configure checks for it. Use AM_PATH_LIBGCRYPT macro for that. + + +Index: gnome-vfs-2.24.4/configure.in +=================================================================== +--- gnome-vfs-2.24.4.orig/configure.in 2011-03-16 14:07:18.901009688 +0100 ++++ gnome-vfs-2.24.4/configure.in 2011-03-16 14:16:19.317009687 +0100 +@@ -667,15 +667,14 @@ + if test "x${OPENSSL_LIBS}" != "x"; then + AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) + else +- AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) +- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) +- have_ssl=true]) +- ++ AM_PATH_LIBGCRYPT ++ if test "x${LIBGCRYPT_LIBS}" = "x"; then ++ AC_MSG_ERROR([Unable to find LIBGRYPT]) ++ fi ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) ++ have_ssl=true]) + if test "x${LIBGNUTLS_LIBS}" = "x"; then +- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) +- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) +- have_ssl=true], +- AC_MSG_ERROR([Unable to find GNUTLS])) ++ AC_MSG_ERROR([Unable to find GNUTLS]) + fi + fi + fi +@@ -1045,8 +1044,8 @@ + dnl ============================================================================== + + PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) +-LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS" +-LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS" ++LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $LIBGCRYPT_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS" ++LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $LIBGCRYPT_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS" + AC_SUBST(LIBGNOMEVFS_CFLAGS) + AC_SUBST(LIBGNOMEVFS_LIBS) + +Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c +=================================================================== +--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 2011-03-16 14:07:18.861009688 +0100 ++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 2011-03-16 14:09:17.517009687 +0100 +@@ -61,13 +61,6 @@ + #endif + #endif + +-#if defined GNUTLS_COMPAT +-#define gnutls_certificate_credentials GNUTLS_CERTIFICATE_CREDENTIALS +-#define gnutls_session GNUTLS_STATE +-#define gnutls_certificate_free_credentials gnutls_certificate_free_sc +-#define gnutls_certificate_allocate_credentials gnutls_certificate_allocate_sc +-#endif +- + typedef struct { + #ifdef HAVE_OPENSSL + int sockfd; diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch new file mode 100644 index 000000000000..78942f06ea11 --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch @@ -0,0 +1,38 @@ +diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c +--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 2010-02-09 14:16:14.000000000 +0200 ++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 2015-04-14 00:01:51.272451668 +0300 +@@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand + #endif + } + +-#ifdef HAVE_GNUTLS +-static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0}; +-static const int cipher_priority[] = +- {GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC, +- GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0}; +-static const int comp_priority[] = +- {GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0}; +-static const int kx_priority[] = +- {GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0}; +-static const int mac_priority[] = +- {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0}; +- +-#endif +- +- + /** + * gnome_vfs_ssl_create_from_fd: + * @handle_return: pointer to a #GnomeVFSSSL struct, which will +@@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS + gnutls_transport_set_ptr (ssl->private->tlsstate, + GINT_TO_POINTER (fd)); + +- gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority); +- gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority); +- gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority); +- gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority); +- gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority); ++ gnutls_set_default_priority (ssl->private->tlsstate); + + gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE, + ssl->private->xcred); diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch new file mode 100644 index 000000000000..991286aa4de6 --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch @@ -0,0 +1,155 @@ +From 01dba45f0d15b7e23f21d19776d64f69879cd27a Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sat, 2 Oct 2010 00:41:01 +0200 +Subject: [PATCH 5/9] Fix to identify ${HOME} (#200897) + +Thanks to debian folks. +--- + libgnomevfs/gnome-vfs-application-registry.c | 2 +- + libgnomevfs/gnome-vfs-init.c | 3 +- + libgnomevfs/gnome-vfs-private-utils.c | 52 ++++++++++++++++++++++++++ + libgnomevfs/gnome-vfs-private-utils.h | 2 + + modules/file-method.c | 6 +- + 5 files changed, 60 insertions(+), 5 deletions(-) + +diff --git a/libgnomevfs/gnome-vfs-application-registry.c b/libgnomevfs/gnome-vfs-application-registry.c +index 0b11cc5..051ea44 100644 +--- a/libgnomevfs/gnome-vfs-application-registry.c ++++ b/libgnomevfs/gnome-vfs-application-registry.c +@@ -965,7 +965,7 @@ gnome_vfs_application_registry_init (void) + NULL); + gnome_registry_dir.system_dir = TRUE; + +- user_registry_dir.dirname = g_build_filename (g_get_home_dir(), ++ user_registry_dir.dirname = g_build_filename (gnome_vfs_get_home_dir(), + ".gnome", + "application-info", + NULL); +diff --git a/libgnomevfs/gnome-vfs-init.c b/libgnomevfs/gnome-vfs-init.c +index e3fd5d9..c07cf06 100644 +--- a/libgnomevfs/gnome-vfs-init.c ++++ b/libgnomevfs/gnome-vfs-init.c +@@ -118,7 +118,8 @@ gnome_vfs_init (void) + char *bogus_argv[2] = { "dummy", NULL }; + */ + +- if (!ensure_dot_gnome_exists ()) { ++ /* The first call also checks that ~/.gnome2 is writable. */ ++ if (!gnome_vfs_get_home_dir ()) { + return FALSE; + } + +diff --git a/libgnomevfs/gnome-vfs-private-utils.c b/libgnomevfs/gnome-vfs-private-utils.c +index 7fafde3..7ad8fbc 100644 +--- a/libgnomevfs/gnome-vfs-private-utils.c ++++ b/libgnomevfs/gnome-vfs-private-utils.c +@@ -34,6 +34,7 @@ + #include "gnome-vfs-uri.h" + #include <errno.h> + #include <glib.h> ++#include <glib/gstdio.h> + #include <gconf/gconf-client.h> + #include <stdlib.h> + #include <string.h> +@@ -1085,3 +1086,54 @@ _gnome_vfs_winsock_strerror (int error) + } + #endif + ++static gboolean ++ensure_dot_gnome_exists (gchar *home_dir) ++{ ++ gboolean retval = TRUE; ++ gchar *dirname; ++ ++ dirname = g_build_filename (home_dir, ".gnome2", NULL); ++ ++ if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) { ++ if (g_mkdir (dirname, S_IRWXU) != 0) { ++ g_warning ("Unable to create ~/.gnome2 directory: %s", ++ g_strerror (errno)); ++ retval = FALSE; ++ } ++ } else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) { ++ g_warning ("Error: ~/.gnome2 must be a directory."); ++ retval = FALSE; ++ } ++ ++ g_free (dirname); ++ return retval; ++} ++ ++/** ++ * gnome_vfs_get_home_dir: ++ * ++ * If ~/.gnome2 is writable, return the home directory ++ * Otherwise, return the contents of the HOME environment variable ++ * ++ * Return value: home directory if successful, NULL otherwise. ++ * Do not free the value returned. ++ */ ++const gchar * ++gnome_vfs_get_home_dir (void) ++{ ++ static gchar *home = NULL; ++ ++ if (home == NULL) { ++ gchar *tmp = g_get_home_dir (); ++ if (ensure_dot_gnome_exists (tmp)) { ++ home = g_strdup (tmp); ++ } else { ++ gchar *tmp2 = g_getenv ("HOME"); ++ if (!g_str_equal (tmp, tmp2) && ensure_dot_gnome_exists (tmp2)) { ++ home = g_strdup (tmp2); ++ } ++ } ++ } ++ ++ return home; ++} +diff --git a/libgnomevfs/gnome-vfs-private-utils.h b/libgnomevfs/gnome-vfs-private-utils.h +index 981c6d9..fe282a2 100644 +--- a/libgnomevfs/gnome-vfs-private-utils.h ++++ b/libgnomevfs/gnome-vfs-private-utils.h +@@ -124,6 +124,8 @@ const char *_gnome_vfs_winsock_strerror (int error); + + #endif + ++const gchar *gnome_vfs_get_home_dir (void); ++ + G_END_DECLS + + #endif /* _GNOME_VFS_PRIVATE_UTILS_H */ +diff --git a/modules/file-method.c b/modules/file-method.c +index 37e4853..7265e58 100644 +--- a/modules/file-method.c ++++ b/modules/file-method.c +@@ -1531,7 +1531,7 @@ save_trash_entry_cache (void) + GList *p; + char *buffer, *escaped_path, *escaped_mount_point; + +- cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT); ++ cache_file_parent = append_to_path (gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT); + cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME); + + if (mkdir_recursive (cache_file_parent, 0777) != 0) { +@@ -1670,7 +1670,7 @@ read_saved_cached_trash_entries (void) + cached_trash_directories = NULL; + + /* read in the entries from disk */ +- cache_file_path = g_build_filename (g_get_home_dir (), ++ cache_file_path = g_build_filename (gnome_vfs_get_home_dir (), + TRASH_ENTRY_CACHE_PARENT, + TRASH_ENTRY_CACHE_NAME, + NULL); +@@ -1942,7 +1942,7 @@ do_find_directory (GnomeVFSMethod *method, + return GNOME_VFS_ERROR_INVALID_URI; + + /* We will need the URI and the stat structure for the home directory. */ +- home_directory = g_get_home_dir (); ++ home_directory = gnome_vfs_get_home_dir (); + + if (gnome_vfs_context_check_cancellation (context)) { + g_free (full_name_near); +-- +1.7.3 + diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild new file mode 100644 index 000000000000..b46ee33df2a1 --- /dev/null +++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +GCONF_DEBUG="no" +GNOME_TARBALL_SUFFIX="bz2" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 multilib-minimal virtualx + +DESCRIPTION="Gnome Virtual Filesystem" +HOMEPAGE="https://www.gnome.org/" + +LICENSE="GPL-2 LGPL-2" +SLOT="2" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf" + +RDEPEND=" + >=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] + >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] + gnome-base/gnome-mime-data + >=x11-misc/shared-mime-info-0.14 + >=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}] + acl? ( + >=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}] + >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] + !gnome-extra/gnome-vfs-sftp ) + !gnutls? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + !gnome-extra/gnome-vfs-sftp ) ) + zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + ) +" +DEPEND="${RDEPEND} + sys-devel/gettext + gnome-base/gnome-common + >=dev-util/intltool-0.40 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + >=dev-util/gtk-doc-am-1.13 +" + +src_prepare() { + # Allow the Trash on afs filesystems (#106118) + epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch + + # Fix compiling with headers missing + epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch + + # Fix for crashes running programs via sudo + epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch + + # Fix automagic dependencies, upstream bug #493475 + epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch + epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch + + # Fix to identify ${HOME} (#200897) + # thanks to debian folks + epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch + + # Configure with gnutls-2.7, bug #253729 + # Fix building with gnutls-2.12, bug #388895 + epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch + + # Prevent duplicated volumes, bug #193083 + epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch + + # Do not build tests with FEATURES="-test", bug #226221 + epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch + + # Disable broken test, bug #285706 + epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch + + # Fix for automake-1.13 compatibility, #466944 + epatch "${FILESDIR}"/${P}-automake-1.13.patch + + # Fix gnutls-3.4+ compatibility, #560084 + # always use system defaults (patch from Arch Linux) + epatch "${FILESDIR}"/${P}-gnutls34.patch + + sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die + + eautoreconf + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=( + --disable-schemas-install + --disable-static + --disable-cdda + --disable-fam + --disable-hal + --disable-howl + $(use_enable acl) + $(use_enable gnutls) + $(use_enable ipv6) + $(use_enable kerberos krb5) + $(use_enable samba) + $(use_enable ssl openssl) + $(use_enable zeroconf avahi) + # Useless ? --enable-http-neon + + # fix path to krb5-config + KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config + ) + + # this works because of the order of configure parsing + # so should always be behind the use_enable options + # foser <foser@gentoo.org 19 Apr 2004 + use gnutls && use ssl && myconf+=( --disable-openssl ) + + #bug #519060 + #configure script is so messed up on res_init on Darwin + [[ ${CHOST} == *-darwin* ]] && export LIBS="${LIBS} -lresolv" + + ECONF_SOURCE=${S} \ + gnome2_src_configure "${myconf[@]}" + + if multilib_is_native_abi; then + ln -s "${S}"/doc/html doc/html || die + fi +} + +multilib_src_test() { + unset DISPLAY + # Fix bug #285706 + unset XAUTHORITY + Xemake check +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" + einstalldocs +} diff --git a/gnome-base/gnome-vfs/metadata.xml b/gnome-base/gnome-vfs/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/gnome-vfs/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest new file mode 100644 index 000000000000..99621c1dfe97 --- /dev/null +++ b/gnome-base/gnome/Manifest @@ -0,0 +1,7 @@ +EBUILD gnome-3.20.0.ebuild 1456 SHA256 0f9278053102ef20d4e30de8cb592c23c3204481097712d5e319d3a40589842b SHA512 db4545199d2f9b4e4bf0b0991ec6f21040d7191644bb1929fbe16151899c07e30d452e50c8e2732eb02674f7141fa845bfb604642c491597c452d13c4403d57f WHIRLPOOL 6ff17bad4cc9fed2b81e0c06329b5930f24f9e14c9204b4b69f6e0c106e4b4a7dbec291ac8e31dee7265f9be22bfdf0d5cf888d5320f915fcc16bb8b1de02e9a +EBUILD gnome-3.22.0.ebuild 1448 SHA256 15595217b6944c54a9e16e119729a1b54d7ab936ef1e4561c93d6447881fe635 SHA512 5fcb0c2cb4394c32c5b620b766edfa25d42fc5ff5f1d4fedc4b9b58fda54f5a8f0e96aec24a295699bf836b6a45ca3cbf8626c39936d939665c59b8829e635fd WHIRLPOOL 5c5b0bff603508cb1b915e741ec94bee9c46868f7de07ee18051e93a150e998b13a07286953ba01fabaa81c9e0f0ee21ba5f4c16b4e950af3dbdcdab5fa5beae +EBUILD gnome-3.22.2.ebuild 1399 SHA256 b07fef1fe789cb623f88e0023aacacb8efd301c16db3bac1dda31f912f3c76f2 SHA512 2abf56bbadce04382eeabe6cac07027df60e9308d3de2d2d6a2089b8629cc257cecd24ea68b8646a105b33743558efb102270280544cd32e78ae5d674fc26842 WHIRLPOOL ad9eb397a72c884fa1f298f5e536c125e85fbbb4c654243141647b6468f75fe403015feebf4c2728599e9d292e692073bf1c4627d929dba20c55b5b5d72172b5 +EBUILD gnome-3.24.0.ebuild 1400 SHA256 4285b75fe6cc7b30c9f5e8dd074ebee5c51d0c1ccac7c4e0fac6a165d9eed8d3 SHA512 280e8de05c613e31cd33066f1f0745ad114ec1d627a02143a418464a87de43243a94f9348cd4d9b24954910950fc38b81acf231e907eac2d52810bc608e61681 WHIRLPOOL c37972b7b7299a4c56c793dc6a8e99e957787197ea9a9bbd6b9bcbf667212febb33539f22f6365c9e574e984779c20e742bb85e04e71127a0c487b4088fda89a +MISC ChangeLog 4542 SHA256 406dddd6bcfe27df94dfa535cbb0b91087a0a83177e129d87ac30881b2a067c4 SHA512 9466e0efc3c7e2449047f536d72c12670797e161047f7f82221b1968fc50b0bd4e4f7f66ea71a46074f0c4a42f703d04470b949d2a69d63558dc4dd33d4298a5 WHIRLPOOL 9a942ed001809cb01ac5f4936e948f20054e589011d2444b67746fbdf2e97e3a38ed07c57b13b587379bcd41fe2589a982e03b5c1df5809318f87b86a1baeef7 +MISC ChangeLog-2015 65665 SHA256 600e61c49092ca39e2bc20b5f77d10fe3f89371880b8dda09c7da83821726913 SHA512 8ad5f7cb90cf95f7e476dad74c82c562143d3ff9722c4d70c8a57f56f6d4a83afacd5a4ea29f2794a4441d7c7f7dc246dd70a8139b3e5309e3c1fc1f54448cd9 WHIRLPOOL c593874a42b99fe8c45fb08b2eedbfcb2955212baae08f72b67aba031f4e9338bfe607162e5cb6258427096aeec2a0f20a2d68c46a2ad35eb48ffb29a204c63c +MISC metadata.xml 452 SHA256 161c1b0da98f8c46e0a12f62161e8f8b3f1704dccca2fa620ac1588062939864 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a WHIRLPOOL 941208b09f30af81e242330d282b4326a13adbd9667cd323153faee692328cc19e30ef4ca85637be03d6a6e5d74bd4710f42747f9317ecc42624da6c078cbada diff --git a/gnome-base/gnome/gnome-3.20.0.ebuild b/gnome-base/gnome/gnome-3.20.0.ebuild new file mode 100644 index 000000000000..7fdd120189b4 --- /dev/null +++ b/gnome-base/gnome/gnome-3.20.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Meta package for GNOME 3, merge this package to install" +HOMEPAGE="https://www.gnome.org/" + +LICENSE="metapackage" +SLOT="2.0" # Cannot be installed at the same time as gnome-2 + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86" + +IUSE="accessibility +bluetooth +classic +cdr cups +extras" + +S=${WORKDIR} + +# TODO: check accessibility completeness +# GDM-3.0 integrates very nicely with GNOME Shell +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV}[cups?] + >=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?] + + >=gnome-base/gdm-${PV} + + >=x11-wm/mutter-${PV} + >=gnome-base/gnome-shell-${PV}[bluetooth?] + + >=x11-themes/gnome-backgrounds-3.20 + x11-themes/sound-theme-freedesktop + + accessibility? ( + >=app-accessibility/at-spi2-atk-2.20 + >=app-accessibility/at-spi2-core-2.20 + >=app-accessibility/caribou-0.4.21 + >=app-accessibility/orca-${PV} + >=gnome-extra/mousetweaks-3.12.0 ) + classic? ( >=gnome-extra/gnome-shell-extensions-${PV} ) + extras? ( >=gnome-base/gnome-extra-apps-${PV} ) +" + +DEPEND="" + +PDEPEND=">=gnome-base/gvfs-1.28[udisks]" + +pkg_postinst() { + # Remember people where to find our project information + elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" + elog "for information about the project and documentation." +} diff --git a/gnome-base/gnome/gnome-3.22.0.ebuild b/gnome-base/gnome/gnome-3.22.0.ebuild new file mode 100644 index 000000000000..c2bc05c24155 --- /dev/null +++ b/gnome-base/gnome/gnome-3.22.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Meta package for GNOME 3, merge this package to install" +HOMEPAGE="https://www.gnome.org/" + +LICENSE="metapackage" +SLOT="2.0" # Cannot be installed at the same time as gnome-2 + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="accessibility +bluetooth +classic +cdr cups +extras" + +S=${WORKDIR} + +# TODO: check accessibility completeness +# GDM-3.0 integrates very nicely with GNOME Shell +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV}[cups?] + >=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?] + + >=gnome-base/gdm-${PV} + + >=x11-wm/mutter-${PV} + >=gnome-base/gnome-shell-${PV}[bluetooth?] + + >=x11-themes/gnome-backgrounds-${PV} + x11-themes/sound-theme-freedesktop + + accessibility? ( + >=app-accessibility/at-spi2-atk-2.22 + >=app-accessibility/at-spi2-core-2.22 + >=app-accessibility/caribou-0.4.21 + >=app-accessibility/orca-${PV} + >=gnome-extra/mousetweaks-3.12.0 ) + classic? ( >=gnome-extra/gnome-shell-extensions-${PV} ) + extras? ( >=gnome-base/gnome-extra-apps-${PV} ) +" + +DEPEND="" + +PDEPEND=">=gnome-base/gvfs-1.30[udisks]" + +pkg_postinst() { + # Remember people where to find our project information + elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" + elog "for information about the project and documentation." +} diff --git a/gnome-base/gnome/gnome-3.22.2.ebuild b/gnome-base/gnome/gnome-3.22.2.ebuild new file mode 100644 index 000000000000..80e2e88c30f6 --- /dev/null +++ b/gnome-base/gnome/gnome-3.22.2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Meta package for GNOME 3, merge this package to install" +HOMEPAGE="https://www.gnome.org/" + +LICENSE="metapackage" +SLOT="2.0" # Cannot be installed at the same time as gnome-2 + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="amd64 ~ppc ~ppc64 x86" + +IUSE="accessibility +bluetooth +classic +cdr cups +extras" + +S=${WORKDIR} + +# TODO: check accessibility completeness +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV}[cups?] + >=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?] + + >=gnome-base/gdm-${PV} + + >=x11-wm/mutter-${PV} + >=gnome-base/gnome-shell-${PV}[bluetooth?] + + >=x11-themes/gnome-backgrounds-3.22.1 + x11-themes/sound-theme-freedesktop + + accessibility? ( + >=app-accessibility/at-spi2-atk-2.22 + >=app-accessibility/at-spi2-core-2.22 + >=app-accessibility/caribou-0.4.21 + >=app-accessibility/orca-${PV} + >=gnome-extra/mousetweaks-3.12.0 ) + classic? ( >=gnome-extra/gnome-shell-extensions-${PV} ) + extras? ( >=gnome-base/gnome-extra-apps-${PV} ) +" + +DEPEND="" + +PDEPEND=">=gnome-base/gvfs-1.30.2[udisks]" + +pkg_postinst() { + # Remember people where to find our project information + elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" + elog "for information about the project and documentation." +} diff --git a/gnome-base/gnome/gnome-3.24.0.ebuild b/gnome-base/gnome/gnome-3.24.0.ebuild new file mode 100644 index 000000000000..a02534c8d1ab --- /dev/null +++ b/gnome-base/gnome/gnome-3.24.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Meta package for GNOME 3, merge this package to install" +HOMEPAGE="https://www.gnome.org/" + +LICENSE="metapackage" +SLOT="2.0" # Cannot be installed at the same time as gnome-2 + +# when unmasking for an arch +# double check none of the deps are still masked ! +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="accessibility +bluetooth +classic +cdr cups +extras" + +S=${WORKDIR} + +# TODO: check accessibility completeness +RDEPEND=" + >=gnome-base/gnome-core-libs-${PV}[cups?] + >=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?] + + >=gnome-base/gdm-${PV} + + >=x11-wm/mutter-${PV} + >=gnome-base/gnome-shell-${PV}[bluetooth?] + + >=x11-themes/gnome-backgrounds-${PV} + x11-themes/sound-theme-freedesktop + + accessibility? ( + >=app-accessibility/at-spi2-atk-2.24 + >=app-accessibility/at-spi2-core-2.24 + >=app-accessibility/caribou-0.4.21 + >=app-accessibility/orca-${PV} + >=gnome-extra/mousetweaks-3.12.0 ) + classic? ( >=gnome-extra/gnome-shell-extensions-${PV} ) + extras? ( >=gnome-base/gnome-extra-apps-${PV} ) +" + +DEPEND="" + +PDEPEND=">=gnome-base/gvfs-1.30.2[udisks]" + +pkg_postinst() { + # Remember people where to find our project information + elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME" + elog "for information about the project and documentation." +} diff --git a/gnome-base/gnome/metadata.xml b/gnome-base/gnome/metadata.xml new file mode 100644 index 000000000000..77f5727ea19a --- /dev/null +++ b/gnome-base/gnome/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="classic">Install <pkg>gnome-extra/gnome-shell-extensions</pkg> + for the Gnome Shell Classic mode</flag> + <flag name="extras">Install additional GNOME applications</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest new file mode 100644 index 000000000000..29a2da0f49b0 --- /dev/null +++ b/gnome-base/gsettings-desktop-schemas/Manifest @@ -0,0 +1,9 @@ +DIST gsettings-desktop-schemas-3.22.0.tar.xz 598412 SHA256 0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1 SHA512 653198f78f8108222e84c0e94b6b914e03597234a627f1c205fc58a7bf54fdde073ff98cfdce1dccec7da1d8a7cbf648004cd392382d4ff617245cc3e581dfd1 WHIRLPOOL 90e6ca358f1fe0cfe6a28f7080b767ce490adb07c8cf40902dfe7eae87512e401ec40b9e0f84d9d6384391163f97dc8cf460881007ac7c550364a1b3331ace7b +DIST gsettings-desktop-schemas-3.24.0.tar.xz 620780 SHA256 f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90 SHA512 b19fb29da29a3fa114536c0ce94b160f9c589568b626e487b5eca008791e539de9a89a81c69e41f8070b0369e6cfc800fe8b70247ecbab1bc32f24db759037c1 WHIRLPOOL 1d2ee99a2aecc70918b8874dd043b82dc9b43856d349e22f11a8fb198f9b2d535ca049670663d988d9d072436a2ae81c015ab908405cf05ffeb27435204eb20e +DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 SHA256 76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833 WHIRLPOOL effa6117a749308cc5d5c281880b662b18e37c709f708070dcaec47824647d0100deb97d065bd5ffd131637c0f30b8419e4c9e128d0081098de3a99a0c8e63ca +EBUILD gsettings-desktop-schemas-3.22.0.ebuild 762 SHA256 03856fc1bf3b5508de972064fbc311b99d3bc210b20c9edf57deae32cacaeee9 SHA512 66a5ff681cec7c66941ce08292117c26d2314499f55daea0f87c95d3f4d73ae4c3e0ac166717bc793c9d4f9a03593c317b5c0ddbd065146b35992334a1c8e209 WHIRLPOOL 5b1ec0a723fc848dc223e4812bdb20a07cdab2ad93caffd233aa0be6ae1772452716333c67f82caefac94ff1b51bc8a11e53584fc4333b4fa775c70301dc8b1a +EBUILD gsettings-desktop-schemas-3.24.0.ebuild 771 SHA256 3d4559a1e17c3ffd77929d0959c774b1a07e1aad4b74c7d85268641b18f62780 SHA512 60ea82cc84d4574941718a501a4cc9e116f1612d33e27a650ac1f36059c4ede5826ec25b936f3d0559be6ad50105bc299e6099b0b94e080f68e1b750ba96b15d WHIRLPOOL 7929638f573586bb49b21896d2de0f331eee86f7f1afbc66ddaa398abbbaf29b55c88e12153747019889112a91de1f12a67a2d1426cbf24d3182b0dac46ce351 +EBUILD gsettings-desktop-schemas-3.24.1.ebuild 771 SHA256 3d4559a1e17c3ffd77929d0959c774b1a07e1aad4b74c7d85268641b18f62780 SHA512 60ea82cc84d4574941718a501a4cc9e116f1612d33e27a650ac1f36059c4ede5826ec25b936f3d0559be6ad50105bc299e6099b0b94e080f68e1b750ba96b15d WHIRLPOOL 7929638f573586bb49b21896d2de0f331eee86f7f1afbc66ddaa398abbbaf29b55c88e12153747019889112a91de1f12a67a2d1426cbf24d3182b0dac46ce351 +MISC ChangeLog 7762 SHA256 3f910f88647fb145faaf1506d0635395338b6ac2b24236f43afa1901522e86f5 SHA512 1bd52cfd85611d9703e91951aeadfe631d97fc1dd25fa6c6c04140b8390641e88153653cad7e11eeb777e4959d4da3d8d37384d55c91e088594afe6f149b7a97 WHIRLPOOL 53fdf7978ea8413920750a5a6069e46ebf6267a8c5ce9bde3dd9116dd75de0eda43e7d2eb652254623e9a14f0384e8dd67461143aeb5b2c557dce411f48d00af +MISC ChangeLog-2015 15527 SHA256 dfc76ba0c2ff92f72e6e5224e7d67be4d8c48ce47a7a1907bb3bf484310aea15 SHA512 6c4cad8bb7bfc3edd498faada42cefcaff94f871cb65cdb34a861e9b2a3130751f5838858f1a06a859bff20135e6c0d3f04f777ad80caeec09a7608e92ccfd23 WHIRLPOOL 406a6c70b46b874bf85d3bda9a46e8c7a93fcdff8ffb218dd92f9403053d7b7eb70e069669123b93be32eed98d9a672e966b7d638e8334fb6c717f481cf77ace +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild new file mode 100644 index 000000000000..66069286ce4f --- /dev/null +++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Collection of GSettings schemas for GNOME desktop" +HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="+introspection" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" + +RDEPEND=" + >=dev-libs/glib-2.31:2 + introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) + !<gnome-base/gdm-3.8 +" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.50.1 + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure $(use_enable introspection) +} diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.0.ebuild new file mode 100644 index 000000000000..a22fd1f8239a --- /dev/null +++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Collection of GSettings schemas for GNOME desktop" +HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="+introspection" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" + +RDEPEND=" + >=dev-libs/glib-2.31:2 + introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) + !<gnome-base/gdm-3.8 +" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.50.1 + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure $(use_enable introspection) +} diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild new file mode 100644 index 000000000000..a22fd1f8239a --- /dev/null +++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Collection of GSettings schemas for GNOME desktop" +HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="+introspection" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" + +RDEPEND=" + >=dev-libs/glib-2.31:2 + introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) + !<gnome-base/gdm-3.8 +" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.50.1 + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure $(use_enable introspection) +} diff --git a/gnome-base/gsettings-desktop-schemas/metadata.xml b/gnome-base/gsettings-desktop-schemas/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/gsettings-desktop-schemas/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest new file mode 100644 index 000000000000..f1ebd52b7c8c --- /dev/null +++ b/gnome-base/gvfs/Manifest @@ -0,0 +1,8 @@ +AUX gvfs-1.30.2-sysmacros.patch 525 SHA256 fff2f64e7c5c7f2f10e0ff54dc240ee8f06d9be98252c115661b67a67a9ab777 SHA512 9b06683ed3b8ceea1b330e86308c396581ab4c85aa22199ce92acad915bb28f0fed8997558c08b18cb9c5f1bab45e46a1365831acaf1c194e7134e185849dba2 WHIRLPOOL 7a161c9a22dc35f4cb451bbbe1c50f11d0ecf4ee2a604f3e7cd0dea454d0e424f9ee9017a20c348bd18eaefb50d8e51363f83ab08d589bfac30195a57372a1a4 +DIST gvfs-1.30.4.tar.xz 1895304 SHA256 981e0aca7f4e2e99860137f9fd99c335fa72a764156d253caf1069380a8e3afa SHA512 305b2abc8cfcb4bdea1fb84f5a7df4aac9697494f5d63d40ce1eb234b547aed497deb4d88a2cb17f9ab4fc188d49ff56033993a17cbfebae6d65a33dc84a633a WHIRLPOOL f945786e1a8476b7a01efe75138f5b2668d99fa85d8af2994826d2131e25650e504b7e4137ee26bf9aeafd878c6fe2891dd41762d0f84bd324b8f04e7537fcb2 +DIST gvfs-1.32.1.tar.xz 1813212 SHA256 d0b6c9edab09d52472355657a2f0a14831b2e6c58caba395f721ab683f836ade SHA512 7bd4d137437c1704faf6a9c2712bddcc327284e752c552c2cc18c64beb5e6d291af321e92d02d4f09b619762121129cee82c13ec2a4ca39d045196ebeeb28dd8 WHIRLPOOL 490fab2906896131711e5d8acc9c1a15bbd160b6b02c0472201ff5cc4cdc28c1be83e3603717b038c93e9d1406108aefe2afe1d06e194cf6db5466a8ff77f3b9 +EBUILD gvfs-1.30.4.ebuild 3682 SHA256 a5f1989ec37a9d870d647e8142657d26c5f940de0ed8858b76b321d1863a30a1 SHA512 e5698ae16fad71377b69a981ab420754be4303f36b8b18bd1687b2377469a215ae2a6eb75df5682c80dca4b682a7e9f48840247616d431b1b11a2b56048110ad WHIRLPOOL 788e0709f9270c745b4f12ca7e63d83bb0afc96a85fbc1ec5afdff56d0228932b9713fb8ce4fdb409af9e82c8e41d4f3db79e052c464a98125db4b8218a1312a +EBUILD gvfs-1.32.1.ebuild 3621 SHA256 5e48843d5995053d2f9be1b6e70af06ba2d03f151c6d1a0070ff021f5293bf68 SHA512 00057451a01ede2cc50c271bc14bfd53c50f3d56a2d386c0106b3550c0d577e7aca11e39568d02a3821e6695602b74e6c094d5798a809f3b1aa60005c46c989e WHIRLPOOL efa6a5eb1b5390f6f561805a38993096e6e82e48f5fa8af62f5d2f0e19cb73df9afe612d28252bbd55337f645f491cde98a634a115335c912098d2c9a56ebca2 +MISC ChangeLog 11424 SHA256 f50cd65af075e55bad38a4319bcdaeafe88ee858ff35d402fef04f1fcd3cf16a SHA512 217883bb24c348f8b217362b6decc09b50f04ac785b3c014eb92a625fbdba7cd843a6cef19df3418aba9ae41fa602ed98b22cd8dfb3a7385b1ef582ec8e04cf7 WHIRLPOOL 6813a1ecf53288b2a1179295e11258566c45f5d7541882ea92b9dbb7a23194034a9ad773c4c28ae5535176e7852eb62d7eabee1bffd33f3e8e54dd130ac7d3d5 +MISC ChangeLog-2015 41429 SHA256 1fd18b55991e259a363cbdf842fd93c98e61149a1cc6f9480919b7cf62b69c07 SHA512 f38436125d7f066644424a46631392d839b86b6db0f7d786e382f797efca1bc5f0336a9a1c1eef9fe75941f0424ad277bbd6462933c448637435753de9c44eea WHIRLPOOL 344fe2f5b3cd6290bd49cb23d061e31671217e1358c8e8bac315a8f8e2d0c6fb19a340f7f81c8ae3b368ad8e36b7c64d5076e057c15a38f3aabafae730d80baa +MISC metadata.xml 1542 SHA256 0f1cf1d46c6573378489147f87117ec280c31ba1f35ec49dbe6b4de4c80711d2 SHA512 f6576dfac41a515f2bf1918979e9f7927aea32f7cbd552c6f4f550e573556315eeda16f52262994ffe0ee305545f51845f101e7538e7a5e0f5745f3cc75201b9 WHIRLPOOL 2fd2253dadc101dbeeed35785c8b1db7f66500dd52c6597a81d094dbfb6a376782d37bb69c245e2dc4a16ebe3b882b4562a889cbdb765ab80907db0616f9d3ea diff --git a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch b/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch new file mode 100644 index 000000000000..b2d2a91f5a76 --- /dev/null +++ b/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch @@ -0,0 +1,21 @@ +https://bugzilla.gnome.org/show_bug.cgi?id=776532 +https://bugs.gentoo.org/580234 + +--- a/metadata/meta-daemon.c ++++ b/metadata/meta-daemon.c +@@ -27,6 +27,7 @@ + #include <glib/gstdio.h> + #include <locale.h> + #include <stdlib.h> ++#include <sys/sysmacros.h> + #include "metatree.h" + #include "gvfsdaemonprotocol.h" + #include "metadata-dbus.h" +--- a/metadata/metatree.c ++++ b/metadata/metatree.c +@@ -1,4 +1,5 @@ + #include "config.h" ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/mman.h> diff --git a/gnome-base/gvfs/gvfs-1.30.4.ebuild b/gnome-base/gvfs/gvfs-1.30.4.ebuild new file mode 100644 index 000000000000..dec41a2ad236 --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.30.4.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit autotools bash-completion-r1 gnome2 systemd + +DESCRIPTION="Virtual filesystem implementation for gio" +HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" + +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" +REQUIRED_USE=" + cdda? ( udev ) + google? ( gnome-online-accounts ) + mtp? ( udev ) + udisks? ( udev ) + systemd? ( udisks ) +" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +RDEPEND=" + app-crypt/gcr:= + >=dev-libs/glib-2.49.3:2 + sys-apps/dbus + dev-libs/libxml2:2 + net-misc/openssh + afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) + archive? ( app-arch/libarchive:= ) + bluray? ( media-libs/libbluray:= ) + fuse? ( >=sys-fs/fuse-2.8.0 ) + gnome-keyring? ( app-crypt/libsecret ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) + google? ( + >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] + >=net-libs/gnome-online-accounts-3.17.1:= ) + gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) + gtk? ( >=x11-libs/gtk+-3.0:3 ) + http? ( >=net-libs/libsoup-2.42:2.4 ) + ios? ( + >=app-pda/libimobiledevice-1.2:= + >=app-pda/libplist-1:= ) + mtp? ( >=media-libs/libmtp-1.1.12 ) + nfs? ( >=net-fs/libnfs-1.9.7 ) + policykit? ( + sys-auth/polkit + sys-libs/libcap ) + samba? ( >=net-fs/samba-4[client] ) + systemd? ( >=sys-apps/systemd-206:0= ) + udev? ( + cdda? ( dev-libs/libcdio-paranoia ) + virtual/libgudev:= + virtual/libudev:= ) + udisks? ( >=sys-fs/udisks-1.97:2 ) + zeroconf? ( >=net-dns/avahi-0.6 ) +" +DEPEND="${RDEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig + dev-util/gdbus-codegen + dev-util/gtk-doc-am + test? ( + >=dev-python/twisted-core-12.3.0 + || ( + net-analyzer/netcat + net-analyzer/netcat6 ) ) + !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) +" +# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043 +# test dependencies needed per https://bugzilla.gnome.org/700162 + +# Tests with multiple failures, this is being handled upstream at: +# https://bugzilla.gnome.org/700162 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234 +) + +src_prepare() { + if ! use udev; then + sed -e 's/gvfsd-burn/ /' \ + -e 's/burn.mount.in/ /' \ + -e 's/burn.mount/ /' \ + -i daemon/Makefile.am || die + + # Uncomment when eautoreconf stops being needed always + eautoreconf + fi + + gnome2_src_prepare +} + +src_configure() { + # --enable-documentation installs man pages + # --disable-obexftp, upstream bug #729945 + gnome2_src_configure \ + --disable-gdu \ + --disable-hal \ + --enable-bash-completion \ + --enable-documentation \ + --enable-gcr \ + --with-bash-completion-dir="$(get_bashcompdir)" \ + --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \ + --with-systemduserunitdir="$(systemd_get_userunitdir)" \ + $(use_enable afp) \ + $(use_enable archive) \ + $(use_enable bluray) \ + $(use_enable cdda) \ + $(use_enable fuse) \ + $(use_enable gnome-keyring keyring) \ + $(use_enable gnome-online-accounts goa) \ + $(use_enable google) \ + $(use_enable gphoto2) \ + $(use_enable gtk) \ + $(use_enable http) \ + $(use_enable ios afc) \ + $(use_enable mtp libmtp) \ + $(use_enable nfs) \ + $(use_enable policykit admin) \ + $(use_enable samba) \ + $(use_enable systemd libsystemd-login) \ + $(use_enable udev gudev) \ + $(use_enable udev) \ + $(use_enable udisks udisks2) \ + $(use_enable zeroconf avahi) +} diff --git a/gnome-base/gvfs/gvfs-1.32.1.ebuild b/gnome-base/gvfs/gvfs-1.32.1.ebuild new file mode 100644 index 000000000000..a105e360978f --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.32.1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit autotools gnome2 systemd + +DESCRIPTION="Virtual filesystem implementation for gio" +HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" + +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" +REQUIRED_USE=" + cdda? ( udev ) + google? ( gnome-online-accounts ) + mtp? ( udev ) + udisks? ( udev ) + systemd? ( udisks ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +RDEPEND=" + app-crypt/gcr:= + >=dev-libs/glib-2.51:2 + dev-libs/libxml2:2 + net-misc/openssh + afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) + archive? ( app-arch/libarchive:= ) + bluray? ( media-libs/libbluray:= ) + fuse? ( >=sys-fs/fuse-2.8.0:0 ) + gnome-keyring? ( app-crypt/libsecret ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) + google? ( + >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] + >=net-libs/gnome-online-accounts-3.17.1:= ) + gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) + gtk? ( >=x11-libs/gtk+-3.0:3 ) + http? ( >=net-libs/libsoup-2.42:2.4 ) + ios? ( + >=app-pda/libimobiledevice-1.2:= + >=app-pda/libplist-1:= ) + mtp? ( + >=dev-libs/libusb-1.0.21 + >=media-libs/libmtp-1.1.12 ) + nfs? ( >=net-fs/libnfs-1.9.8 ) + policykit? ( + sys-auth/polkit + sys-libs/libcap ) + samba? ( >=net-fs/samba-4[client] ) + systemd? ( >=sys-apps/systemd-206:0= ) + udev? ( + cdda? ( dev-libs/libcdio-paranoia ) + >=virtual/libgudev-147:= + virtual/libudev:= ) + udisks? ( >=sys-fs/udisks-1.97:2 ) + zeroconf? ( >=net-dns/avahi-0.6 ) +" +DEPEND="${RDEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig + dev-util/gdbus-codegen + dev-util/gtk-doc-am + test? ( + >=dev-python/twisted-core-12.3.0 + || ( + net-analyzer/netcat + net-analyzer/netcat6 ) ) + !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) +" +# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043 +# test dependencies needed per https://bugzilla.gnome.org/700162 + +# Tests with multiple failures, this is being handled upstream at: +# https://bugzilla.gnome.org/700162 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234 +) + +src_prepare() { + if ! use udev; then + sed -e 's/gvfsd-burn/ /' \ + -e 's/burn.mount.in/ /' \ + -e 's/burn.mount/ /' \ + -i daemon/Makefile.am || die + + # Uncomment when eautoreconf stops being needed always + eautoreconf + fi + + gnome2_src_prepare +} + +src_configure() { + # --enable-documentation installs man pages + # --disable-obexftp, upstream bug #729945 + gnome2_src_configure \ + --disable-gdu \ + --enable-documentation \ + --enable-gcr \ + --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \ + --with-systemduserunitdir="$(systemd_get_userunitdir)" \ + $(use_enable afp) \ + $(use_enable archive) \ + $(use_enable bluray) \ + $(use_enable cdda) \ + $(use_enable fuse) \ + $(use_enable gnome-keyring keyring) \ + $(use_enable gnome-online-accounts goa) \ + $(use_enable google) \ + $(use_enable gphoto2) \ + $(use_enable gtk) \ + $(use_enable http) \ + $(use_enable ios afc) \ + $(use_enable mtp libmtp) \ + $(use_enable mtp libusb) \ + $(use_enable nfs) \ + $(use_enable policykit admin) \ + $(use_enable samba) \ + $(use_enable systemd libsystemd-login) \ + $(use_enable udev gudev) \ + $(use_enable udev) \ + $(use_enable udisks udisks2) \ + $(use_enable zeroconf avahi) +} diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml new file mode 100644 index 000000000000..346074ac28ce --- /dev/null +++ b/gnome-base/gvfs/metadata.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<longdescription lang="en"> +gvfs is a userspace virtual filesystem designed to work with the i/o +abstractions of gio (a library availible in glib >= 2.15.1). It +installs several modules that are automatically used by applications +using the APIs of libgio. There is also fuse support that allows +applications not using gio to access the gvfs filesystems. +</longdescription> +<use> + <flag name="afp">Enables support for accessing AFP (Apple Filing Protocol) network shares</flag> + <flag name="archive">Enables support for accessing files in archives transparently via <pkg>app-arch/libarchive</pkg></flag> + <flag name="bluray">Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag> + <flag name="fuse">Enables fuse mount points in $HOME/.gvfs for legacy application access</flag> + <flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag> + <flag name="google">Enables support for accessing Google accounts via <pkg>dev-libs/libgdata</pkg></flag> + <flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup</pkg></flag> + <flag name="nfs">Enable NFS client support via <pkg>net-fs/libnfs</pkg>.</flag> + <flag name="udev">Enable udev base replacement code for cdda feature</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/libbonobo/Manifest b/gnome-base/libbonobo/Manifest new file mode 100644 index 000000000000..586fb7467e08 --- /dev/null +++ b/gnome-base/libbonobo/Manifest @@ -0,0 +1,5 @@ +DIST libbonobo-2.24.3.tar.bz2 1354929 SHA256 5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe SHA512 c97224ba2d4afc07e520399aa04849487a4ec4dd1b80b56e0472b4c3ebbddd0ce0105ba63ca2f823590788754791127dbe86b49cb39239db0019f8104db25716 WHIRLPOOL f6a2195d6dd2b79038621cca85037c8f490d6b900b180104e922745ebbb6ae23cbc2e7c52b67b14868ded7b0942284d85c60a5caf56a4ee4ac2ea20efc9ac977 +EBUILD libbonobo-2.24.3-r1.ebuild 1536 SHA256 53cc7eaed180a7877ff1da412e01bc48bc4041cbc630663790d35e2f92064902 SHA512 c7d376ee9959e9b885ac8cbd53a3029062ecd7f7093f9fddc5075e328cd529e5a5caa298c378c79507f5fe31a305087165681ddced153adbef1161b66bdf53cc WHIRLPOOL 6c80a907a35bc07ff24cdfb56e29d4056f498beeb593cc16e153731fd9252d85b513d772f80b438e922a147590599f39f3c37c80f4416cdd309764be4f07261f +MISC ChangeLog 2619 SHA256 57556c3680e20efc42a31a45b3c44105bf6a55d9f2cd59d3cea0079e6d4e472a SHA512 7b7edf57a37901e67b653cddce032f6fe1adc0473bf0482e6c040f359d0070e77363540f7abb982b0b7caaddbb23d3d9ca76d82966a0d10d316d3ac89d20f830 WHIRLPOOL e3c960d96423def24a5de84d7bdd5c999bcae2a5653d21959a657bdc569e11657cfc68475ad03fe99a7d40b0f52ee50b54157bb8dba26f801d1e533a5d330fcd +MISC ChangeLog-2015 25524 SHA256 4c1502ddf2f55574d98a569831295eecae3d53b10a56253993d933d7f9c36ae3 SHA512 3b0fc872e4ff2e7fda138548e4bb96e788bab33dab9f672b5d36bae198131d6d72816656239f2c864258be81b15c06b81484852f6acf132395e0bf6b7b03b7fd WHIRLPOOL 4237c250253bd38acadb359f956d796fe4700bd4cb78c1b849327594e0f2fe9fb8d3ee2d3f36a4b6023e7b1892b0948a72b70a4e544566bd2a3091c5b9d784a1 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild new file mode 100644 index 000000000000..4be2587ea505 --- /dev/null +++ b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit gnome2 + +DESCRIPTION="GNOME CORBA framework" +HOMEPAGE="https://developer.gnome.org/libbonobo/stable/" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="debug examples test" + +RDEPEND=" + >=dev-libs/glib-2.14:2 + >=gnome-base/orbit-2.14.0 + >=dev-libs/libxml2-2.4.20:2 + >=sys-apps/dbus-1.0.0 + >=dev-libs/dbus-glib-0.74 + >=dev-libs/popt-1.5 + !gnome-base/bonobo-activation +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + virtual/yacc + sys-devel/flex + x11-apps/xrdb + virtual/pkgconfig + >=dev-util/intltool-0.35 +" + +# Tests are broken in several ways as reported in bug #288689 and upstream +# doesn't take care since libbonobo is deprecated. +RESTRICT="test" + +src_prepare() { + # Fix intltoolize broken file, see upstream #577133 + sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die + + if ! use test; then + # don't waste time building tests, bug #226223 + sed 's/tests//' -i Makefile.am Makefile.in || die + fi + + if ! use examples; then + sed 's/samples//' -i Makefile.am Makefile.in || die + fi + + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure $(use_enable debug bonobo-activation-debug) +} + +src_test() { + # Pass tests with FEATURES userpriv, see bug #288689 + unset ORBIT_SOCKETDIR + emake check +} diff --git a/gnome-base/libbonobo/metadata.xml b/gnome-base/libbonobo/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/libbonobo/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/libbonoboui/Manifest b/gnome-base/libbonoboui/Manifest new file mode 100644 index 000000000000..caaec6377423 --- /dev/null +++ b/gnome-base/libbonoboui/Manifest @@ -0,0 +1,5 @@ +DIST libbonoboui-2.24.5.tar.bz2 976250 SHA256 fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd SHA512 163a8f39d9dad7fc3f1afc55b1a779961d285abe2988ff74bfcad4376e9dbfb91bb3e8212f96f48f91c54a6aff749ba6e00ea2d9add10c76b650f3072b875100 WHIRLPOOL 3713f466b6ef3e433fa2988654bc4569f87a51d704d007be2f71e02c720f30f17043b2097b6734b6a8d8f46ac45305815b392578753af1c6f62657c7575aea62 +EBUILD libbonoboui-2.24.5-r1.ebuild 1353 SHA256 612d162156bd09a311c90587cc66329f14a28c5179eac2b9e27c034fcc99bd99 SHA512 28e09e22b6161b90d4a4be92b8d25fb3c66cc36a1f94f45e288256b5c62a55f65fe9a6065e1320463e3c6e2c4a7ad79c7da0ccde8a7681a93f31e829e6457294 WHIRLPOOL bc6503c40f54274c8ad6be437e127e01c4ad462bf72170c9b5625465b12321be1dee16e34ff85b394a8f864bddab68b29e69044c403b40e372c920dc325a2d98 +MISC ChangeLog 2782 SHA256 3e31e4db77e25edfadf29e9f89bed6a0a0d50801d6d7de4bc81566b5cf6c04fb SHA512 b49ab36fe7f06f3d53b0f33a319fce171215e8565601492bb547a4b77521efb667c367e874b19ccdfd47c9de58ceb499ed3d4e4184a3d65b9eff187e006672b5 WHIRLPOOL 9de4c2a26ee4e182b814cc03213f793f2dd1f674ea0bb6b0d5a8f7fe78f26ab25bfcd84534670a529f77635aa89b1ea6dda7e24558499e34b38144f8f0e34467 +MISC ChangeLog-2015 26713 SHA256 82fa7873380b2ff93cd57820e061cd92bbe831035dd2fb03d85e65d9b1cb8488 SHA512 4eda53ec4ace5352c45a8c5d1e6e541f2ed940f3e411448c0537c86294eff68d6c96ae3e1a2278145dc6d6c2c71d7a4694911364bc0428a919000cbb21217704 WHIRLPOOL 2bf3d6548adca74891829b1164f97000473f2caaecd65f6a06e1460a2d4b07204883d43afb371af00eac1f6d1b227be318364f37b0df3e2edcfff3820a619296 +MISC metadata.xml 744 SHA256 d6cbf206717aeb6b74978b2fe79de6b98f12b14865d7ebe4679cc1d276d19237 SHA512 0f23ea97d68a4c46220dd395343aa63ed8351222f0c8aeeeefe9d9410a397522d7866f4600023653ac683513754480d92c7fffcd551d5f7987b2100ca2b5c370 WHIRLPOOL 5a02b6f544d8c272a4ddc856cab6a27bc85739310dfcff29b5c652e2dd9f7b2245bd156a6bf90c20281c34e7c25d7a1d21bad0d0266b4e35d990565574e74941 diff --git a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild new file mode 100644 index 000000000000..56b1c70caca9 --- /dev/null +++ b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit eutils gnome2 virtualx + +DESCRIPTION="User Interface part of libbonobo" +HOMEPAGE="https://developer.gnome.org/libbonoboui/" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="examples test" + +# GTK+ dep due to bug #126565 +RDEPEND=" + >=gnome-base/libgnomecanvas-1.116 + >=gnome-base/libbonobo-2.22 + >=gnome-base/libgnome-2.13.7 + >=dev-libs/libxml2-2.4.20:2 + >=gnome-base/gconf-2:2 + >=x11-libs/gtk+-2.8.12:2 + >=dev-libs/glib-2.6.0:2 + >=gnome-base/libglade-1.99.11:2.0 + >=dev-libs/popt-1.5 +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + x11-apps/xrdb + sys-devel/gettext + virtual/pkgconfig + >=dev-util/intltool-0.40 +" + +src_prepare() { + if ! use test; then + # don't waste time building tests + sed 's/tests//' -i Makefile.am Makefile.in || die "sed 1 failed" + fi + + if ! use examples; then + sed 's/samples//' -i Makefile.am Makefile.in || die "sed 2 failed" + fi + + gnome2_src_prepare +} + +src_configure() { + addpredict "/root/.gnome2_private" + gnome2_src_configure --disable-static +} + +src_test() { + addpredict "/root/.gnome2_private" + Xemake check +} diff --git a/gnome-base/libbonoboui/metadata.xml b/gnome-base/libbonoboui/metadata.xml new file mode 100644 index 000000000000..561f51608528 --- /dev/null +++ b/gnome-base/libbonoboui/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<longdescription> + computer. It will however make a snappier openoffice than the binary version. + The Bonobo UI library provides a number of user interface controls using the + Bonobo component framework. This module is heading towards planned deprecation. + It will continue to be supported and API/ABI stable throughout the GNOME 2.x + series, but we do not recommend using it in new applications unless you require + functionality that has not already been moved elsewhere. +</longdescription> +</pkgmetadata> diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest new file mode 100644 index 000000000000..132e99c47956 --- /dev/null +++ b/gnome-base/libglade/Manifest @@ -0,0 +1,9 @@ +AUX Makefile.in.am-2.4.2-xmlcatalog.patch 1121 SHA256 a2132d94f5b5e234b905f4a629c1a3c54cf93fbd4a6dc791f5699a731c41a0fb SHA512 9b183d34df84e3bc4eb8e4484ed59a40d54b4fb33b5f2208e13cd4619bcdacd0276a339d9020505764cb0a99fd83255199eda53b48979656b81850144993be86 WHIRLPOOL b7f8c3901b357b13eba491556de07d7982ae5c4936f4dc0bc635797b925b6988ac3991677be5ea05013ae77239265061ea9b58d84873e4f65cabea856896f460 +AUX libglade-2.6.3-fix_tests-page_size.patch 369 SHA256 97342a2d5bdf561d145950f5609d96a097ed2903e6c229f671b15d7d704248f2 SHA512 b294e48205725b4c3adc81fc86e28fd49bd902871eee64f21d4c3d14d1c9f65fd98e17aee99c39146d6fb7c128f3669e2bc99523240466c49e271912c20da35d WHIRLPOOL 63f9ac7e0858bca6f585921eee1a88ba4433de93b17ea94572e2df35cecf23caef947d431b951807888088e4b6c0b1f8b4e3b5f37439c4517d068b8bb11d7aa3 +AUX libglade-2.6.4-enable-extensions.patch 225 SHA256 cd9ae2d1d915c08cf81533e5e4b283bdd04c04e45d1f6bc8e246c95fa51ebdf1 SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde WHIRLPOOL f8ea8bc95f035872657d848e8a853f0237e6fb47329b21aaa99851c60f17caa6973c77a1d1c09fb4b79f231894f2015c5c9c8925dba1b570e1c0f7b1834190c9 +AUX libglade-2.6.4-gold-glib-2.32.patch 544 SHA256 daa5e196cf17b4f046dffdc7e04e108b155f78b3788763ef619d121eada6a819 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8 WHIRLPOOL 117d514b7b8787dd0b8ded72c92e4c82c39d4429dbcf041250835e566afcb3adb1dea4ffec6d55d05f2f3f10b3fb942a9e6c9b9ab42ca7af43179fb83f6b351d +DIST libglade-2.6.4.tar.bz2 356119 SHA256 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735 WHIRLPOOL d416c3c0cb43c59b521abb3f0283061f2d7fae521980cafc95bc5d578b3ef551821f7d88ccf26b48de16f2568b29a1d5610d74ff7302363ea5a173ab189a5878 +EBUILD libglade-2.6.4-r2.ebuild 3025 SHA256 5e10e879704bad33af33f43f226cfe4b38779f68011e87c6bb8d77e7c633a076 SHA512 510e33202e1f94cc5c3ff6a099bc563d36464e2a62ab62fcc58f5e52132304b8aa6aba0fe50416cc89605f3753b9811f273065dbf823cd9b6d80b9047dbae227 WHIRLPOOL 3f11c7ed75b322115daad461fa56c20032f2371d687a3525b588006aef2621abc2b5c59cd0ab0b114808cfb1059749f01462e08b52fd6cde0977d9e9ee0b729b +MISC ChangeLog 3199 SHA256 2eda9fe0a8165c544d9863396cc02243bcc2389d45d34e9f482d81d1f5d7993e SHA512 b443b65fa673f941d6aa63c31bff2aa35aa1b16e8a073ca34dc5f2be1f8c9a57cdde5f4012f005db26d10ea1a5ac5a443987c0d3fa690862043ffd9d86276458 WHIRLPOOL 1f1785677e4a36ca061a3a12701b6f474313fa41dde6854f5f1a54b5c6462f535e1fc1ac8844d7ca84e0962dd1b7aff6766c742f0bd00056a102797176862806 +MISC ChangeLog-2015 20386 SHA256 bde8c1c75c6b97ef1ad8f4bc536ae1845077bcbba111eddc7aea7acf86771d4a SHA512 47fc63652283d77e2bd4126154a0bc1cf822b065f1acca511088d4b5cd8468c8e61e67e6c14c89e266d9b4e57035aeb255e1a45d2b1ac6d68dfea40b69dfee98 WHIRLPOOL 0536c3692b6509c18929695f734304aa919af61ff9ee6277c74c4e739abe5108e30aa5fb519a20fea98362d22b42a5a53708944e5dde98c05df95e8ffbf7806b +MISC metadata.xml 336 SHA256 83600ef30e596b8b301834905f7e593ab1592841cd68521121f2418b4f0a3cd0 SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3 WHIRLPOOL b7ecfde50c5fa10a57300b5c1b8e96d23aa351e2ddfbdd6ad609d4ffe5ff8b408dbbc8872cee607b2a8c6f110e021d0641e1baf797910cec71ff8824bd0ada35 diff --git a/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch new file mode 100644 index 000000000000..059cdc20f794 --- /dev/null +++ b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch @@ -0,0 +1,22 @@ +--- a/Makefile.am 2004-11-11 18:56:13.000000000 +0800 ++++ b/Makefile.am 2004-12-06 11:00:24.501734048 +0800 +@@ -24,7 +24,7 @@ + + if HAVE_XMLCATALOG + install-data-local: +- -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) ++# -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) + uninstall-local: + -$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) + endif +--- a/Makefile.in 2004-11-11 19:21:38.000000000 +0800 ++++ b/Makefile.in 2004-12-06 11:00:49.786890120 +0800 +@@ -819,7 +819,7 @@ + + + @HAVE_XMLCATALOG_TRUE@install-data-local: +-@HAVE_XMLCATALOG_TRUE@ -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) ++@HAVE_XMLCATALOG_TRUE@# -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) + @HAVE_XMLCATALOG_TRUE@uninstall-local: + @HAVE_XMLCATALOG_TRUE@ -$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) + diff --git a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch new file mode 100644 index 000000000000..37c5b69e544c --- /dev/null +++ b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch @@ -0,0 +1,11 @@ +--- a/tests/test-libglade-gtk.glade 2008-09-27 16:50:40.164242312 +0300 ++++ b/tests/test-libglade-gtk.glade 2008-09-27 16:50:43.460908927 +0300 +@@ -470,7 +470,7 @@ + <upper>100</upper> + <step>1</step> + <page>10</page> +- <page_size>10</page_size> ++ <page_size>0</page_size> + <child> + <left_attach>1</left_attach> + <right_attach>2</right_attach> diff --git a/gnome-base/libglade/files/libglade-2.6.4-enable-extensions.patch b/gnome-base/libglade/files/libglade-2.6.4-enable-extensions.patch new file mode 100644 index 000000000000..9be8fb93bf84 --- /dev/null +++ b/gnome-base/libglade/files/libglade-2.6.4-enable-extensions.patch @@ -0,0 +1,14 @@ +AC_USE_SYSTEM_EXTENSIONS needed for Solaris + +https://bugs.gentoo.org/show_bug.cgi?id=430090 + +--- a/configure.in ++++ b/configure.in +@@ -22,6 +22,7 @@ + fi + + AC_PROG_CC ++AC_USE_SYSTEM_EXTENSIONS + AC_ISC_POSIX + AC_HEADER_STDC + diff --git a/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch b/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch new file mode 100644 index 000000000000..0696dce58760 --- /dev/null +++ b/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch @@ -0,0 +1,17 @@ + configure.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index e0c52a8..b2a4a4a 100644 +--- a/configure.in ++++ b/configure.in +@@ -46,7 +46,8 @@ PKG_CHECK_MODULES(LIBGLADE, [dnl + libxml-2.0 >= required_libxml_version dnl + atk >= required_atk_version dnl + gtk+-2.0 >= required_gtk_version dnl +- glib-2.0 >= required_glib_version]) ++ glib-2.0 >= required_glib_version dnl ++ gmodule-no-export-2.0 >= required_glib_version]) + + AC_MSG_CHECKING([for native Win32]) + case "$host" in diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild new file mode 100644 index 000000000000..501e0d7be4c9 --- /dev/null +++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +GCONF_DEBUG="no" +GNOME_TARBALL_SUFFIX="bz2" +GNOME2_LA_PUNT="yes" + +PYTHON_COMPAT=( python2_7 pypy ) +PYTHON_REQ_USE='xml(+)' + +inherit autotools eutils gnome2 multilib-minimal python-single-r1 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs test tools" +REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )" + +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}] + tools? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND} + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" +RDEPEND="${RDEPEND} + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r2 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + )" + +pkg_setup() { + use tools && python-single-r1_pkg_setup +} + +src_prepare() { + # patch to stop make install installing the xml catalog + # because we do it ourselves in postinst() + epatch "${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 + epatch "${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 + epatch "${FILESDIR}/${P}-gold-glib-2.32.patch" + + # Needed for solaris, else gcc finds a syntax error in /usr/include/signal.h + epatch "${FILESDIR}/${P}-enable-extensions.patch" + + sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ + glade/Makefile.am glade/Makefile.in || die + + if ! use test; then + sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed" + fi + + gnome2_src_prepare + AT_NOELIBTOOLIZE=yes eautoreconf +} + +multilib_src_configure() { + if ! multilib_is_native_abi || ! use tools; then + export am_cv_pathless_PYTHON=none + fi + + 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() { + Xemake 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/libglade/metadata.xml b/gnome-base/libglade/metadata.xml new file mode 100644 index 000000000000..be1a70fa45d5 --- /dev/null +++ b/gnome-base/libglade/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="tools">Install libglade-convert Python script.</flag> + </use> +</pkgmetadata> diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest new file mode 100644 index 000000000000..3ab573db2c19 --- /dev/null +++ b/gnome-base/libgnome-keyring/Manifest @@ -0,0 +1,6 @@ +DIST libgnome-keyring-3.12.0.tar.xz 435092 SHA256 c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd WHIRLPOOL 8494913559cf057a77457bdafdff90099075421e88fa247e0215bd0dbb3f79ef41552c5825cfb99857b4f1bf9bc9d677facca779f9d6ed0892eabe9291e0d9a5 +EBUILD libgnome-keyring-3.12.0-r1.ebuild 1735 SHA256 ed2c4c433d1a1b74844c18174ca29801c08786895cedbc42114c3298808b2c2f SHA512 cefa90b703ff4d9b673be7a2e472095ec68e0bc319239f5827d3cd80f34523b17d564ef1779d9e0b00d97c925a6d81a663d694373e6dffb14cd618170366d012 WHIRLPOOL f0a3199a5f825dd3ff3b87513522ce137f89dd893ed7cbffe51d5e382809a8b951cdcc7dacc0c107ecede6b47326193917b3e6a3c07c2ea75dcd2dd9ce053200 +EBUILD libgnome-keyring-3.12.0.ebuild 1414 SHA256 2624013e4981abf60cfbc5023aa114571358e14428bd17c26b3b975220134a97 SHA512 a8040b8b5358dbe9861c8c515ae0bedb4ba5b93a5d15a77526f988ab856c2548e409e0b8b8b3daf34444bea0dfc7f7ee1db5075a44d8da19a77f6882c915c412 WHIRLPOOL fb3741703225f2e946b633c948c4b002b03603f50bd65bddf4ea2d37f27c1117fe7b1d72e51fd7edfcc811f0669b829097a24fc5cdffd30dcc435540e580d0f7 +MISC ChangeLog 2921 SHA256 e6f16bdf5cfa7b3b1ed987f19a26945af47559977b417dfaa2462669bbfb6303 SHA512 c082b0af25702eabca23d551699a708f4ae8bf66b8e74e8a384ddb5461c2d50026233cfb6541518656cceca54272ef6006a3b2c23290c6e83a31159a9ee61bc4 WHIRLPOOL f76df2e9552c7759e5c2e6118f406e5e704c66f13e5d496e20224acab3511dfc9ab23edf9b044e56ff916ab25988853adbd7153f903f6919e2fbae03531964ed +MISC ChangeLog-2015 10306 SHA256 ef98c776eb487f0fbcf93611ae9f4712b6314d4cd617bcc8edbec624f0615113 SHA512 6da704e6221847cdbd2649bad119df04b9023c6dfbc0898f4e510e1ae675dd3aa9ba880aa798ab055d5e0cf31c34e67261d36b27c060a95a313fb74f211444ad WHIRLPOOL 5c1d612955b859f592f06a3bfefc4997afee3c6a69d5950868a5a1a96fe1ba635140565e57262270899c3c29c7e13c1ab7fef6333c9658236c4f706164fd10ed +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild new file mode 100644 index 000000000000..29ae1c06bbd9 --- /dev/null +++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" +VALA_MIN_API_VERSION="0.16" +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python2_7 ) + +inherit gnome2 python-any-r1 vala multilib-minimal + +DESCRIPTION="Compatibility library for accessing secrets" +HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" + +LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2 +SLOT="0" +IUSE="debug +introspection test vala" +REQUIRED_USE="vala? ( introspection )" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris" + +RDEPEND=" + >=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}] + >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] + >=sys-apps/dbus-1[${MULTILIB_USEDEP}] + >=gnome-base/gnome-keyring-3.1.92 + introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + >=dev-util/intltool-0.35 + sys-devel/gettext + virtual/pkgconfig + test? ( ${PYTHON_DEPS} ) + vala? ( $(vala_depend) ) +" + +src_prepare() { + use vala && vala_src_prepare + gnome2_src_prepare + + # FIXME: Remove silly CFLAGS, report upstream + sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \ + -e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \ + -i configure.ac configure || die "sed failed" +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" gnome2_src_configure \ + $(multilib_native_use_enable vala) + + if multilib_is_native_abi; then + ln -s "${S}"/docs/reference/gnome-keyring/html docs/reference/gnome-keyring/html || die + fi +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_test() { + unset DBUS_SESSION_BUS_ADDRESS + dbus-launch emake check || die "tests failed" +} diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild new file mode 100644 index 000000000000..29881bdad1ba --- /dev/null +++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" +VALA_MIN_API_VERSION="0.16" +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python2_7 ) + +inherit gnome2 python-any-r1 vala + +DESCRIPTION="Compatibility library for accessing secrets" +HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" + +LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2 +SLOT="0" +IUSE="debug +introspection test vala" +REQUIRED_USE="vala? ( introspection )" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris" + +RDEPEND=" + >=dev-libs/glib-2.16.0:2 + >=dev-libs/libgcrypt-1.2.2:0= + >=sys-apps/dbus-1 + >=gnome-base/gnome-keyring-3.1.92 + introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + >=dev-util/intltool-0.35 + sys-devel/gettext + virtual/pkgconfig + test? ( ${PYTHON_DEPS} ) + vala? ( $(vala_depend) ) +" + +src_prepare() { + use vala && vala_src_prepare + gnome2_src_prepare + + # FIXME: Remove silly CFLAGS, report upstream + sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \ + -e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \ + -i configure.ac configure || die "sed failed" +} + +src_configure() { + gnome2_src_configure $(use_enable vala) +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + dbus-launch emake check || die "tests failed" +} diff --git a/gnome-base/libgnome-keyring/metadata.xml b/gnome-base/libgnome-keyring/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/libgnome-keyring/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest new file mode 100644 index 000000000000..efd3ff4f1c83 --- /dev/null +++ b/gnome-base/libgnome/Manifest @@ -0,0 +1,8 @@ +AUX libgnome-2.26.0-branding.patch 839 SHA256 b7bfd8ea5a29e860d291abd3866ade0a0fa4d6bd9538c8cd7c2b2f6afd2b473a SHA512 de12f680f875ade002c752ea6595969b2948196299d3807592bb014ade59c51093e1d19f56d2f69fe381fece037a48c7dcb44c632ddc19128959db1dec54f473 WHIRLPOOL bc3836c4d7b2fa63596adab64b4c35819c8a09fddfed0d00c82ab7ef5063d9a98a66d5e3e64ed100d3421fd7c4551ea02f2adecd1e4744a4ab0ecce6eac5c1ce +AUX libgnome-2.28.0-menus-have-icons.patch 538 SHA256 55cba8a533b509bf2ae20b7679f4502f3b240f08caf976f99240f57acd111d75 SHA512 4897bd5497fd9cfbf778ab7c815028e5b819d1c1f69d2ad9bedb0f5895e8c7b7b40a918436026e494c83238c694145670046a0d0beeda31c5820bed5867eb1d2 WHIRLPOOL e6d120e7a76b6e7764f75686aea42f6d9ca08b6af24e01d61a29cbbe18e5eade04329b6074b0826b3576e81f2fa39818d0f812c21ad158070a018feb246452c0 +DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42 +DIST libgnome-2.32.1.tar.bz2 1776006 SHA256 b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4 SHA512 f94e603255a93e73249e0fd9ed5604d732b44ad46f3cc3065afb46fc6162f6cf29304f49440b5c06303b8e68608b6fd16236076813febb5f1cbdcde4bfc3b3e3 WHIRLPOOL b5d04cbbbf7064fdd6ccf6e140ac89285c585a82a66687fc9ce3ec5d74f50ec52d52416fadfa34bb79946c99188aa3bf6aa0b7d597c8d3d526f6938c74f602a6 +EBUILD libgnome-2.32.1-r1.ebuild 1662 SHA256 2c131be02c82924eb784618b5b87a6e336a1b707bd9beb98994bc116a91ebdfc SHA512 eb5f695ad155c6c94b90969ac4fd07e9b9ce36bdba8d0feabdebb3f80289ffa39372999427fde31ca0bb40242aa97b8c73b87fe07806d5bde62b7a6928e294e7 WHIRLPOOL 124c551bfc113c6b2f54980b076bf79043b4f8eab6c53856821e8fa7d23f11af4f0777af83015215ea836aec4cf670dff5cc0e6422abce75d7c053294bae601b +MISC ChangeLog 2705 SHA256 fdbdca3bce134344ca7272b49cadcbb8cecc42149fdf7fae05645c2069543056 SHA512 fcc7fb6ea0b65419a5cec3a2838101e8cd5fd8a4f12f3293055686e8f3fc837d4a4b52f833ac689b418ddb9aa169303664bef902021422b65791a815343a0497 WHIRLPOOL e7ba165865e93b41697843e5768547e7ab3874dae5164e9aff85adf14152e123b4155bfa3370442c7916021ec8be82e13b4d34f7976920b8fa6c1cec69004e67 +MISC ChangeLog-2015 26756 SHA256 642548ce354a38a9ad5d160f73362f79bc9e5b3ba1e583df195088723e4e55ce SHA512 e0385fcb126cf8ae60517b52a776a4e6e6bcd28433bb9d394f7c140d460f7662a7db41bf67d9185803dafa7ac93a57c8bd3e39388ff843f93e533f53f62c25fb WHIRLPOOL f02575572f4284be3276bad11c288f3ef06a2b178b2a7054fc449cb06459beab1bdac166633a8329a50760127ccac5e40a503f401e96d5280929056551c55787 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch b/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch new file mode 100644 index 000000000000..2cab351e6b23 --- /dev/null +++ b/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch @@ -0,0 +1,12 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgnome-2.26.0.orig/schemas/desktop_gnome_background.schemas.in.in libgnome-2.26.0/schemas/desktop_gnome_background.schemas.in.in +--- libgnome-2.26.0.orig/schemas/desktop_gnome_background.schemas.in.in 2009-03-17 10:42:05.000000000 -0400 ++++ libgnome-2.26.0/schemas/desktop_gnome_background.schemas.in.in 2009-04-24 14:57:59.000000000 -0400 +@@ -29,7 +29,7 @@ + <applyto>/desktop/gnome/background/picture_filename</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default> ++ <default>@datadir@/pixmaps/backgrounds/gnome/gentoo/gentoo-emergence.png</default> + <locale name="C"> + <short>Picture Filename</short> + <long>File to use for the background image.</long> diff --git a/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch b/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch new file mode 100644 index 000000000000..7249696a7301 --- /dev/null +++ b/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch @@ -0,0 +1,15 @@ +Upstream changed default to no icons for menus. We don't want that. No one wants +that. + +--- +--- schemas/desktop_gnome_interface.schemas.in.in ++++ schemas/desktop_gnome_interface.schemas.in.in +@@ -65,7 +65,7 @@ + <applyto>/desktop/gnome/interface/menus_have_icons</applyto> + <owner>gnome</owner> + <type>bool</type> +- <default>false</default> ++ <default>true</default> + <locale name="C"> + <short>Menus Have Icons</short> + <long>Whether menus may display an icon next to a menu entry.</long> diff --git a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild new file mode 100644 index 000000000000..d26add359071 --- /dev/null +++ b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit gnome2 eutils + +DESCRIPTION="Essential Gnome Libraries" +HOMEPAGE="https://library.gnome.org/devel/libgnome/stable/" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="branding" + +SRC_URI="${SRC_URI} + branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )" + +RDEPEND=" + >=gnome-base/gconf-2 + >=dev-libs/glib-2.16:2 + >=gnome-base/gnome-vfs-2.5.3 + >=gnome-base/libbonobo-2.13 + >=dev-libs/popt-1.7 + media-libs/libcanberra +" +DEPEND="${RDEPEND} + >=dev-lang/perl-5 + dev-util/gtk-doc-am + >=dev-util/intltool-0.40 + virtual/pkgconfig +" + +PDEPEND="gnome-base/gvfs" + +src_prepare() { + # Make sure menus have icons. People don't like change + epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch" + + use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch + + # Default to Adwaita theme over Clearlooks to proper gtk3 support + sed -i -e 's/Clearlooks/Adwaita/' schemas/desktop_gnome_interface.schemas.in.in || die + + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --disable-static \ + --enable-canberra \ + --disable-esd +} + +src_install() { + gnome2_src_install + + if use branding; then + # Add gentoo backgrounds + dodir /usr/share/pixmaps/backgrounds/gnome/gentoo + insinto /usr/share/pixmaps/backgrounds/gnome/gentoo + doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png + doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png + fi +} diff --git a/gnome-base/libgnome/metadata.xml b/gnome-base/libgnome/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/libgnome/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest new file mode 100644 index 000000000000..54cceed66bb5 --- /dev/null +++ b/gnome-base/libgnomecanvas/Manifest @@ -0,0 +1,5 @@ +DIST libgnomecanvas-2.30.3.tar.bz2 574139 SHA256 859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40 SHA512 b5bfa2133f5172abd5228d467db4d980dd4ac125cdbf55dcc1d5055dc3330861320c12cccb52ea63ba7f69824504c9d25781cd78001dc7a92b11c6f7e0c550de WHIRLPOOL a39e49ec6789588fec045501b8b9d72b9de16d86f4abf87a120768152edcf3e396f2c9db1c3b2126c3cc6644cda3bd16be099078094563a2ee352a99b9eeb9a8 +EBUILD libgnomecanvas-2.30.3-r1.ebuild 1680 SHA256 4c38c7df7f238854fc51d0c733cb7860619da3562f75430c9b60b03d7aeedb56 SHA512 03257888693cd0379c578cde5ced0ff6f04c43358623b396367de8480289205f7075d87a39aebf9a64ba8d053bf7beff1b52cbca56911d4c69aa5dcb56906669 WHIRLPOOL 5f1add5107314f704e1a57dddc65a65bb0deedbe0b34105c44b36f65c53dee3e2794370e3fb1834753f284fd8249d06e242c261bb6c2b5d9dba1d264e8d1826d +MISC ChangeLog 3034 SHA256 5735f34e84ee6680c362cd87ddcc27aa42be548ba19cccbf727246694076d56f SHA512 58a9123e6f69403803b8658e6ae3ff450a7fed9a9aa630e08c67c3fac650c402b2c5ca709695527f446b1d6112eb7d5221c665bd1e9dbfebed74d47fb4f54810 WHIRLPOOL 8efb90a50ba71079009d5f0561742452a27103bd80344b16ee47c72a0f8a24e7f3a3ab9d209a7c61228031a3cd896c5c200ceb2a8d0f204ee383f85b9c047bc3 +MISC ChangeLog-2015 19593 SHA256 35f2f9b5611ad6a4268478388bee43d6e16638072a70f4047c3fd0d7f182b82a SHA512 0ccbe99717f07f20dde3f1e4771d3125adf5fc57e9fd8e18628b75e008857d7a1869d5fe4c443490b9f55e0576c554177ab3e01c02b06f33be3f83ec62745ae2 WHIRLPOOL c9343d99daf1ad1e2dbed89e0043af1962f21f0f5c29528479827a7f1785c47ebd498ab029689ac4217c6665c854ac733a046f561f99cf5d8444777f59f4da7c +MISC metadata.xml 310 SHA256 0bb60632efb2686cb9f133383a5163e7010e8f134a9a7da89cdd10aaa8dc45e8 SHA512 15504f6f0f8ba8e905677b293df85f64ec929c96b22a81a57803c47657a0f054039a1257086c02af49ab89a57b16d31d32619ccdf1f53ac2de93ce8fc2f99c12 WHIRLPOOL 529e4f0c9a70501e434a59e7412a38c4f9c8df9bc8466c5d47a99a7e82ca15f138aace7283957438aea299a035d6d27bff621f6b3f661cb4ecfc42dfd05cac4c diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild new file mode 100644 index 000000000000..0f5756bec03a --- /dev/null +++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="no" +GNOME_TARBALL_SUFFIX="bz2" +GNOME2_LA_PUNT="yes" + +inherit gnome2 multilib multilib-minimal virtualx + +DESCRIPTION="The Gnome 2 Canvas library" +HOMEPAGE="https://library.gnome.org/devel/libgnomecanvas/stable/" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="glade" + +RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] + >=media-libs/libart_lgpl-2.3.21-r2[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] + glade? ( >=gnome-base/libglade-2.6.4-r1:2.0[${MULTILIB_USEDEP}] )" + +DEPEND="${RDEPEND} + >=dev-lang/perl-5 + sys-devel/gettext + >=dev-util/intltool-0.35 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +src_prepare() { + gnome2_src_prepare + + # Fix intltoolize broken file, see upstream #577133 + sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ + || die "sed failed" + + # Don't build demos that are not even installed, bug #226299 + sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "sed 2 failed" +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + $(use_enable glade) \ + --disable-static + + ln -s "${S}"/docs/reference/html docs/reference/html || die +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog NEWS README" + einstalldocs +} + +multilib_src_test() { + Xemake check || die "Test phase failed" +} diff --git a/gnome-base/libgnomecanvas/metadata.xml b/gnome-base/libgnomecanvas/metadata.xml new file mode 100644 index 000000000000..d616878c0e84 --- /dev/null +++ b/gnome-base/libgnomecanvas/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="glade">Enable glade support</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest new file mode 100644 index 000000000000..65b68c3eeae0 --- /dev/null +++ b/gnome-base/libgnomekbd/Manifest @@ -0,0 +1,5 @@ +DIST libgnomekbd-3.22.0.1.tar.xz 450572 SHA256 4efdb6b8ec92f04caced710b5edb285fb27715059ed6ca5e100b6933999a93de SHA512 a4d2e6feac18cb7e3a65553dcd587f284c71154d3058866b0b6285b1acca549d33d0bd0014a97f1e153eb5e2a5a16e8b18eb680ce0078edd80bdd68a51ac080e WHIRLPOOL 411e5c8180f7c87bc19df050ea817db2998ea35a15baa04f7ebfee28887401bbe0c87dc9f91f123a9b90cd0bd070d69e8a32beea188b53d42d108410deacb04d +EBUILD libgnomekbd-3.22.0.1.ebuild 769 SHA256 bbfba14a8d7dcf4e41093d219e251d402894b25b74f7d167d76db602c5d6634f SHA512 ababe33db7a72c81d17918291107e28a402b82adcff386d593468f67218b96b9017881dca47c733dcc0223ae5d977059787907c356161c2032197458ff30cf96 WHIRLPOOL 890076d93809e84bc303c214e7b3526fe72ead9267a4a3d1528abe727e82adb384bf9fdbe31956f5db3d095f4fe6f5b46aa21a40f8f984a9f341e65870deb580 +MISC ChangeLog 2807 SHA256 a51c4c0e9f857d2f10af56635ded1d054190b653b4aab76ddb45c180f6fda5cc SHA512 0effdfa51e152fa7cfcbe2e6433ad3f1bad84115b6b4225debac852c281fe86183225532fe4d9991c011a242f3726890339d6e0ce4767118a2c76e6a460c987e WHIRLPOOL 44b87f791230674883ed8b3bc086524da8dcb924309195eca27ed457f2961fad759c642232026ad3e75962ee20c7517a2ef5b2d0e5431e1a5b389eac37065db5 +MISC ChangeLog-2015 14936 SHA256 0c8ed85053fa618a94463085f730005ceb7ffe59657d2fac679b93c91bff71ab SHA512 776e1a2b8ee8c4e5b8f52be94a67baa48485dffab372fba1336fd9bd3fbf726996e13b5381fdf8fe609a23d6be89ca226ad8ca825e21baee0ce6e2ead4031fe3 WHIRLPOOL d0088b48a49d4f7915ed5c917b3c18b6c06973f6a4d331b279fb2266efd6e9ce1705dea7bf98b0893ed59dcd469b821735978dd54e58c154bef415f459f82810 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild new file mode 100644 index 000000000000..afe2aff53cac --- /dev/null +++ b/gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2 + +DESCRIPTION="Gnome keyboard configuration library" +HOMEPAGE="https://www.gnome.org" + +LICENSE="LGPL-2+" +SLOT="0/8" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="+introspection test" + +RDEPEND=" + >=dev-libs/glib-2.18:2 + >=x11-libs/gtk+-2.91.7:3[X,introspection?] + >=x11-libs/libxklavier-5.2[introspection?] + + introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) +" +DEPEND="${RDEPEND} + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure \ + --disable-static \ + $(use_enable introspection) \ + $(use_enable test tests) +} diff --git a/gnome-base/libgnomekbd/metadata.xml b/gnome-base/libgnomekbd/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/libgnomekbd/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/libgnomeprint/Manifest b/gnome-base/libgnomeprint/Manifest new file mode 100644 index 000000000000..c6ea0cdf0572 --- /dev/null +++ b/gnome-base/libgnomeprint/Manifest @@ -0,0 +1,9 @@ +AUX libgnomeprint-2.18.8-bison3.patch 861 SHA256 f90696e4ee1f4fb49bd3a3fe62e3443efef6f4918aeaf7586cab692a035463c3 SHA512 c13f2c5618bf28047e80155ed6d391930c5c986f4640d1e83aa3c323da7052bb2babf1772a37bc2782babd8ed072d18596d32792d4abf9440946dfd56e6cbfe8 WHIRLPOOL 35a128f849428a3bdb449b503783f6f26db4111ad66a6d5d446d23005ddbccfcd3b487b89cc955be86c1a2f1c9b77c1db2ebe67e2224b95eb0595d6d2f96cdae +AUX libgnomeprint-2.18.8-cups-config.patch 1448 SHA256 6dc35755ab4baba1ae8a2a5531762b7ae9978197debe8fc2b4b3532704866c5d SHA512 3290c71f0be264afe94428fb5c2f68287371a02e7497b657c9d3b9ef9bc358f82773d17da94fe67e585233236b9b5f2aed2d01ea5dc1c7e8f50696e00d80c89d WHIRLPOOL cf93a0e01594a5c0a374809cc20428f3b529a600b8bc01393403bd234f89a4c75609ddc253c96f4163a841dbc0bdd515f8fd4779e242dc19b3903d6ec7317567 +AUX libgnomeprint-2.18.8-freetype-2.5.1.patch 3064 SHA256 ba7f7a6b57c7962f0f53301f841e29a837a913a84125ede81ec664edf80f354f SHA512 09a98494d3181df7356f6a19fcbd9ef23007d700baa0dc27373a5d03ae8983ce4bf21145384c75cc337676e8c58d5a4cdd43182ece4e6ec4fa6c447def355f1a WHIRLPOOL 93c2940d7a8d49985a8d8448abff600c89f0464c88071f8f4ce9119df3bc8b538b347b9d0026da898d846c40e3ea1408303b4fbef979ed666d004995fedf6a5e +AUX libgnomeprint-2.18.8-stdio-include.patch 271 SHA256 9a0a7631ce4c209acdd3916ff1911dfd106d3379e8d822a0968c976be25a459c SHA512 3905f9d85606504666b8b4585a8360fc372504f2431049abf4518b8d8106c4c6e69f6cc401b48810d4252763f6adfcafe1303695350f91a17e2522f02898fce7 WHIRLPOOL 0f51a7836bb4303762138f6b48b158927195705509b827859f88838f7bc5127dcb98f92215a4674695407d5b59d12d576c4d89e9d68d48ee623293ec7040b563 +DIST libgnomeprint-2.18.8.tar.bz2 880489 SHA256 1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691 SHA512 eca4f118e918f8db04332c3c6df5370ee45497057b44747457b05f0517c55b38271b24cdf7493b8ba24875b2d53d99b5e64d5d63a04cd7fd895cb02ae1606469 WHIRLPOOL cfe18a12dfa0b3a8e659e8bff07764fcf93d02fc7e28f8d9f52796fe1044a30b257ab15a21b88438696841d7b8a61976c9af64971039141b73fa55ec00537a37 +EBUILD libgnomeprint-2.18.8-r1.ebuild 2008 SHA256 a98ae373bb3df01e1101928831d4ee30551fb281a0f4a6830e7acb54aacd9f70 SHA512 d8adfe9ed1d865756f3d0b5ed0536b9db1e82c8b304ba9be648f857ad45691249be3b2d7e4cd4fea088d634ad16fbaebc4e831fd8d3f7fcaeaa587f949b007fb WHIRLPOOL 73860e1eed4e3e186d0a56eb647c422afa312018a8d6614e80c82acfd8d6be40125455772bbc032993f9332ef21e254e44e568f6fb287d4f006c9983f0149080 +MISC ChangeLog 3086 SHA256 c9cb502ba42a04bb1238bb6baca698a2eec3c5ede247dae4b0c54cc6641a8b7e SHA512 470325e1036d2c745d57b301d5576e0f31c4fb0015f85a3907d62e86b8c5fb005bd4e3056f3aef5d9c8d4a071aa3a01304f4c1a97c8a8c3e593e79d2fc7966fc WHIRLPOOL 64bc03ffa3b80937734cb76cdd4b15c480ac5c02d0d1bc44fcca05ef7d8c891c76d60cf615c80548c39b30f6c83721346eebff395b7d7e8165b1906bf12358f0 +MISC ChangeLog-2015 25662 SHA256 dbf055611c98740f1e86c0eda4cb0fe673f11eeb4b6cb26d80336367d8383302 SHA512 671cd81376776213f1e30e229fe6d102316548d49d49397467366233e7eea335c15c024b8fc4271b4625e95bbb9a4a16e8e620cfa58ecb00d1b70cbe9040c9c5 WHIRLPOOL 599a237ccccb865199da2611feaa8e11e4fff936018a6509e6cdc943e6406b2ded6561807d18627fa2d50b10bf353b6e190ed4b02096aa3d448d95fcafd76e6e +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch new file mode 100644 index 000000000000..d9fbbdd84fb9 --- /dev/null +++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch @@ -0,0 +1,39 @@ +http://git.pld-linux.org/gitweb.cgi?p=packages/libgnomeprint.git;a=blob;f=bison3.patch + +--- libgnomeprint-2.18.8/libgnomeprint/grammar.y.orig 2010-02-09 13:32:51.000000000 +0100 ++++ libgnomeprint-2.18.8/libgnomeprint/grammar.y 2013-11-03 21:44:59.859877696 +0100 +@@ -6,8 +6,6 @@ + #include <libgnomeprint/types.h> + #include <libgnomeprint/gnome-print-filter.h> + +-#define YYPARSE_PARAM graph +- + static void + set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s) + { +@@ -99,7 +97,7 @@ + } + + static int yylex (void *lvalp); +-static int yyerror (const char *s); ++static int yyerror (graph_t *g, const char *s); + %} + + %union { +@@ -117,6 +115,7 @@ + %type <p> pool + + %pure_parser ++%parse-param { graph_t *graph } + + %start graph + %% +@@ -185,7 +184,7 @@ + %% + + static int +-yyerror (const char *s) ++yyerror (graph_t *g, const char *s) + { + return -1; + } diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch new file mode 100644 index 000000000000..999c6f075203 --- /dev/null +++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch @@ -0,0 +1,39 @@ +From ffbc68cc8518c7e7263a42d4284b749b40c5e871 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sun, 29 Jun 2014 10:47:41 +0200 +Subject: [PATCH] Use AC_PATH_TOOL to find proper cups-config. + +--- + configure.in | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 729278d..186fabf 100644 +--- a/configure.in ++++ b/configure.in +@@ -223,17 +223,18 @@ AC_ARG_WITH(cups, + ) + if test "x$try_cups" = "xyes"; then + PKG_CHECK_MODULES(CUPS, "gmodule-2.0") ++ AC_PATH_TOOL(CUPS_CONFIG, cups-config) + AC_MSG_CHECKING(for CUPS libraries version >= 1.1.20) +- if cups-config --version --libs > /dev/null 2>&1; then +- verstxt=`cups-config --version` ++ if $CUPS_CONFIG --version --libs > /dev/null 2>&1; then ++ verstxt=`$CUPS_CONFIG --version` + vers=`echo "$verstxt" | \ + awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test "$vers" -lt 1001020; then + AC_MSG_RESULT(Cups found but the version found is less than 1.1.20) + cups_msg="Version requirement not satisfied" + else +- CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs`" +- CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`" ++ CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `$CUPS_CONFIG --libs`" ++ CUPS_CFLAGS="$CUPS_CFLAGS `$CUPS_CONFIG --cflags`" + AC_MSG_RESULT(Found version $verstxt) + fi + +-- +2.0.0 + diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch new file mode 100644 index 000000000000..1a54e9be5b67 --- /dev/null +++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch @@ -0,0 +1,91 @@ +From e848ee98108ab8c5b12e2167b041b274b4bede83 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Thu, 8 Oct 2015 11:06:44 +0200 +Subject: [PATCH] Update freetype includes to work with >=freetype-2.5.1 + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + configure.in | 22 +++------------------- + libgnomeprint/gnome-font-face.c | 3 ++- + libgnomeprint/gnome-print-gdi.c | 2 +- + libgnomeprint/gnome-rfont.c | 4 ++-- + 4 files changed, 8 insertions(+), 23 deletions(-) + +diff --git a/configure.in b/configure.in +index c15bb69..aebe591 100644 +--- a/configure.in ++++ b/configure.in +@@ -162,25 +162,9 @@ LDFLAGS="$LDFLAGS $LIBM" + dnl ================================= + dnl Checking for freetype2 + dnl ================================= +-FREETYPE_LIBS= +-FREETYPE_CFLAGS= +-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +-if test "x$FREETYPE_CONFIG" = "xno" ; then +- AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint) +-else +- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` +- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` +-fi +- +-libgnomeprint_save_ldflags=$LDFLAGS +-LDFLAGS="$LDFLAGS $FREETYPE_LIBS" +- +-freetype_version=false +-AC_MSG_NOTICE([checking for sufficiently new FreeType (at least 2.0.5)]) +-AC_CHECK_LIB(freetype, FT_Get_Postscript_Name,:,[ +- AC_MSG_ERROR(You need FreeType2 (freetype-devel 2.0.5 or greater package) for this version of libgnomeprint)]) +- +-LDFLAGS=$libgnomeprint_save_ldflags ++dnl "freetype2 >= 17" means freetype-2.5.1 ++PKG_CHECK_MODULES(FREETYPE, freetype2 >= 17, , ++ [PKG_CHECK_MODULES(FREETYPE, freetype2, [FREETYPE_CFLAGS="$FREETYPE_CFLAGS -I`$PKG_CONFIG --variable=includedir freetype2`/freetype2/freetype"])]) + + dnl ================================= + dnl END: Checking for freetype2 +diff --git a/libgnomeprint/gnome-font-face.c b/libgnomeprint/gnome-font-face.c +index 0447377..23794a8 100644 +--- a/libgnomeprint/gnome-font-face.c ++++ b/libgnomeprint/gnome-font-face.c +@@ -36,7 +36,8 @@ + #include <stdarg.h> + #include <locale.h> + +-#include <freetype/ftoutln.h> ++#include <ft2build.h> ++#include FT_OUTLINE_H + + #include <libgnomeprint/gnome-print-private.h> + #include <libgnomeprint/gnome-font-private.h> +diff --git a/libgnomeprint/gnome-print-gdi.c b/libgnomeprint/gnome-print-gdi.c +index f89a8e8..7755673 100755 +--- a/libgnomeprint/gnome-print-gdi.c ++++ b/libgnomeprint/gnome-print-gdi.c +@@ -36,7 +36,7 @@ + #include <libgnomeprint/gp-gc-private.h> + + #include <ft2build.h> +-#include <freetype/freetype.h> ++#include FT_FREETYPE_H + + #define WIN32_LEAN_AND_MEAN + #include <windows.h> +diff --git a/libgnomeprint/gnome-rfont.c b/libgnomeprint/gnome-rfont.c +index 55ec261..a71bbda 100644 +--- a/libgnomeprint/gnome-rfont.c ++++ b/libgnomeprint/gnome-rfont.c +@@ -28,8 +28,8 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H +-#include <freetype/ftglyph.h> +-#include <freetype/ftbbox.h> ++#include FT_GLYPH_H ++#include FT_BBOX_H + #include <libart_lgpl/art_misc.h> + #include <libart_lgpl/art_affine.h> + #include <libart_lgpl/art_vpath.h> +-- +2.6.1 + diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch new file mode 100644 index 000000000000..dd9195434e87 --- /dev/null +++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch @@ -0,0 +1,9 @@ +--- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c ++++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c +@@ -34,6 +34,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <stdio.h> + #include <unistd.h> + #include <locale.h> diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild new file mode 100644 index 000000000000..599e35a3daac --- /dev/null +++ b/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="no" +GNOME_TARBALL_SUFFIX="bz2" + +inherit autotools eutils gnome2 multilib-minimal + +DESCRIPTION="Printer handling for Gnome" +HOMEPAGE="https://www.gnome.org/" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="2.2" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="cups doc" + +RDEPEND=">=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] + >=media-libs/libart_lgpl-2.3.21-r2[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + cups? ( + >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] + >=net-print/libgnomecups-0.2.3-r3[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.35 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + sys-devel/flex + sys-devel/bison + doc? ( + ~app-text/docbook-xml-dtd-4.1.2 + >=dev-util/gtk-doc-0.9 )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-stdio-include.patch \ + "${FILESDIR}"/${P}-freetype-2.5.1.patch \ + "${FILESDIR}"/${P}-bison3.patch \ + "${FILESDIR}"/${P}-cups-config.patch + eautoreconf + gnome2_src_prepare + + # Drop DEPRECATED flags, bug #384807 + sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::g' \ + configure.in configure || die + sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ + libgnomeprint/ttsubset/Makefile.am \ + libgnomeprint/ttsubset/Makefile.in || die +} + +multilib_src_configure() { + # Disable papi support until papi is in portage; avoids automagic + # dependencies on an untracked library. + + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + $(use_with cups) \ + --without-papi \ + --disable-static +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + DOCS="AUTHORS BUGS ChangeLog* NEWS README" + einstalldocs +} diff --git a/gnome-base/libgnomeprint/metadata.xml b/gnome-base/libgnomeprint/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/libgnomeprint/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/libgnomeprintui/Manifest b/gnome-base/libgnomeprintui/Manifest new file mode 100644 index 000000000000..47e8f5a7d9c9 --- /dev/null +++ b/gnome-base/libgnomeprintui/Manifest @@ -0,0 +1,9 @@ +AUX libgnomeprintui-2.18.6-adwaita-icon-theme.patch 432 SHA256 1f5c6876d475ccc6a1f45cd5e9e3c5ee0e24313e9a3b8ef6241efa244f414938 SHA512 99af09eb081b419d126ac0bc664da16cfae67fede67190f67f48642efa1624cb49690601514ff77978c9577b76d9c9e79b775f96eab0961e890871be2a88681a WHIRLPOOL ffd63f88c02efdeb8f07fc3ffe4d0d5c18a25ea0edac441692662e1eda75eeab2ccc3fadbac559633bc92b4fe46e9508b383afdac3c49fc49797b4659227ac5d +AUX libgnomeprintui-2.18.6-intl.patch 375 SHA256 7ebab4b8a220fdfa27bf04c26df4bdace7721cec257fee119120c21d30860dc6 SHA512 78f37aa03642d78eef38923b9b487748c275571ddba090ce96c52797f7166f8930f937c3b579fcd83255d9fa703c6fb5f718d734cfb9e2af289059ee482035ee WHIRLPOOL dfd58afa51f11ff885c5d5fea17570d67bf6ad3d69420db81d7f4649c5053abb2c6761991efe24e131d5cf0046307d8e421a8327090ece4587b2c0330468ca0b +AUX libgnomeprintui-2.18.6-orientation-for-preview.patch 1660 SHA256 1e40ef8422abebfa0eacdcdfe60c154f0fcab35fb2216b5f5c799eafb56ed4c4 SHA512 aac905ee6e66367a36a2f2d1d256e3a97f1071fbd445e5d759a42ede3f0f59c3e80b4108b948de3b44ab24a0c2ae8cc32dbc72dbbbb3bde6c94d725741faa6b6 WHIRLPOOL e7f75319d339baab679dd1719e3cf81cdbacb47d3e3f518149eb4bb63f61a9ffdc4f5dd1f94886f8e937acaca31cbb0e72c9edee9b3bc38551744929bd0d3aff +AUX libgnomeprintui-2.18.6-system-config-printer.patch 710 SHA256 bfc74fd9557f5740d2ae86f55395351f510a10f52bb50679b109939017b1d0d0 SHA512 35323ad7e829ce5dc0f607637e16cfeb5d88fe63685801887b2c295b5f81640722d9f25c1e85c9a346c6dd2c38bde5bcc9cb97c529a154dfd5d52a6b66452c70 WHIRLPOOL c484a30985d6d43005bc07fe4ceb65cb463464f23322db928093bb0f4a07164aff81205dc62d378638c1b9069b642713b424033a482b8772dd2de3a13777e689 +DIST libgnomeprintui-2.18.6.tar.bz2 681125 SHA256 156ae5b66e5dcc546efa2449048f792d76c55b30d93a9b67b0c69665e346f46a SHA512 acf44fd8b273f5e48c9c7224647704c1d45a66c8fb7279414028506fd6b8941126636499793c825a767f2f731fcddce78ce750670969d5ff9236e9ff75dca002 WHIRLPOOL 069b0985692838511b023eb6ee617855ed60cba4e0095f6ec1100a28aa5f6e541471599c647fcc51971e5f576a401f72fae5749b2a4071a4a6de5923879ec96f +EBUILD libgnomeprintui-2.18.6-r2.ebuild 1143 SHA256 14dcc0ff11538de95061e8db5e9895174f0e4e9db2aaa7ec7304b43591901f69 SHA512 6a4e8afc4cba31086cce62d2602b3fde587e808035b5fa99c73420750e8dbd4f1f24c8401310f8f6c9705c0cf0e5cd0fbf1d3d94f56c4e4cb3b91aba069928eb WHIRLPOOL 06ba8c4726c2d344f63739236cf8cb83e4632f8c7e07fe4ba2d5018665317f1957b380321008eb3a59744bc8499453ad95b77f1c297510d718ca1457875e1d02 +MISC ChangeLog 3395 SHA256 820ac019a123b874567e200ce611fdda2232ffed3a63830f11b4935559fe9a12 SHA512 7b25b43c8f5a42e05ad1650bcfbaf79206346333b710b61151b3dc00564d5474a4f56bf3bc785c828423c9501194429e6e5cd0f411e52a048ba45ee100e07a5f WHIRLPOOL 106bd4e307fa643ac71980c4d11b576f61d4c394fc6cc292c72b46c9f3f4715fe2803b9788b3e78d407a4dc02f86f8bc26f45d6ac0678b84227ef1b7bd808718 +MISC ChangeLog-2015 22940 SHA256 a3b162bba9f9ae9ae068a2882006d1c3ec0b0dfb503e04e5f51e161ae87a7b0b SHA512 1c17fb06fc648de137a9406d7a9d4fbd3bdcb20d08ca40de6dc5418300494be65bc524240fbf6ca8cd5b51ef076a7db1da358bfd093f508a2693c84b785b5d76 WHIRLPOOL 9d345f71ecb29defd84d3b73da6f93a62c3343c5a3e5a5782da0bad66a654df1b5089e5244c189d1b6c2c41902e863a660919522671afc79cebe78574dda71bc +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch new file mode 100644 index 000000000000..f1fc4541db65 --- /dev/null +++ b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch @@ -0,0 +1,12 @@ +diff -up ./configure.in.orig ./configure.in +--- ./configure.in.orig 2014-05-04 11:07:55.308844477 +0300 ++++ ./configure.in 2014-05-04 11:08:26.884571685 +0300 +@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(LIBGNOMEPRINTUI, [ + gtk+-2.0 >= 2.6.0 + libgnomeprint-2.2 >= 2.12.1 + libgnomecanvas-2.0 >= 1.117.0 +- gnome-icon-theme >= 1.1.92 ++ adwaita-icon-theme >= 1.1.92 + ]) + AC_SUBST(LIBGNOMEPRINTUI_CFLAGS) + AC_SUBST(LIBGNOMEPRINTUI_LIBS) diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch new file mode 100644 index 000000000000..db206e6b13e8 --- /dev/null +++ b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch @@ -0,0 +1,10 @@ +--- libgnomeprintui-2.18.6/libgnomeprintui/gpaui/Makefile.am~ 2010-02-09 12:33:13.000000000 +0000 ++++ libgnomeprintui-2.18.6/libgnomeprintui/gpaui/Makefile.am 2015-11-03 23:16:49.625137517 +0000 +@@ -2,7 +2,6 @@ + + INCLUDES = \ + -I$(top_srcdir) \ +- -I$(top_srcdir)/intl \ + -I$(top_srcdir)/libgnomeprintui \ + -DWE_ARE_LIBGNOMEPRINT_INTERNALS \ + $(LIBGNOMEPRINTUI_CFLAGS) \ diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch new file mode 100644 index 000000000000..3a6aa63fe356 --- /dev/null +++ b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch @@ -0,0 +1,44 @@ +--- ./libgnomeprintui/gnome-print-job-preview.c.orig 2012-02-23 22:48:42.000000000 +0600 ++++ ./libgnomeprintui/gnome-print-job-preview.c 2012-02-25 00:18:43.000000000 +0600 +@@ -152,6 +152,7 @@ + GtkWidget *last; + GnomeCanvas *canvas; + GnomePrintConfig *config; ++ guchar *paper_orientation_save; + + guint current_page, current_offset; + +@@ -2187,6 +2188,19 @@ + if (jp->config) + g_object_unref (G_OBJECT (jp->config)); + jp->config = config; ++ if( config ) { ++ guchar *txt = gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAGE_ORIENTATION ); ++ if( ( g_ascii_strcasecmp(( const gchar* )txt, "R90") == 0 ) || ++ ( g_ascii_strcasecmp(( const gchar* )txt, "R270") == 0 ) ) { ++ jp->paper_orientation_save = ++ gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION ); ++ gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION, txt ); ++ g_free ( txt ); ++ } ++ else { ++ jp->paper_orientation_save = NULL; ++ } ++ } + if (!jp->config) + return; + g_object_ref (G_OBJECT (jp->config)); +@@ -2389,6 +2403,13 @@ + { + GnomePrintJobPreview *jp = GNOME_PRINT_JOB_PREVIEW (object); + ++ if( jp->paper_orientation_save ) { ++ gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION, ++ jp->paper_orientation_save ); ++ g_free ( jp->paper_orientation_save ); ++ jp->paper_orientation_save = NULL; ++ } ++ + gnome_print_job_preview_set_config (jp, NULL); + gnome_print_job_preview_set_job (jp, NULL); + diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch new file mode 100644 index 000000000000..57e188c863b7 --- /dev/null +++ b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch @@ -0,0 +1,12 @@ +diff -p -up libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c.system-config-printer libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c +--- libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c.system-config-printer 2008-09-23 10:49:59.000000000 +0200 ++++ libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c 2008-09-23 10:50:47.000000000 +0200 +@@ -47,7 +47,7 @@ + #include "gpaui/gpa-transport-selector.h" + + #define GPS_PAD 4 +-#define ADD_PRINTER_APP "gnome-cups-add" ++#define ADD_PRINTER_APP "system-config-printer" + + static void gnome_printer_selector_class_init (GnomePrinterSelectorClass *klass); + static void gnome_printer_selector_init (GObject *object); diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild new file mode 100644 index 000000000000..ab335f9a1373 --- /dev/null +++ b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME_TARBALL_SUFFIX="bz2" + +inherit autotools gnome2 multilib-minimal + +DESCRIPTION="User interface libraries for gnome print" +HOMEPAGE="https://www.gnome.org/" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="2.2" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND=" + >=gnome-base/libgnomeprint-2.12.1[${MULTILIB_USEDEP}] + >=gnome-base/libgnomecanvas-1.117[${MULTILIB_USEDEP}] + >=x11-libs/gtk+-2.6:2[${MULTILIB_USEDEP}] + x11-themes/adwaita-icon-theme +" +DEPEND="${RDEPEND} + sys-devel/gettext + virtual/pkgconfig[${MULTILIB_USEDEP}] +" + +src_prepare() { + # Patches from Mageia + eapply "${FILESDIR}"/${P}-adwaita-icon-theme.patch + eapply "${FILESDIR}"/${P}-intl.patch + eapply "${FILESDIR}"/${P}-orientation-for-preview.patch + eapply "${FILESDIR}"/${P}-system-config-printer.patch + eautoreconf + gnome2_src_prepare +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --disable-static +} + +multilib_src_install() { + gnome2_src_install +} diff --git a/gnome-base/libgnomeprintui/metadata.xml b/gnome-base/libgnomeprintui/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/libgnomeprintui/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest new file mode 100644 index 000000000000..e7c3d7cd838c --- /dev/null +++ b/gnome-base/libgnomeui/Manifest @@ -0,0 +1,5 @@ +DIST libgnomeui-2.24.5.tar.bz2 1440172 SHA256 ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f SHA512 e78fbe909179161acb6f7a1d31b8a247c9007af55c7f9c36422791be8d2681d42edfa582c19db88459d36309a18c03cb859997fe6b5918f602884607a8b6d5d5 WHIRLPOOL 0cfb10abdddd282f45b147fa3214bbaba005e75e5c73ffed962fbb6b828d2e632d3de49c876eb6127bf13b85a9985f3c9dec9571085196d0f23a762f93433f22 +EBUILD libgnomeui-2.24.5-r1.ebuild 1330 SHA256 34a379d4e8c238a35f1a37751067c3dd545c4a2996948890625f20630fbe5d33 SHA512 4493e1ca96231381c64fd7d5e8476f1532255e1f2ab40082060ae11038d1be3bd2fbd0007f9e7c2ee9e2414753e284a56aea8c7cf97dea5d52b11bd5597ef59d WHIRLPOOL 96c49980f9ee24fabacba279201276bf28eee3b415aca30458a44d34418216beb1f64bd627aee7578c0ab324f33ab1ca013c7b68677abd2868a8b9876f6b1bd7 +MISC ChangeLog 2799 SHA256 cbdde774f0246ce9203cb1d60a81fbfed2d65f1088e54855b92ee45af7b31b62 SHA512 59b232eb5b9cdd343059700abaa618c988f0fda4c252a29342101712f23b18224940d75f3b3d562e9f827f5b7717108523206d671ce3f481113c5f54f0f00ab2 WHIRLPOOL 4cbd2a8bfd4b7d227aec02540356dcc5e1a8d078193717b3f30bd1ab5964c3f8521338fe246878562ece34fa750ad3d40db84767ebaf237218491412780a6cfd +MISC ChangeLog-2015 27752 SHA256 2946d135da4c84def659f06af686dd732a6af68ea7d1328fe249eb433646a1af SHA512 f23e1452633dfd6e9898d4463e2b29757fd89d26db5903c8ec74bc4382aef6027e04ab624be9a568f47e0dc64804f5b7bbe813fdb00794e3a5e5381e80c97065 WHIRLPOOL 6a0a0956ffae0290f9b49520096a43e687cd1ee260e6698cac0d08c4df618faba88ea677810c6c96efe53831dc2ed038fd9ceddd9d4e5da89d96707af6dd11b0 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild new file mode 100644 index 000000000000..31b9073ddb12 --- /dev/null +++ b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit gnome2 + +DESCRIPTION="User Interface routines for Gnome" +HOMEPAGE="https://library.gnome.org/devel/libgnomeui/stable/" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="test" + +# gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser +RDEPEND=" + dev-libs/atk + >=dev-libs/glib-2.16:2 + >=dev-libs/libxml2-2.4.20:2 + >=dev-libs/popt-1.5 + >=gnome-base/gconf-2:2 + >=gnome-base/gnome-keyring-0.4 + >=gnome-base/gnome-vfs-2.7.3:2 + >=gnome-base/libgnome-2.13.7 + >=gnome-base/libgnomecanvas-2 + gnome-base/libgnome-keyring + >=gnome-base/libbonoboui-2.13.1 + >=gnome-base/libglade-2:2.0 + media-libs/libart_lgpl + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-2.14:2 + >=x11-libs/pango-1.1.2 + x11-libs/libICE + x11-libs/libSM +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + sys-devel/gettext + virtual/pkgconfig + >=dev-util/intltool-0.40 +" +PDEPEND="x11-themes/adwaita-icon-theme" + +src_prepare() { + if ! use test; then + sed 's/ test-gnome//' -i Makefile.am Makefile.in || die "sed failed" + fi + gnome2_src_prepare +} diff --git a/gnome-base/libgnomeui/metadata.xml b/gnome-base/libgnomeui/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/libgnomeui/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest new file mode 100644 index 000000000000..129cd553be1a --- /dev/null +++ b/gnome-base/libgtop/Manifest @@ -0,0 +1,7 @@ +DIST libgtop-2.34.2.tar.xz 725720 SHA256 268ad1478363e8c0955ea842fa134f6eb88965ab5e03166c20d8df9e7a1f8ef8 SHA512 22ae4792236c47fda265f1b16f66f8685122f84a76e14adf2fd9e5e669c1f9776a58a2ec00564e37add98084d7e3cea621b38b8ad09b15e348f9c74f5345f19a WHIRLPOOL 495146b1536c46d78112b5eb0661589cfefea176d7780badf7a834bf4def8677b9077232ca194352f75dc657cbe9d2bde3387f195893cea88218f29dca910ceb +DIST libgtop-2.36.0.tar.xz 727072 SHA256 13bfe34c150b2b00b03df4732e8c7ccfae09ab15897ee4f4ebf0d16b0f3ba12b SHA512 2768c628fa3e872a940246042b2c78ad4618612ecb2cf2b95fb70343a4f1a01bb558d0ce9e5b3468f395349f338ca33d460e1d91f2c123ad39243cd0ff20d5e5 WHIRLPOOL 4b3742646c0eaaf525145bfe31c3da28cac97d5418e2460fc60235945ae151691bc7043303c54e97ee93287efe97bf30ee84613b9beae7e5d9e1a58afd85a0f9 +EBUILD libgtop-2.34.2.ebuild 695 SHA256 886b833a10f7464f5e501b2320a1f9497cf0e0ffbf68fa774f4ad5c36a86a4dd SHA512 748d1283986bc38c5ab86e5d91996c1149e02f31339898cc39c8eab2b72c056e8569854a751487bd1d8c54d4f7fe8c03b6ed8fbe3cbb63a1a6d95dd1ded42e77 WHIRLPOOL 067258f1ff8f570840e08f94b3ae9cf9243a444e821e3651abf3a6395fb6a864a842f991db31d78ec2013c6adf4889933638add128949726b2b13e0f432c4e54 +EBUILD libgtop-2.36.0.ebuild 777 SHA256 06e4351ebebebd4d1a1ad94fb36d5e1462a2948dea8f6446ab7765e43b349286 SHA512 d275742ba88fbb6aac09fe4bdca179e98d1a1a541841059a8710003fd02f7319aa67243fbc7ed44582b6e9854fcfe3b0784f61c8f6b44692d82d571f35d534e1 WHIRLPOOL 15f9f5fdbfa0d1a73f6b77dae48f877c4979ee0af6d2698a616d69f4d8a341b3c1d86f4d5d796b8c3ea15920f6e03a215c45fa048bf3dfbf170305de62f92946 +MISC ChangeLog 5015 SHA256 6e9ed948e72e5d0e9aefcc796037e7826fe0014969dfc715b1b5507a570d668b SHA512 4055066cd84457534c502ff175f0d3759a1f6a38e2ff3d85544a200c259f969d4c76f94b187bd019b82be1c0269719f280d97def3894cc3baad84eb1187107c4 WHIRLPOOL 11fb0e2b9f015a7afd2e38671d3feb41264060e2ff5b50cc094b8bdc52c4718211b77e368f5c64708764089579b6b283ade58e33e6ddb8617f14b242e298b7f6 +MISC ChangeLog-2015 32549 SHA256 db72237db871f628145ba72ac4aa371612346ef27bd27770e5a0bbae4ef60dbc SHA512 58b1071a4c33d36018f36f1623e05e2a34c4aa240714696c126abbec9ea2ce96a2067859a018aa005767f8c5fae8e96695a36f615b963cd8e9459fe362a43fd8 WHIRLPOOL 11bb9c061c453a4921703cf9202aa250fe0b60fa47a778b8072dcd230becbb91740cd1f70aa248dd990ef50e7e3eee0edb71d9fd0bb504a8e2b7951496b0f4b5 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/libgtop/libgtop-2.34.2.ebuild b/gnome-base/libgtop/libgtop-2.34.2.ebuild new file mode 100644 index 000000000000..acafa2277c42 --- /dev/null +++ b/gnome-base/libgtop/libgtop-2.34.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="A library that provides top functionality to applications" +HOMEPAGE="https://git.gnome.org/browse/libgtop" + +LICENSE="GPL-2" +SLOT="2/10" # libgtop soname version +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd" +IUSE="+introspection" + +RDEPEND=" + >=dev-libs/glib-2.26:2 + introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.4 + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig +" + +src_configure() { + gnome2_src_configure \ + --disable-static \ + $(use_enable introspection) +} diff --git a/gnome-base/libgtop/libgtop-2.36.0.ebuild b/gnome-base/libgtop/libgtop-2.36.0.ebuild new file mode 100644 index 000000000000..e2c0e9485328 --- /dev/null +++ b/gnome-base/libgtop/libgtop-2.36.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit flag-o-matic gnome2 + +DESCRIPTION="A library that provides top functionality to applications" +HOMEPAGE="https://git.gnome.org/browse/libgtop" + +LICENSE="GPL-2" +SLOT="2/10" # libgtop soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="+introspection" + +RDEPEND=" + >=dev-libs/glib-2.26:2 + introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.4 + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig +" + +src_configure() { + # Add explicit stdc, bug #628256 + append-cflags "-std=c99" + + gnome2_src_configure \ + --disable-static \ + $(use_enable introspection) +} diff --git a/gnome-base/libgtop/metadata.xml b/gnome-base/libgtop/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/libgtop/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest new file mode 100644 index 000000000000..1e35463467ad --- /dev/null +++ b/gnome-base/librsvg/Manifest @@ -0,0 +1,9 @@ +AUX librsvg-2.40.12-gtk-optional.patch 2192 SHA256 d47a2a03bb333a1c6d79c716edc1ebf78335586c36f6a7d47250d2e6e09da357 SHA512 d9af98164138c52781117d72b4245ac03b7049f8743cc7f644314ba10d0e74c0f2f08a7c9d163bdef3e07ca3a66ce75089c23af3562ff0afebbae838c901bddb WHIRLPOOL 9f5557063cee91e2bf6da0cc9d3358136665e837ae5bbc04ba60144830b61e5157bfd3e297df62be83e66ceb850cc39daf67367210dee217e41eed533d2a0bf6 +AUX librsvg-2.40.2-vala-out-of-source.patch 1066 SHA256 0b32e55884d4263335976f241f32b78ceb52f78c94478f252e408881d4d942e2 SHA512 6a8e8035183a965c7359c6258cde5a842c2eda662a9ccebbe27ea27eb978591255664a837124e65f25e2653980c354c6c4b9ae11427cc27fe46ccfcdcde8102f WHIRLPOOL f76ab2f925fe9387b087b40cc477a85fa7869f25830645609ae08b585868040129598f769e60f65a9d4f7ba0dcbddfcb4e8184e8e8f7f8fecc1351b0d80340aa +DIST librsvg-2.40.17.tar.xz 573244 SHA256 e6f6c5cbecc405bb945c7cd15061276035ae3173bbb3bb25e8a916779c7f69cc SHA512 296e623adbf1e833a9b1f11257a911671d6c01568719ff48f8e2a9e0bf8166eae242d0ae23243a9ac335540fff6b6cdd4760ca2f37f8afe188783fd9b1099ef5 WHIRLPOOL 64c188903faa3144703cbeba3f8736c1ff8751006f744f4a3a796e1eae9d50e633cb48ab036e55c8222edc2b8e7dc708578c7a5add8f9b96f8183e89eb8026ec +DIST librsvg-2.40.18.tar.xz 574384 SHA256 bfc8c488c89c1e7212c478beb95c41b44701636125a3e6dab41187f1485b564c SHA512 faf503d0d881801ce129715e7ae979ee1675bd32beac9170b1889c94aac64caf486968bc86f3480463b84e94f28c1d805551ffdcb7068ecadd0688146e0fb182 WHIRLPOOL 123299a0896a7f1fb084c360f1ebe813d5b35886ae2587678a1773ffd3705305b2a30223bd61a524662076b029bdf1cb0cc0a8573bad7ba86ac99389a45e6e56 +EBUILD librsvg-2.40.17.ebuild 2678 SHA256 b229367ce927f9ed0c01910cd52bf80d4c0ace012dc20e740f08c5ec04007f66 SHA512 510dc141065616b5970bc0586a707abdc68ecccb4fdd89a5674155f8f27a782bc3d6ffae671b98d92f42b8612d2cf66bf1e1b3fceb3e918a01389e48d6d062e2 WHIRLPOOL 79a244b02b15c9afe65a4a7cc34f56ac9e06b8f736bb13c3a17307b8588969453b6c9f1dcc72ac185da7ffec53bdc11c73766b8e928d65f18de589cf44403bbe +EBUILD librsvg-2.40.18.ebuild 2678 SHA256 b229367ce927f9ed0c01910cd52bf80d4c0ace012dc20e740f08c5ec04007f66 SHA512 510dc141065616b5970bc0586a707abdc68ecccb4fdd89a5674155f8f27a782bc3d6ffae671b98d92f42b8612d2cf66bf1e1b3fceb3e918a01389e48d6d062e2 WHIRLPOOL 79a244b02b15c9afe65a4a7cc34f56ac9e06b8f736bb13c3a17307b8588969453b6c9f1dcc72ac185da7ffec53bdc11c73766b8e928d65f18de589cf44403bbe +MISC ChangeLog 11026 SHA256 188cd15d351f77eb66a03d5ee734971b9ea3a6337edc3d98e9067ae02a5d4fbd SHA512 7c0c96f7594730057d781b349fe506f42fb1a0df73f947ec3cc5679701847970b4d7732d097a450dda66290f3a76283f5d0a1cbc71c7780581500be6b1f580db WHIRLPOOL ad0af935fb45bc508aa4dc16335638dc46dfe000f97d535338c909e4b184da832ccfacbb739d926ce0e289bc480d4d1ed12232b1a1cdfa932caacbe3de459a7a +MISC ChangeLog-2015 50837 SHA256 b88949fca2e54659ececbb6eb6fdd256faf890344f94a6a1a6225ecc619a9fab SHA512 fb2165f6d53201dda90ec499d12a18038c34d89d8e6d443aa0a63154040a168b7f27bfeb9dd09cf154e9ff23052301fe5e41f5ef7280a11455d9b7ba9f355df4 WHIRLPOOL 68b75ff3e631e810ec8fab1ce88ea33b01162b9e543fbdd6bfbbe93bda2c4bd9815b967c1d06be02b58db69d3ed8fbfc804fd64d2dc824573f132d98a8147861 +MISC metadata.xml 311 SHA256 fd6a211527279c8ba73a6d23b3c43f6ce6dc11dd35533a608c54829e875c46df SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4 WHIRLPOOL 2ef31e3a424a9de7aa061b35e047b3f387dd75760cb7cc9d86ff6bb04afb1398175df5ec4f879dc55177523fbc5d47288d2fd236b8a230cf0fc2c3aad83c4943 diff --git a/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch new file mode 100644 index 000000000000..b7c5b85223de --- /dev/null +++ b/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch @@ -0,0 +1,58 @@ +From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Tue, 19 Nov 2013 16:00:29 +0000 +Subject: [PATCH] configure: add option to enable/disable use of GTK+ + +Distro packagers like predictability and automatically detected optional +dependencies are not predicable. Add a --with-gtk3 option (default to "auto") +for forcibly controlling whether GTK+ will be used or not. + +Signed-off-by: Ross Burton <ross.burton@intel.com> + +https://bugzilla.gnome.org/show_bug.cgi?id=712693 +--- + configure.in | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/configure.in b/configure.in +index f7a89dc..1498f72 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r) + # GTK + # =========================================================================== + +-PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]) +- + GTK3_BINARY_VERSION= + +-if test "$have_gtk_3" = "yes"; then +- GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" ++AC_MSG_CHECKING([whether to use GTK+ 3]) ++AC_ARG_WITH([gtk3], ++ [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])], ++ [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])]) ++AC_MSG_RESULT([$with_gtk3]) ++ ++if test "$with_gtk3" = "yes"; then ++ PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED]) ++ GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" + fi + + AC_SUBST([GTK3_BINARY_VERSION]) + +-AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"]) ++AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"]) + + dnl =========================================================================== + dnl GDK-Pixbuf SVG loader +@@ -305,6 +310,6 @@ librsvg-$VERSION + Build introspectable bindings: ${found_introspection} + Build Vala bindings: ${enable_vala} + Build GdkPixbuf loader: ${enable_pixbuf_loader} +- GTK+ $GTK3_REQUIRED or later: ${have_gtk_3} ++ GTK 3.0: ${with_gtk3} + Build miscellaneous tools: ${build_misc_tools} + " +-- +1.7.10.4
\ No newline at end of file diff --git a/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch b/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch new file mode 100644 index 000000000000..bda090572a8d --- /dev/null +++ b/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch @@ -0,0 +1,28 @@ +From bf4da5524d50e1068f851bcbe50c8f8ae1948d73 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 18 Jun 2014 09:44:51 +0200 +Subject: [PATCH] build: Fix building .vapi out-of-source. + +Rsvg-2.0-custom.vala file resides in $(srcdir), and therefore full path +needs to be given to vapigen. Otherwise, the build fails when build is +performed out-of-source. +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index e881100..dc6b0c9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -257,7 +257,7 @@ VAPIGEN_VAPIS = librsvg-$(RSVG_API_VERSION).vapi + + librsvg_@RSVG_API_VERSION_U@_vapi_DEPS = gio-2.0 cairo + librsvg_@RSVG_API_VERSION_U@_vapi_METADATADIRS = $(srcdir) +-librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir Rsvg-$(RSVG_API_VERSION)-custom.vala ++librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir $(srcdir)/Rsvg-$(RSVG_API_VERSION)-custom.vala + + vapidir = $(datadir)/vala/vapi + vapi_DATA = $(VAPIGEN_VAPIS) +-- +2.0.0 + diff --git a/gnome-base/librsvg/librsvg-2.40.17.ebuild b/gnome-base/librsvg/librsvg-2.40.17.ebuild new file mode 100644 index 000000000000..7eb90124e50f --- /dev/null +++ b/gnome-base/librsvg/librsvg-2.40.17.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" + +inherit autotools eutils gnome2 multilib-minimal vala + +DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" +HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +IUSE="+introspection tools vala" +REQUIRED_USE="vala? ( introspection )" + +RDEPEND=" + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] + >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) + tools? ( >=x11-libs/gtk+-3.10.0:3 ) +" +DEPEND="${RDEPEND} + dev-libs/gobject-introspection-common + dev-libs/vala-common + >=dev-util/gtk-doc-am-1.13 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + vala? ( $(vala_depend) ) +" +# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf + +src_prepare() { + # https://bugzilla.gnome.org/show_bug.cgi?id=653323 + eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch" + + # https://bugzilla.gnome.org/show_bug.cgi?id=731826 + eapply "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch" + + eautoreconf + + use vala && vala_src_prepare + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=() + + # -Bsymbolic is not supported by the Darwin toolchain + if [[ ${CHOST} == *-darwin* ]]; then + myconf+=( --disable-Bsymbolic ) + fi + + # --disable-tools even when USE=tools; the tools/ subdirectory is useful + # only for librsvg developers + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --disable-static \ + --disable-tools \ + $(multilib_native_use_enable introspection) \ + $(multilib_native_use_with tools gtk3) \ + $(multilib_native_use_enable vala) \ + --enable-pixbuf-loader \ + "${myconf[@]}" + + if multilib_is_native_abi; then + ln -s "${S}"/doc/html doc/html || die + fi +} + +multilib_src_compile() { + # causes segfault if set, see bug #411765 + unset __GL_NO_DSO_FINALIZER + gnome2_src_compile +} + +multilib_src_install() { + gnome2_src_install +} + +pkg_postinst() { + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + multilib_foreach_abi gnome2_pkg_postinst +} + +pkg_postrm() { + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + multilib_foreach_abi gnome2_pkg_postrm +} diff --git a/gnome-base/librsvg/librsvg-2.40.18.ebuild b/gnome-base/librsvg/librsvg-2.40.18.ebuild new file mode 100644 index 000000000000..7eb90124e50f --- /dev/null +++ b/gnome-base/librsvg/librsvg-2.40.18.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" + +inherit autotools eutils gnome2 multilib-minimal vala + +DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" +HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +IUSE="+introspection tools vala" +REQUIRED_USE="vala? ( introspection )" + +RDEPEND=" + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] + >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) + tools? ( >=x11-libs/gtk+-3.10.0:3 ) +" +DEPEND="${RDEPEND} + dev-libs/gobject-introspection-common + dev-libs/vala-common + >=dev-util/gtk-doc-am-1.13 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + vala? ( $(vala_depend) ) +" +# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf + +src_prepare() { + # https://bugzilla.gnome.org/show_bug.cgi?id=653323 + eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch" + + # https://bugzilla.gnome.org/show_bug.cgi?id=731826 + eapply "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch" + + eautoreconf + + use vala && vala_src_prepare + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=() + + # -Bsymbolic is not supported by the Darwin toolchain + if [[ ${CHOST} == *-darwin* ]]; then + myconf+=( --disable-Bsymbolic ) + fi + + # --disable-tools even when USE=tools; the tools/ subdirectory is useful + # only for librsvg developers + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --disable-static \ + --disable-tools \ + $(multilib_native_use_enable introspection) \ + $(multilib_native_use_with tools gtk3) \ + $(multilib_native_use_enable vala) \ + --enable-pixbuf-loader \ + "${myconf[@]}" + + if multilib_is_native_abi; then + ln -s "${S}"/doc/html doc/html || die + fi +} + +multilib_src_compile() { + # causes segfault if set, see bug #411765 + unset __GL_NO_DSO_FINALIZER + gnome2_src_compile +} + +multilib_src_install() { + gnome2_src_install +} + +pkg_postinst() { + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + multilib_foreach_abi gnome2_pkg_postinst +} + +pkg_postrm() { + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + multilib_foreach_abi gnome2_pkg_postrm +} diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml new file mode 100644 index 000000000000..fb664414b62c --- /dev/null +++ b/gnome-base/librsvg/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="tools">Build svg viewer tool</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/metadata.xml b/gnome-base/metadata.xml new file mode 100644 index 000000000000..0fe9232faaf5 --- /dev/null +++ b/gnome-base/metadata.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<catmetadata> + <longdescription lang="en"> + The gnome-base category contains core GNOME packages. + </longdescription> + <longdescription lang="de"> + Die Kategorie gnome-base enthält die GNOME Basispakete. + </longdescription> + <longdescription lang="es"> + La catagoría gnome-base contiene los paquetes principales de GNOME. + </longdescription> + <longdescription lang="ja"> + gnome-baseカテゴリーにはGNOMEのコア・パッケージが含まれています。 + </longdescription> + <longdescription lang="nl"> + De gnome-base categorie bevat de basisonderdelen van de GNOME desktopomgeving. + </longdescription> + <longdescription lang="vi"> + Nhóm gnome-base chứa các gói GNOME cốt lõi. + </longdescription> + <longdescription lang="it"> + La categoria gnome-base contiene i pacchetti base di GNOME. + </longdescription> + <longdescription lang="pt"> + A categoria gnome-base contém os pacotes principais de GNOME. + </longdescription> + <longdescription lang="pl"> + Kategoria gnome-base zawiera podstawowe pakiety środowiska GNOME. + </longdescription> +</catmetadata> + diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest new file mode 100644 index 000000000000..f8f3f2b3a8a7 --- /dev/null +++ b/gnome-base/nautilus/Manifest @@ -0,0 +1,9 @@ +DIST nautilus-3.20.4.tar.xz 3453376 SHA256 b15f4778950752e5d5748f198d69106be3425cdc70574be75c25f8f931a2766c SHA512 01bee5c70067c508ca918948afe0b400680eb68518ae69803e2971a215b0eaf54c9251566c6c44835a1c0b9b20248450539a47936c6aba5c9accc9ef3cbe8a8e WHIRLPOOL bf9a3549cb16c8860a470aac07b91cee349adf7ac820847afe093db160fd2f9a4c9f2c6cf7625c7f19415a6957547353662edd33358ddf0b1a86f33169812314 +DIST nautilus-3.22.3.tar.xz 5104800 SHA256 64c232f743a2bae3fce3c76d5aa65e378d11bb431fefde9013162069abff4e22 SHA512 abad02d2b36230348cec04bcc2650cc352e232008c4e628096880a93b647a0da86b43b9df6cbd621334e7292e2d00f68010783858dbfa38061ab7eafd3c4c912 WHIRLPOOL 7dde08228204b2817942071b0a5a1d31ba2d699b96ef821b4cdff301e8d26fd92a36f82b74e7acfeda4018cfa3dc082b0aac66360b0dc940706fd877755e2a48 +DIST nautilus-3.24.2.1.tar.xz 5143440 SHA256 357d9d051fcc2c385ce9b3beb2db2ea1874b7cdf507ca10274a063023e1a61b3 SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07 WHIRLPOOL f98196cace9b0558abfbfd1bb3be05aefb7dade5edc47dfa675341c6465d4dc343e1fb0b2262c91a57cf090f82debf756d2be7000298def24151ff0aff3a1c30 +EBUILD nautilus-3.20.4.ebuild 2842 SHA256 7bc4eacd46a37b4881bea97a434b985cb86c563d2b19852999fe445376fdd83b SHA512 82e8360fffd669cdc4d31c1af637b7e557d4f0f59b582890a0d842c2924c711c653fa4d7d3faaa6cc48def59b7ad59ea3da80705189ffb2c34cd60f9b62f58df WHIRLPOOL 39cd7ff58a1f0c56dbc84c41622b36070059b85436618a7ff37e1ad7b9d54ee3df28b36b9995c168d607d4842297570bc772de115b54cbea6a7ce980cfe3999c +EBUILD nautilus-3.22.3.ebuild 2865 SHA256 b9731228534cb2d0bc35e3b3b78791d5978cf14dabf2475b3849108fdad029da SHA512 c646ecb222c89e6a3f151b741b7c4444b5b4f0a9ee895601dffc0cf53b640c1ca3d12b249888a8b9c9c6039eced09e88c535afbc0bb2c181046d32376ac377cb WHIRLPOOL 5c6df31d9adc6673c2ac9ca2fa8cc4663c2a3d809e9ba7afa44a68b3fbaffd971835751977ef6587862b0833297f4416c03a00ba66a1e99ad7923875b6f26f6a +EBUILD nautilus-3.24.2.1.ebuild 2866 SHA256 340202542c7489dee5ceaeadddac50c5a43c777fc5b24de0039342dc300e4ded SHA512 f3d1718d6b5b331180934ab1577e0f3087ded34fe9a8584256fdf344242dc75475341b061e6fae769c89b8995ed725eb7b624c6e45ce60853ff36399b370c32f WHIRLPOOL 49225f1f952662e2e3ab2a40c4b9864684104c625c66b6a9db1d13ca0cc79ba913271395f326845e0556e09308a16c3a9e1a464073454c05c26ad473bbd00697 +MISC ChangeLog 6482 SHA256 dd48808ead0606adfc457a15a345ab34436af5f4e610fcc4cc1f3c223ebd5df7 SHA512 949821ae6846770e18e4c915e12984b6a615efcd2eb38b4fefa63da7e9a18b55f6114b3e9912c6e58470167ebc09a3c54e91ed14f2911e888849993dd447255e WHIRLPOOL f6f54959a53d4cf64600151ba49c924ff6df95ff8162a0e9fb7664830dae774c8f2c1144be6efc9eede3ff88a866a7dad96550854c1ce454f32cd596aefb7d7b +MISC ChangeLog-2015 64750 SHA256 8319583e3ffee2d687d6b4a6498260a11a78b1a3b048dbe3338a3fff75ecb290 SHA512 abdea2073189356a4266e87a0b0d41005dd6f3d958247522b13319b9253c70b6430e2991c27fd2eb61e4f0f8dd74fcc0a67bb83cbd6c93d88bbc1165f6158acb WHIRLPOOL acfc29e8ad6091efb1427af675add56f18b248f3fde7bed65d4a2624b5947ccdf1ec0084abee3e8ba101ee47fb83685cbe30ac55047ed3c8ccd17518f469e831 +MISC metadata.xml 795 SHA256 b04e676d2242bcdb0162d431594f7c68ffa5cfd33b49989358c4f78e67ecdb4d SHA512 22363d80a08d2422ca7e454caf87dceb0ec7cfa6461467f3857c28e53cab914466c85a9fbabfa7d811009cbd3be2243cfb07462f49c434f345bf4c1999de1668 WHIRLPOOL 3c6cf5cd51365c0ddb0ebfee60935a5c15cb1382718e1a6a9089f05e650ab2e75b14b746b68d218620080df08e1c058e59be57c417ab44a405f44e5bf8a5f9af diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml new file mode 100644 index 000000000000..71760b9a6322 --- /dev/null +++ b/gnome-base/nautilus/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <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 + various locations/devices</flag> + <flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag> + <flag restrict=">=gnome-base/nautilus-3.22" name="tracker">Add support for <pkg>app-misc/tracker</pkg> search and batch rename</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/nautilus/nautilus-3.20.4.ebuild b/gnome-base/nautilus/nautilus-3.20.4.ebuild new file mode 100644 index 000000000000..080c2d9dfbba --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.20.4.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' + +inherit gnome2 readme.gentoo-r1 virtualx + +DESCRIPTION="A file manager for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" + +LICENSE="GPL-2+ LGPL-2+ FDL-1.1" +SLOT="0" +IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" + +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +# FIXME: tests fails under Xvfb, but pass when building manually +# "FAIL: check failed in nautilus-file.c, line 8307" +# need org.gnome.SessionManager service (aka gnome-session) but cannot find it +RESTRICT="test" + +# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 +# and 2.30.0 +COMMON_DEPEND=" + >=dev-libs/glib-2.45.7:2[dbus] + >=x11-libs/pango-1.28.3 + >=x11-libs/gtk+-3.19.12:3[introspection?] + >=dev-libs/libxml2-2.7.8:2 + >=gnome-base/gnome-desktop-3:3= + + gnome-base/dconf + >=gnome-base/gsettings-desktop-schemas-3.8.0 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + + exif? ( >=media-libs/libexif-0.6.20 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) + selinux? ( >=sys-libs/libselinux-2 ) + tracker? ( >=app-misc/tracker-0.16:= ) + xmp? ( >=media-libs/exempi-2.1.0:2 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5 + >=dev-util/gdbus-codegen-2.33 + >=dev-util/gtk-doc-am-1.10 + >=dev-util/intltool-0.50 + sys-devel/gettext + virtual/pkgconfig + x11-proto/xproto +" +RDEPEND="${COMMON_DEPEND} + packagekit? ( app-admin/packagekit-base ) + sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) +" + +# For eautoreconf +# gnome-base/gnome-common +# dev-util/gtk-doc-am" + +PDEPEND=" + gnome? ( x11-themes/adwaita-icon-theme ) + tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) + previewer? ( >=gnome-extra/sushi-0.1.9 ) + sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) + >=gnome-base/gvfs-1.14[gtk] +" +# Need gvfs[gtk] for recent:/// support + +src_prepare() { + if use previewer; then + DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. + To activate the previewer, select a file and press space; to + close the previewer, press space again." + fi + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --disable-profiling \ + --disable-update-mimedb \ + $(use_enable exif libexif) \ + $(use_enable introspection) \ + $(use_enable packagekit) \ + $(use_enable sendto nst-extension) \ + $(use_enable selinux) \ + $(use_enable tracker) \ + $(use_enable xmp) +} + +src_test() { + virtx emake check +} + +src_install() { + use previewer && readme.gentoo_create_doc + gnome2_src_install +} + +pkg_postinst() { + gnome2_pkg_postinst + + if use previewer; then + readme.gentoo_print_elog + else + elog "To preview media files, emerge nautilus with USE=previewer" + fi +} diff --git a/gnome-base/nautilus/nautilus-3.22.3.ebuild b/gnome-base/nautilus/nautilus-3.22.3.ebuild new file mode 100644 index 000000000000..c45db7515f0c --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.22.3.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' + +inherit gnome2 readme.gentoo-r1 virtualx + +DESCRIPTION="A file manager for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" + +LICENSE="GPL-2+ LGPL-2+ FDL-1.1" +SLOT="0" +IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" + +KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +# FIXME: tests fails under Xvfb, but pass when building manually +# "FAIL: check failed in nautilus-file.c, line 8307" +# need org.gnome.SessionManager service (aka gnome-session) but cannot find it +RESTRICT="test" + +# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 +# and 2.30.0 +COMMON_DEPEND=" + >=app-arch/gnome-autoar-0.1 + >=dev-libs/glib-2.49.1:2[dbus] + >=x11-libs/pango-1.28.3 + >=x11-libs/gtk+-3.21.6:3[introspection?] + >=dev-libs/libxml2-2.7.8:2 + >=gnome-base/gnome-desktop-3:3= + + gnome-base/dconf + >=gnome-base/gsettings-desktop-schemas-3.8.0 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + + exif? ( >=media-libs/libexif-0.6.20 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) + selinux? ( >=sys-libs/libselinux-2 ) + tracker? ( >=app-misc/tracker-0.16:= ) + xmp? ( >=media-libs/exempi-2.1.0:2 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5 + >=dev-util/gdbus-codegen-2.33 + >=dev-util/gtk-doc-am-1.10 + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig + x11-proto/xproto +" +RDEPEND="${COMMON_DEPEND} + packagekit? ( app-admin/packagekit-base ) + sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) +" + +# For eautoreconf +# gnome-base/gnome-common +# dev-util/gtk-doc-am" + +PDEPEND=" + gnome? ( x11-themes/adwaita-icon-theme ) + tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) + previewer? ( >=gnome-extra/sushi-0.1.9 ) + sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) + >=gnome-base/gvfs-1.14[gtk] +" +# Need gvfs[gtk] for recent:/// support + +src_prepare() { + if use previewer; then + DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. + To activate the previewer, select a file and press space; to + close the previewer, press space again." + fi + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --enable-desktop \ + --disable-profiling \ + --disable-update-mimedb \ + $(use_enable exif libexif) \ + $(use_enable introspection) \ + $(use_enable packagekit) \ + $(use_enable sendto nst-extension) \ + $(use_enable selinux) \ + $(use_enable tracker) \ + $(use_enable xmp) +} + +src_test() { + virtx emake check +} + +src_install() { + use previewer && readme.gentoo_create_doc + gnome2_src_install +} + +pkg_postinst() { + gnome2_pkg_postinst + + if use previewer; then + readme.gentoo_print_elog + else + elog "To preview media files, emerge nautilus with USE=previewer" + fi +} diff --git a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild new file mode 100644 index 000000000000..1212b1efbdf5 --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' + +inherit gnome2 readme.gentoo-r1 virtualx + +DESCRIPTION="A file manager for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" + +LICENSE="GPL-2+ LGPL-2+ FDL-1.1" +SLOT="0" +IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" + +KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +# FIXME: tests fails under Xvfb, but pass when building manually +# "FAIL: check failed in nautilus-file.c, line 8307" +# need org.gnome.SessionManager service (aka gnome-session) but cannot find it +RESTRICT="test" + +# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 +# and 2.30.0 +COMMON_DEPEND=" + >=app-arch/gnome-autoar-0.2.1 + >=dev-libs/glib-2.51.2:2[dbus] + >=x11-libs/pango-1.28.3 + >=x11-libs/gtk+-3.21.6:3[introspection?] + >=dev-libs/libxml2-2.7.8:2 + >=gnome-base/gnome-desktop-3:3= + + gnome-base/dconf + >=gnome-base/gsettings-desktop-schemas-3.8.0 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + + exif? ( >=media-libs/libexif-0.6.20 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) + selinux? ( >=sys-libs/libselinux-2 ) + tracker? ( >=app-misc/tracker-1:= ) + xmp? ( >=media-libs/exempi-2.1.0:2 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5 + >=dev-util/gdbus-codegen-2.33 + >=dev-util/gtk-doc-am-1.10 + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig + x11-proto/xproto +" +RDEPEND="${COMMON_DEPEND} + packagekit? ( app-admin/packagekit-base ) + sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) +" + +# For eautoreconf +# gnome-base/gnome-common +# dev-util/gtk-doc-am" + +PDEPEND=" + gnome? ( x11-themes/adwaita-icon-theme ) + tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) + previewer? ( >=gnome-extra/sushi-0.1.9 ) + sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) + >=gnome-base/gvfs-1.14[gtk] +" +# Need gvfs[gtk] for recent:/// support + +src_prepare() { + if use previewer; then + DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. + To activate the previewer, select a file and press space; to + close the previewer, press space again." + fi + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --enable-desktop \ + --disable-profiling \ + --disable-update-mimedb \ + $(use_enable exif libexif) \ + $(use_enable introspection) \ + $(use_enable packagekit) \ + $(use_enable sendto nst-extension) \ + $(use_enable selinux) \ + $(use_enable tracker) \ + $(use_enable xmp) +} + +src_test() { + virtx emake check +} + +src_install() { + use previewer && readme.gentoo_create_doc + gnome2_src_install +} + +pkg_postinst() { + gnome2_pkg_postinst + + if use previewer; then + readme.gentoo_print_elog + else + elog "To preview media files, emerge nautilus with USE=previewer" + fi +} diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest new file mode 100644 index 000000000000..2afecf252346 --- /dev/null +++ b/gnome-base/orbit/Manifest @@ -0,0 +1,10 @@ +AUX orbit-2.14.19-aix-func_data.patch 3631 SHA256 2b3bf9098c5aee6e403342b66ec304d842f03c456f9ec68980b2d1d00186c6f9 SHA512 2b4414e1443a8d03c163677334f974664c2f64ccd100442f0d4a7dda61677fac397085deba9c36f0c1e70d3ab36f033d6f23d2d2c5ebaa4412bfed631783382b WHIRLPOOL 70290f54ec3d8f1fe9f02f7237f309390e58811f45ccdbe94dd14dcc96265b0ce3cfac1b84e8652af3d3008cad4d89620b2c0946002987cdf05ac81473ceb551 +AUX orbit-2.14.19-automake-1.13.patch 674 SHA256 ed3c966dd4b862a22e814bc6a71099302c75a57c6bed706e797890f2ee0a124d SHA512 a49043dd50d09893828ca5f71e4af4054ec68b322b244c1f5ce7eb0a471ddb9b099c9939c0a4d6b036d4e28a163e23ec29896baa2fffc137269fd61d34bce447 WHIRLPOOL 194bb55a0b59cb50446967a837845fa43601277d8158a5412dae7fc425f78c6f98d53cebd1ca79e2b5fc059ddd3043a0caf40be8b42e1790fb7a28462dc53588 +AUX orbit-2.14.19-fPIC.patch 1650 SHA256 73eeeb598b1cd18f1d888a0f62f59b971ea1367995a3d7016a4e217968ca4923 SHA512 31915edd0998b4738a5c97a74b4e4f84ac80a7db5a04e1f205ff2a2ea181df9bf471a839f75bef8bc96644c0e3c731e3cf6c47bedbccd07ab7b10f27e8e19da8 WHIRLPOOL ef8eaea7640669aedb8b68fd397f7aced0165685969ba4c96bd78ab17b78611828fee7f7dc54ab4db8168de1fdbcb2566fbf2fc24901421136dde33f6cc1202c +AUX orbit-2.14.19-link_protocol_is_local.patch 1006 SHA256 d173885258c5dfb2ddbc6238f239535a49955bbd633b0acf58efcb503af33c97 SHA512 f765686448db2d190bebb85c165b5e32bb3e29a30f5407b5f3236dfcc0b0c94f77715d136678ec9021a9e450b22fbd7c0dfed3e30d070f795d708244594de2a8 WHIRLPOOL 4231e42249a9a29a3a6ad51514ebb0585a112ac894aeae416e2540972b887264410e88a39dfaf9154bc059609c9c81f4b3d7ce566f97d8cced802aaf7f8e8c02 +AUX orbit-2.14.19-parallel-build.patch 963 SHA256 bbd1a6c310179ada85007d4e2e047904c9832810c9cc5f0852fa606ff7b5716e SHA512 f38605716bc0c72ba87be108ad7dd3f86779fd548183abe847b74a74ad009778b42ebfc8bee0d97033f698ad28b6e383708c6033725568f37226a6de1221c187 WHIRLPOOL ed00dfcf5a48124179329be76eef203be628799a4f38b01c511e24c8f44fa988e5444e7f7145703f7903814a0d21729752244a4bb9ebfcbe886ba65008cb420e +DIST ORBit2-2.14.19.tar.bz2 764820 SHA256 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e WHIRLPOOL ed9dffba86ab5a5409fbdfcbe8017ae3251ca261aa57b3ee1089ddfad0422f73e848ed72d3881d664ffe88a3582a8c4652394517ab814c4f0983d446891a1306 +EBUILD orbit-2.14.19-r5.ebuild 2998 SHA256 b758337cbc28b88d53ffc202325fa92b738921fc614c105c294ab4bfa80bf897 SHA512 548690d5fd7e1120b61d7b0472cf848ddbda09f4727c42659630d35e34f64dbaa8830432f7b2382d1d4af6a9508ea548ae9cdbb028b131f9e82d6e2b7da8811e WHIRLPOOL a204bdbb2b8987165550386fcf0318063bd0abb77e667c974495e43c4bc315dc9a5092fc972f2cab16e17313d5702ef87d06050f4b3543d5c7c037e946ff479b +MISC ChangeLog 3800 SHA256 faef87cd8d53c981148e8fb4e0c0f8abc3ef004e02faa6536d47c0016c0f89ea SHA512 dd7f3f879482fd10fb741fe577a65b345140c6b078ed40aaaa4cf6dabe71969505266f5ae6183d3c3e93ce19e86558f9848a05a239257f6fcadc11a11a174caa WHIRLPOOL 173453fba8ab8a66f8e2721f31b88e6e16d095918422b6db260104951edf467f44da4f2f17aacfe39bd5800c262aa709e12ec458cb18327bdc8c54b12de67c91 +MISC ChangeLog-2015 27346 SHA256 db0bb8d10394e7d5f06d0eb1ce7d45b0e267eb7cced16925f7a37a08090702e0 SHA512 556243d2155aeb72ee4ce7c3618092dfbd05f5eb2f9f060d342f5e60d60c17fbb87d01a81551ba57f21fde30db14cd1d3ed40923a932d41e3ea0448c2f8eb6e4 WHIRLPOOL ebfb08cefce5834c0565250e81b83b6e94d2b8cf314e865f944f230ed92648df6dd952ab36aee43abaf6927cabb272f06d4f7b10728deb52dbcf2f9fbcdf0aa4 +MISC metadata.xml 359 SHA256 ea7c17331c1af2275bb4b95df1e235a91f2fdb25dc8348fa08ef3d467da407e4 SHA512 07fe8b368b9f16c31d09701b1b1f6714ea3a305f9578705681b212d442e2e216a2d5649e9c76195f004f782a6e32e1eb94a8d9742e6593ce1bd76a7a8af6f385 WHIRLPOOL 877e534993ba203dcdedf261154c482508170d2ea94344e9b4fa8885e76160b5a125c2cbd94e5834d8365c253ebfc70bd37b97847c2041595262f48ada9af118 diff --git a/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch b/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch new file mode 100644 index 000000000000..b58fd00a10b8 --- /dev/null +++ b/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch @@ -0,0 +1,99 @@ +From c50f193f69f9b14dd26fafb7cb4c9514eaa6f15e Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Thu, 26 Jun 2014 12:45:18 +0200 +Subject: [PATCH 1/2] bug#732275: rename func_data to gfunc_data for AIX + +--- + include/orbit/orb-core/allocators.h | 2 +- + src/idl-compiler/orbit-idl-utils.c | 14 +++++++------- + src/idl-compiler/orbit-idl2.h | 4 ++-- + 3 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/include/orbit/orb-core/allocators.h b/include/orbit/orb-core/allocators.h +index 0401a15..1861ca1 100644 +--- a/include/orbit/orb-core/allocators.h ++++ b/include/orbit/orb-core/allocators.h +@@ -41,7 +41,7 @@ gpointer ORBit_realloc_tcval (gpointer old, + Below, some magic values of the fnc ptr are defined. + **/ + typedef gpointer (*ORBit_Mem_free_fn) (gpointer mem, +- gpointer func_data); ++ gpointer gfunc_data); + + #define ORBIT_MEMHOW_HOW(how) ((how) & 0x3) + #define ORBIT_MEMHOW_ELEMENTS(how) ((how) >> 2) +diff --git a/src/idl-compiler/orbit-idl-utils.c b/src/idl-compiler/orbit-idl-utils.c +index 3bb0467..04fe4a2 100644 +--- a/src/idl-compiler/orbit-idl-utils.c ++++ b/src/idl-compiler/orbit-idl-utils.c +@@ -362,7 +362,7 @@ orbit_idl_print_node(IDL_tree node, int indent_level) + + static void + IDL_tree_traverse_helper(IDL_tree p, GFunc f, +- gconstpointer func_data, ++ gconstpointer gfunc_data, + GHashTable *visited_nodes, + gboolean include_self) + { +@@ -376,17 +376,17 @@ IDL_tree_traverse_helper(IDL_tree p, GFunc f, + for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem; + curitem = IDL_LIST (curitem).next) { + IDL_tree_traverse_helper (IDL_get_parent_node +- (IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, func_data, visited_nodes, TRUE); ++ (IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, gfunc_data, visited_nodes, TRUE); + } + + if (include_self) +- f(p, (gpointer)func_data); ++ f(p, (gpointer)gfunc_data); + } + + void + IDL_tree_traverse_parents_full (IDL_tree p, + GFunc f, +- gconstpointer func_data, ++ gconstpointer gfunc_data, + gboolean include_self) + { + GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal); +@@ -400,7 +400,7 @@ IDL_tree_traverse_parents_full (IDL_tree p, + if (!p) + return; + +- IDL_tree_traverse_helper (p, f, func_data, visited_nodes, include_self); ++ IDL_tree_traverse_helper (p, f, gfunc_data, visited_nodes, include_self); + + g_hash_table_destroy (visited_nodes); + } +@@ -408,9 +408,9 @@ IDL_tree_traverse_parents_full (IDL_tree p, + void + IDL_tree_traverse_parents (IDL_tree p, + GFunc f, +- gconstpointer func_data) ++ gconstpointer gfunc_data) + { +- IDL_tree_traverse_parents_full (p, f, func_data, TRUE); ++ IDL_tree_traverse_parents_full (p, f, gfunc_data, TRUE); + } + + /* For use by below function */ +diff --git a/src/idl-compiler/orbit-idl2.h b/src/idl-compiler/orbit-idl2.h +index b58f57f..670e072 100644 +--- a/src/idl-compiler/orbit-idl2.h ++++ b/src/idl-compiler/orbit-idl2.h +@@ -16,10 +16,10 @@ void orbit_idl_print_node (IDL_tree node, + int indent_level); + void IDL_tree_traverse_parents (IDL_tree p, + GFunc f, +- gconstpointer func_data); ++ gconstpointer gfunc_data); + void IDL_tree_traverse_parents_full (IDL_tree p, + GFunc f, +- gconstpointer func_data, ++ gconstpointer gfunc_data, + gboolean include_self); + gboolean orbit_cbe_type_contains_complex (IDL_tree ts); + void orbit_idl_check_oneway_op (IDL_tree op); +-- +1.8.3.2 + diff --git a/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch b/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch new file mode 100644 index 000000000000..fcfeefba08cb --- /dev/null +++ b/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch @@ -0,0 +1,22 @@ + test/everything/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am +index 32beb36..1eef7ac 100644 +--- a/test/everything/Makefile.am ++++ b/test/everything/Makefile.am +@@ -73,12 +73,12 @@ server_DEPENDENCIES=${EVERYTHING_BUILT} $(included_src) + + IDL_FLAGS= --showcpperrors --add-imodule + IDL_FILES= everything.idl +-include $(top_srcdir)/Makefile.shared ++include ../../Makefile.shared + + BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c + CLEANFILES = ${BUILT_SOURCES} iorfile + +-TESTS = $(srcdir)/test.sh ++TESTS = test.sh + + EXTRA_DIST = $(IDL_FILES) test.sh $(included_src) + diff --git a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch b/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch new file mode 100644 index 000000000000..394919f98568 --- /dev/null +++ b/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch @@ -0,0 +1,46 @@ +From 31236105deaa4b50a70aa256819bfc4790f705d8 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Sun, 3 Mar 2013 13:29:24 -0500 +Subject: [PATCH] Add an option to build libname-server-2.a's objects as PIC + +Needed for Gentoo hardened, see https://bugs.gentoo.org/show_bug.cgi?id=312161 +--- + configure.in | 9 +++++++++ + src/services/name/Makefile.am | 1 + + 2 files changed, 10 insertions(+) + +diff --git a/configure.in b/configure.in +index 0879051..38b7b8b 100644 +--- a/configure.in ++++ b/configure.in +@@ -118,6 +118,15 @@ if test z$enable_purify = zyes; then + AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled]) + fi + ++AC_ARG_ENABLE([libname-server-pic], ++ [AS_HELP_STRING([--enable-libname-server-pic], [force libname-server-2.a to be built as PIC])]) ++if test x$enable_libname_server_pic = xyes; then ++ LIBNAME_SERVER_PIC=$lt_prog_compiler_pic ++else ++ LIBNAME_SERVER_PIC= ++fi ++AC_SUBST(LIBNAME_SERVER_PIC) ++ + AC_MSG_CHECKING(which idl compiler to use) + IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)" + AC_ARG_WITH(idl-compiler, +diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am +index 7212557..21b7365 100644 +--- a/src/services/name/Makefile.am ++++ b/src/services/name/Makefile.am +@@ -65,6 +65,7 @@ name_client_2_LDADD = $(LDADDS) + libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \ + name-support.c name-support.h + libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h ++libname_server_2_a_CFLAGS = $(INCLUDES) $(LIBNAME_SERVER_PIC) + + orbit_name_server_2_SOURCES = boot.c + orbit_name_server_2_LDFLAGS = $(FLAGS) +-- +1.8.1.5 + diff --git a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch b/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch new file mode 100644 index 000000000000..2344935f46d2 --- /dev/null +++ b/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch @@ -0,0 +1,29 @@ +From 8b9acc9bd4ac9be12317f24c7ecafc4200e19609 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Tue, 12 Feb 2013 00:27:41 -0500 +Subject: [PATCH] Fix link_protocol_is_local_ipv46 for ipv4 on some + ipv6-enabled machines + +Ensure that saddr is compared to an ipv4 local_addr, not to an ipv6 one, +by setting hints.ai_family before calling getaddrinfo(). + +https://bugzilla.gnome.org/show_bug.cgi?id=693636 +--- + linc2/src/linc-protocols.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/linc2/src/linc-protocols.c b/linc2/src/linc-protocols.c +index e6895f4..22a77aa 100644 +--- a/linc2/src/linc-protocols.c ++++ b/linc2/src/linc-protocols.c +@@ -383,6 +383,7 @@ link_protocol_is_local_ipv46 (const LinkProtocolInfo *proto, + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_CANONNAME; ++ hints.ai_family = proto->family; + + if (getaddrinfo(link_get_local_hostname(), NULL, &hints, &local_addr) != 0) { + if (!warned++) +-- +1.8.1.2 + diff --git a/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch b/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch new file mode 100644 index 000000000000..113b90465bae --- /dev/null +++ b/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch @@ -0,0 +1,25 @@ +From c67303ecfdf80072a2852433c7f7818113e61c06 Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Thu, 26 Jun 2014 12:37:59 +0200 +Subject: [PATCH 2/2] bug#732274: fix parallel build failure + +--- + src/services/name/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am +index deda1ed..8cf868e 100644 +--- a/src/services/name/Makefile.am ++++ b/src/services/name/Makefile.am +@@ -68,7 +68,7 @@ libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h + + orbit_name_server_2_SOURCES = boot.c + orbit_name_server_2_LDFLAGS = $(FLAGS) +-orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h ++orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h libname-server-2.a + orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS) + + $(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h +-- +1.8.3.2 + diff --git a/gnome-base/orbit/metadata.xml b/gnome-base/orbit/metadata.xml new file mode 100644 index 000000000000..0d28a3e32644 --- /dev/null +++ b/gnome-base/orbit/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="pic">Force libname-server-2 to be built as PIC; needed on + hardened systems</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/orbit/orbit-2.14.19-r5.ebuild b/gnome-base/orbit/orbit-2.14.19-r5.ebuild new file mode 100644 index 000000000000..927a74b0de2b --- /dev/null +++ b/gnome-base/orbit/orbit-2.14.19-r5.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +GCONF_DEBUG="yes" +GNOME_ORG_MODULE="ORBit2" +GNOME_TARBALL_SUFFIX="bz2" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 toolchain-funcs autotools multilib-minimal + +DESCRIPTION="ORBit2 is a high-performance CORBA ORB" +HOMEPAGE="https://projects.gnome.org/ORBit2/" + +LICENSE="GPL-2 LGPL-2" +SLOT="2" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="pic static-libs test" +REQUIRED_USE="test? ( debug )" + +RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}] + >=dev-libs/libIDL-0.8.14-r1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + virtual/pkgconfig +" + +DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/orbit-2.0/orbit/orbit-config.h ) + +MULTILIB_CHOST_TOOLS=( /usr/bin/orbit2-config ) + +src_prepare() { + # Fix wrong process kill, bug #268142 + sed "s:killall lt-timeout-server:killall timeout-server:" \ + -i test/timeout.sh || die "sed 1 failed" + + # Do not mess with CFLAGS + sed 's/-ggdb -O0//' -i configure.in configure || die "sed 2 failed" + + if ! use test; then + sed -i -e 's/test //' Makefile.am || die + fi + + # Drop failing test, bug #331709 + sed -i -e 's/test-mem //' test/Makefile.am || die + + # Fix link_protocol_is_local() for ipv4 on machines with ipv6 + # https://bugzilla.gnome.org/show_bug.cgi?id=693636 + epatch "${FILESDIR}/${PN}-2.14.19-link_protocol_is_local.patch" + + # Build libname-server-2.a with -fPIC on hardened, bug #312161 + epatch "${FILESDIR}/${PN}-2.14.19-fPIC.patch" + + epatch "${FILESDIR}"/${P}-automake-1.13.patch + epatch "${FILESDIR}"/${P}-parallel-build.patch #273031 + epatch "${FILESDIR}"/${P}-aix-func_data.patch #515094 + + eautoreconf + gnome2_src_prepare + + # we have to copy sources, there is something that causes tests + # to segfault when libs are out-of-source built. + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=() + + # We need to unset IDL_DIR, which is set by RSI's IDL. This causes certain + # files to be not found by autotools when compiling ORBit. See bug #58540 + # for more information. Please don't remove -- 8/18/06 + unset IDL_DIR + + # We need to use the hosts IDL compiler if cross-compiling, bug #262741 + if tc-is-cross-compiler; then + # check that host version is present and executable + [[ -x ${EPREFIX}/usr/bin/orbit-idl-2 ]] || die "Please emerge ~${CATEGORY}/${P} on the host system first" + myconf=("${myconf[@]}" "--with-idl-compiler=${EPREFIX}/usr/bin/orbit-idl-2") + fi + gnome2_src_configure \ + $(use_enable pic libname-server-pic) \ + $(use_enable static-libs static) \ + "${myconf[@]}" +} + +multilib_src_compile() { + gnome2_src_compile +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_test() { + # can fail in parallel, see bug #235994 + emake -j1 check +} |