diff options
Diffstat (limited to 'gnome-extra')
27 files changed, 225 insertions, 1065 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz Binary files differindex 2f37db103dfd..320714558dbc 100644 --- a/gnome-extra/Manifest.gz +++ b/gnome-extra/Manifest.gz diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest index ae966ad007ef..33354583be31 100644 --- a/gnome-extra/cinnamon-translations/Manifest +++ b/gnome-extra/cinnamon-translations/Manifest @@ -5,5 +5,6 @@ DIST cinnamon-translations-3.6.3.tar.gz 9486325 BLAKE2B 75d25beb66dc28565eb6d61f EBUILD cinnamon-translations-2.8.3.ebuild 1332 BLAKE2B b43c026ba0fdceb789f88acc3d7168786bca3890800d149fedb649541e66223c58001a05be03ca309285d3ef62e484916ce2d12700332bdca15ac85ed3ec8cbd SHA512 c67ca8b9b34a5325bc3270e63361a6d88abeb9bbf74e221864a5c5a78498dc65d8c59263ba349b2bd112d375cec0164c2fc9c511f32bf671e44fa644c9e3df90 EBUILD cinnamon-translations-3.0.3.ebuild 1309 BLAKE2B a97b741cada86a5c09c99d1db2001ec18ba44ebdfd5836c4c4130342c73feca67e38ecc73bf21baf6934b130acfdd021b2a9d1e04b35bf5a95191f434288bc8a SHA512 ba36f43ca6821aec047aefd7f974ead3691aac0f9c2cee1c38bab8b0ebc9ee9dff2d023f2c9e6358ab5138279900711ae0d80993630f82b5907ddd1fc55d91c8 EBUILD cinnamon-translations-3.2.0.ebuild 1311 BLAKE2B 0780f240e548eb7fc86d4b7dfa715aa8d0e14b715f4b99b76accf6f01a7071a0fa473c8ff6eb6b25725183332e0c590091c2b4ff4134aff4263d83eb344c3cf3 SHA512 b30dae34a0203b22459f57a58dd0a97ec0b69ce64ef1447a2d5db1cc7cbe314a4e2da1570989ffb73cc495b647818f87d244a0f0e009b4243d2bb562b86bc908 +EBUILD cinnamon-translations-3.6.3-r1.ebuild 1361 BLAKE2B b30f76730a9e283a793ad8036e5e4bd5a6aca87e02903c6c87e64c67db1149ae426e37036dd94e2ab163a0d1ce1318ada461786e9e5df939fb3096cb0b807a20 SHA512 9eefaf04e7d7f151df23305fe6e84b8d9e05395def647b3773a762ab369f59e1521af377ff162c266272ac1f6608d8905b9920f22c6a2a4f3c6adee3d3c847c1 EBUILD cinnamon-translations-3.6.3.ebuild 1309 BLAKE2B 7cff20355506a7a644f58bf10b0498fb9f08782177d78af6790c590703df83d7533239c033058adf903ad580572857959d9b26ee9daab59cb5cc8eed7a0924f6 SHA512 dd6b64f23edb69ff0a8672dee36ce4f34bb60a7883b265cb6b6c3caffcf3ad57419551dd4057f6b386df679ae6cbc28fb58abce676c844e80e50745fca5f8d83 MISC metadata.xml 348 BLAKE2B 22e9f760365b2c7e8aee07556c723590b93f615fcab90c687dbaa55f4a32262ef29b1d576f68830caf6c21a315e87009c0101b98fac856c70d88269a12bdc251 SHA512 357310d45466db6b2f600aacce60220f88810d91ff228bdfb874c3f3c7148c6ad599c11d87c63e1b2650361361e6a3accce18700aa15046322514f5065cd0777 diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild new file mode 100644 index 000000000000..8f055fc0aec4 --- /dev/null +++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu" + +inherit l10n + +DESCRIPTION="Translation data for Cinnamon" +HOMEPAGE="http://cinnamon.linuxmint.com/" +SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6" +RDEPEND="${DEPEND}" +RESTRICT="test" # tests are for upstream translators and need network access + +src_configure() { :; } + +src_install() { + # Cannot run before since locales are not in the expected place for this to work + l10n_find_plocales_changes "${S}"/usr/share/locale "" "" + + install_locale() { + dodir /usr/share/locale + insinto /usr/share/locale + doins -r usr/share/locale/${1} + } + l10n_for_each_locale_do install_locale +} diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest index 29e254154592..162f8ca1fd27 100644 --- a/gnome-extra/gnome-boxes/Manifest +++ b/gnome-extra/gnome-boxes/Manifest @@ -1,5 +1,3 @@ -DIST gnome-boxes-3.24.0.tar.xz 1710652 BLAKE2B 0b574fcb54c9a6ab2323f08caabd8aa3d201bcd0f83fcaf6b5dc15aef0da8fc6718128f28cfa0d50c02ad341d699c1cbadec89dbc50c1a4bea08865bd8e3f0d4 SHA512 979d5c0f2cef052e2713508fc2fd46d64a3a325edd38dd0aa99f2e9700efd3f84916847b35487f9d7eb5e5e1c5f3b4b712b649fecf1523821c3488fa6b250026 DIST gnome-boxes-3.24.1.tar.xz 1710348 BLAKE2B ce90cc1a6baefa45c1a553b059f4fa7ac5c9a6fbd7a2d71377a9c6f38fddb7ac5a110f38d0a65b45cf2ba948ebee6026cc22b5f93a2ba521c9db6cb20bd3dc37 SHA512 a687dd65af91d717862bba0a81d715b64de1092cbb5ffd8a756fe80988c84110127f186007e8cf4011bf23cc0ec0adb346ead72ef47c655f85a7fcb9ed3ec393 -EBUILD gnome-boxes-3.24.0.ebuild 2651 BLAKE2B 1e7e96893c782328e4c58473318b017086688eb130cac63ad9c79f5009416c6455b9f1dced682226a83edee865895f9dcb02a1e0fb1e06483952a48bdbc34c27 SHA512 5eb8b4850f4eec7a193a2b13578d9c80bda0880ba8fa469b3c0f882b2c105493e308abcd3a333831e0d7e10874e90b1c7bf86557234187004b7afe7ffea1ad99 EBUILD gnome-boxes-3.24.1-r1.ebuild 2625 BLAKE2B cbe862162ca7e0655345a16d6abdd819b731ca6fdfdd7e8eb869ede04bef9918a7f48f499965e0cbf749902cffabba8549dbe833d75751ea9541bcd2a379b9ee SHA512 b247c4bfd29b6debb3f9b7680e658653db2e0aae204b9cc5f39419fdc6eadbf9b1ba9bacc998d63ef39dbde27d16b58730add58be273ec8d781fb2933f80a73c MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.24.0.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.24.0.ebuild deleted file mode 100644 index 7bf33027ce11..000000000000 --- a/gnome-extra/gnome-boxes/gnome-boxes-3.24.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VALA_USE_DEPEND="vapigen" -VALA_MIN_API_VERSION="0.28" - -inherit gnome2 linux-info readme.gentoo-r1 vala - -DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems" -HOMEPAGE="https://wiki.gnome.org/Apps/Boxes" - -LICENSE="LGPL-2" -SLOT="0" - -# We force 'bindist' due to licenses from gnome-boxes-nonfree -IUSE="" #bindist - -KEYWORDS="amd64" # qemu-kvm[spice] is 64bit-only - -# NOTE: sys-fs/* stuff is called via exec() -# FIXME: ovirt is not available in tree -# FIXME: use vala.eclass but only because of libgd not being able -# to use its pre-generated files so do not copy all the -# vala deps like live ebuild has. -# FIXME: qemu probably needs to depend on spice[smartcard] -# directly with USE=spice -RDEPEND=" - >=app-arch/libarchive-3:= - >=dev-libs/glib-2.38:2 - >=dev-libs/gobject-introspection-0.9.6:= - >=dev-libs/libxml2-2.7.8:2 - >=sys-libs/libosinfo-0.2.12 - >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] - >=app-emulation/libvirt-0.9.3[libvirtd,qemu] - >=app-emulation/libvirt-glib-0.2.3 - >=x11-libs/gtk+-3.19.8:3 - >=net-libs/gtk-vnc-0.4.4[gtk3] - app-crypt/libsecret - app-emulation/spice[smartcard] - >=net-misc/spice-gtk-0.32[gtk3,smartcard,usbredir] - virtual/libusb:1 - - >=app-misc/tracker-0.16:0=[iso] - - >=sys-apps/util-linux-2.20 - >=net-libs/libsoup-2.38:2.4 - - sys-fs/mtools - >=virtual/libgudev-165:= -" -# !bindist? ( gnome-extra/gnome-boxes-nonfree ) - -DEPEND="${RDEPEND} - $(vala_depend) - app-text/yelp-tools - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules. -If you have an Intel Processor, run: -# modprobe kvm-intel - -If you have an AMD Processor, run: -# modprobe kvm-amd" - -pkg_pretend() { - linux-info_get_any_version - - if linux_config_exists; then - if ! { linux_chkconfig_present KVM_AMD || \ - linux_chkconfig_present KVM_INTEL; }; then - ewarn "You need KVM support in your kernel to use GNOME Boxes!" - fi - fi -} - -src_prepare() { - # Do not change CFLAGS, wondering about VALA ones but appears to be - # needed as noted in configure comments below - sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die - - vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - # debug needed for splitdebug proper behavior (cardoe), bug #???? - gnome2_src_configure \ - --enable-debug \ - --disable-strict-cc \ - --disable-ovirt -} - -src_install() { - gnome2_src_install - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - readme.gentoo_print_elog -} diff --git a/gnome-extra/gnome-color-chooser/Manifest b/gnome-extra/gnome-color-chooser/Manifest deleted file mode 100644 index d50c5843fe49..000000000000 --- a/gnome-extra/gnome-color-chooser/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST gnome-color-chooser-0.2.5.tar.bz2 228808 BLAKE2B 554e2d296d6e2f9bc73dce64f72954fa30642306c48d5df26d4450a947ea8f1b87a177c441d792e91bd7fc9b0a28a8ef9f71dde8c7624874b0fe5e2388015020 SHA512 bd29e005456142ffa459f38aedce13302e60dbb6e649883d099810df1f6b3765c28b8c69ef3f19c8252c2fec895df90ae660a43c5790d204e8690c74b35f3cc4 -EBUILD gnome-color-chooser-0.2.5.ebuild 1188 BLAKE2B 07d0d30fee279a2d51c4d2ad79c79ae76ccf8e55e0a0e70629fbbd633bd56c39f0a176dd58c7cba92197aa6be1485b5da05d3e6009b478d3f9ca91e4b8d24e58 SHA512 3b4938183a02b7f363c3484f74560014d3634df76fa676c148945c5a615e06d2a74854459bee84533ffbb062c98b225689ea5238dc70203e37593c7d5cfd07a8 -MISC metadata.xml 244 BLAKE2B eaa379018e1dda1d64fedc18d9a4e075572d90acdd9c56acfae1842bdf4222b7d3d924d43d8d684f207250abf4b81096c9d832f49940b881aaf4b16b7fbcb598 SHA512 a566c44dc596386edd7e6aca0c606bc28268ba0494ff90e9e6c7938169b71a4c21fb05c01d66b3b820041ceb9755daea72f5cdabc7d6ebcd6684f2e47759f114 diff --git a/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild b/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild deleted file mode 100644 index 9a9cbb6a5a0a..000000000000 --- a/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="no" - -inherit gnome2 flag-o-matic - -DESCRIPTION="GTK+/GNOME color customization tool" -HOMEPAGE="http://gnomecc.sourceforge.net/" -SRC_URI="mirror://sourceforge/gnomecc/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=" - dev-cpp/atkmm - >=dev-cpp/libglademm-2.6.0:2.4 - dev-cpp/glibmm:2 - >=dev-cpp/gtkmm-2.8.0:2.4 - dev-libs/glib:2 - dev-libs/libsigc++:2 - >=dev-libs/libxml2-2.6.0 - >=gnome-base/libgnome-2.16.0 - >=gnome-base/libgnomeui-2.14.0 - x11-libs/gtk+:2 - x11-libs/pango -" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig -" - -src_configure() { - # Don't pass --enable/disable-assert since it has broken - # AC_ARG_ENABLE call. Pass -DNDEBUG to cppflags instead. - use debug || append-cppflags -DNDEBUG - - append-cxxflags -std=c++11 - - gnome2_src_configure \ - --disable-link-as-needed -} - -pkg_postinst() { - elog "To use gnome-color-chooser themes you may need to add:" - elog " include \".gtkrc-2.0-gnome-color-chooser\"" - elog "to ~/.gtkrc-2.0 for each user, otherwise themes may not be applied." - - gnome2_pkg_postinst -} diff --git a/gnome-extra/gnome-color-chooser/metadata.xml b/gnome-extra/gnome-color-chooser/metadata.xml deleted file mode 100644 index 740db1c713e6..000000000000 --- a/gnome-extra/gnome-color-chooser/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">gnomecc</remote-id> - </upstream> -</pkgmetadata> diff --git a/gnome-extra/gnome-directory-thumbnailer/Manifest b/gnome-extra/gnome-directory-thumbnailer/Manifest index 3b65364b7717..6fc2274401e2 100644 --- a/gnome-extra/gnome-directory-thumbnailer/Manifest +++ b/gnome-extra/gnome-directory-thumbnailer/Manifest @@ -1,5 +1,3 @@ DIST gnome-directory-thumbnailer-0.1.10.tar.xz 277524 BLAKE2B 3ecff07a7984b1edebf07d5e0199110bfb7e841a5da03d0d8aa55c0029c6e1fa6b6409bbb3294f02187d14ff55580159863f36cff5ce6157f23f1949a0e10661 SHA512 0e6a2874f633bfa32f0028f99c8535b3da0b44b3c89cf1e20a8dd23c8cf2e0e7bf7204af04587c4cf3a9614d9111814a8c6474bb43229178447cb3143672f0fc -DIST gnome-directory-thumbnailer-0.1.9.tar.xz 275432 BLAKE2B e95d3374e89e8a9dbd457e04c03709603b8472745f71831bc7b41d8d28919a4ff76218a7a8f978727424af924fdfa29d637790f951c103dfdfb3395181de1d4e SHA512 c7299eb5127ec138aa5ac1ea0a5c5d3511a16b4d71ab6c5fc5e0baff04837e282d5313293623f312a448b2f3ef0a83f5e7d805f600998cb1a4a7b29b89d243e2 EBUILD gnome-directory-thumbnailer-0.1.10.ebuild 496 BLAKE2B 183cac210a7897aafda4772c734dfd99d2a31b766b506264931f44e8aaccd85f80b49e54d06a0288e3d3bd2443d4c95fe50d0f4364729f53a9744c96f89d0acb SHA512 4501b8e8d2ac36bb2651104c502ba957c50a7626d6bdc80c842a8ab9d392ecbb8776f3451b8270ccc73d81dc725818b3ed8fa1d47301d6eafa62e67005e1501e -EBUILD gnome-directory-thumbnailer-0.1.9.ebuild 496 BLAKE2B b900533b7125268fd4e17059d8de3a6d2b160ba0819a2618b35427a2e26ec00030977fe0a083dc1b383d6e90dffaf1c520341448ab6f3e70c25a68dd5f377c7e SHA512 0c4708d1cebbe2bdb798de6f1dc14c6603bc81196941817b1931c04d082558fbc261a8924627697143e94d4d9e2d7d25fb663066593db02508f564557cd2d82b MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.9.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.9.ebuild deleted file mode 100644 index 6a24cf3e8095..000000000000 --- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.9.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Thumbnail generator for directories" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer" - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="" -KEYWORDS="amd64 x86" - -RDEPEND=" - >=dev-libs/glib-2.35:2 - >=x11-libs/gdk-pixbuf-2.36.5:2 - >=gnome-base/gnome-desktop-2.2:3= - x11-libs/gtk+:3 -" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - virtual/pkgconfig -" diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest index b7aeac7b77a9..404334d21b8e 100644 --- a/gnome-extra/gnome-shell-frippery/Manifest +++ b/gnome-extra/gnome-shell-frippery/Manifest @@ -1,5 +1,3 @@ -DIST gnome-shell-frippery-3.20.0.tgz 79090 BLAKE2B cb85e02093f445044ab0635beff420a2d4652c2aea41a206c217df6bfa7f99728cb9923a87f65e53885a7edab081d0f2c4e86a2560e1226fd8a9234f310dc4c8 SHA512 da78a432aa3192d1f41a20e5f65c14f518d113eb751d6df34207109bff9777a0d638f4ebb576e2ff06b085cb98212e2dbd67c1b70d9976b57a6a224f197c43f4 DIST gnome-shell-frippery-3.24.0.tgz 79322 BLAKE2B d5e6db3d165708836e0cec4c1c2f6ffd3227876a566759ac9db9c7ce1d71841002a991df0bd2bf2279e79dfb9a87af1e8b10abe850f972ff2c9f49397106b8b5 SHA512 7f12f3be7ec4d55cf9f96c81c5af649cbb410fe79e880b3b5469e1554ae8419e40d5a77ab9d3889758a2729dd31e59b08e507803b84886305b75fe27df5eebd5 -EBUILD gnome-shell-frippery-3.20.0.ebuild 914 BLAKE2B 7e5b9608209f6c76d9fe6281e9d262195fc97047fa7158e9c08ea107869900bc65ce997c1a93b61769e98f663536da934f2bb196c75fdde95bca5ccaab4f3ab1 SHA512 ccac0795713377614f5f3ca85cfb69812e61721ffa56a4bba7a7c4d8580f3544eab2b9796eaba91c1f162e182de247604b01bc5438270708161d787638d0b7a3 EBUILD gnome-shell-frippery-3.24.0.ebuild 914 BLAKE2B 116a6673c879e0a10db2af34f5e3c13c386f92bb73abd51a86ae884436a27af5b02c80fe9816c5f9e6fce89b2a95c550163c288f0fdbd5284af6871bb192a041 SHA512 b87203ae36ddd9a66427ecc57f57ccc4973f0e7ae97b008625f3456688b2005afbdbcf97ecd0d0a6b742f7851acbcc6132dc42fd0ab625b44ce8ff06258181b7 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.0.ebuild deleted file mode 100644 index 9312554cb72d..000000000000 --- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3" -HOMEPAGE="http://frippery.org/extensions/index.html" -SRC_URI="http://frippery.org/extensions/${P}.tgz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - app-eselect/eselect-gnome-shell-extensions - >=dev-libs/gjs-1.29 - dev-libs/gobject-introspection:= - gnome-base/gnome-menus:3[introspection] - >=gnome-base/gnome-shell-3.20 - media-libs/clutter:1.0[introspection] - x11-libs/pango[introspection] -" -DEPEND="" - -S="${WORKDIR}/.local/share/gnome-shell" - -src_install() { - insinto /usr/share/gnome-shell/extensions - doins -r extensions/*@* - dodoc gnome-shell-frippery/{CHANGELOG,README} -} - -pkg_postinst() { - ebegin "Updating list of installed extensions" - eselect gnome-shell-extensions update - eend $? -} diff --git a/gnome-extra/gpointing-device-settings/Manifest b/gnome-extra/gpointing-device-settings/Manifest deleted file mode 100644 index e607c00b68f7..000000000000 --- a/gnome-extra/gpointing-device-settings/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX gpointing-device-settings-1.5.1-crash.patch 1097 BLAKE2B 5bc41cb56e86184ad2635a21f4f2c71c88b14e9753cb19f55e8b9cd0918d1841a7b74dc84794cd25db665ff1be67e25d6dbca7ba33a4bca76f1759df4c39ddd1 SHA512 6c4da6cdd9bcc2735737643f54aa6d361a23e9a588189db7a0047d4426b023a329b7078cb12c9fb1787fe4489a7d35b0cc31703b2596738494d76ea900283aa8 -AUX gpointing-device-settings-1.5.1-fix-build.patch 1167 BLAKE2B 0796760d5e990c13192648eb6495d450e731cd68414daea225ae79131e9462b5756cb417858416566b0c51091a054ffa8e65de06fa45aa09ea37f778e9f6c594 SHA512 ec0e5636b557aa95ae93422fb06e8137acbaeede6a6b9f2936a84c53c032f8c4c0200728141f774fe49532c8288b5bb3c840e5e9d22e471af7ccef9109d85488 -AUX gpointing-device-settings-1.5.1-gsd-3.2-fix.patch 933 BLAKE2B 600467292e74734359ec5d5ff00a904e4521a9e8b5818cd6c3f70e5127eec1efd59259211c33034def00849e9b16f39bc97de4aa9ce8d542f964290ae68adfb9 SHA512 ea9fd1e61c0455e38c8d36f147e1b44cf07b400e90a57f2544722d93030be1bd9ea31498e77ea17726ab277bfe064b62985e28b2963ff61513312627d7e23daf -AUX gpointing-device-settings-1.5.1-gsd-crash.patch 2062 BLAKE2B a767ac2a60914b3bad0cd167b27aab4cab0aa1e0054d75eb5dbcee9949409087667eb0595591c8f59ffcb7f2ae906999a236555f52ed0521bbd8b5538ba40b4e SHA512 c81c13950673bcdb6b47b94d591776efc0b9c037559d132bb17d40369b82f190b6280351e8998d2be0046090a5235dcb67253bbcd34777f23ff340c84796eff6 -AUX gpointing-device-settings-1.5.1-gtk22.patch 8272 BLAKE2B d92b4482085a172afb461caf019ae561c777d6829049b8d49ef4d3d4f14d3c83936095a29d932f629b6ffd63c9a9960f1c6c68f44c7c2baaf84f7ddc50d29811 SHA512 5650ceaa6e369a331e4e171a2d920167a208a1b73621419879079d53e4ee0cc4210401d0879e40d3fceefca39cf6fc391ee01a8e7a81d25bbc14b560fa83c8fb -AUX gpointing-device-settings-1.5.1-plugin.patch 5068 BLAKE2B 7dec9aeea09d7dad243a1a0f5c0564358718996dda53b9b1fb26c5f6fa6a7e5794530ceedfdda131a44980b6dfff81b2deb9227fe5628c0dc7bdd2f5ec2f9424 SHA512 3bc8a461d33f95808f5e4473ab21db9a3c62011fffddc61ca8e6ebcec791ecc1c82b87bd54e7b5c77fa72e3f4e90e5ce951760b05be72c382ff8c5e06a6807f6 -AUX gpointing-device-settings-1.5.1-reboot.patch 9300 BLAKE2B d096f966a07abc9a1faa00a3ab346864995dd30cc95bacf30e5e2380f95848167413c388349e98990ae72a4953ea59132db68bd6219c441ed4d0c9222c21f677 SHA512 f7d5f1ad8fbc9443aa89f237c92ac048a0316cef4944252f27c79a0f0aada65a30b7926776f6c3321fa03b50bab77af2f9f0e407fb80896338d46b3ac266f307 -DIST gpointing-device-settings-1.5.1.tar.gz 458352 BLAKE2B 7cd48d267c331f7fa27dc5ef12b17c43fcb293baf9e24ea9766422cc5b4f09c27eb97024c52ec4ab204a25a15bb94311ce716dd7a3d8314b8db6cc30502fe314 SHA512 37bcecdde4da1714de1c0562d0ba8c875aa197a0b2fad55a868d659ad0ed6a37156b408e9ae07f95091391d972ceaa268636ee579f4a3f176203898b227e3b76 -EBUILD gpointing-device-settings-1.5.1-r3.ebuild 1317 BLAKE2B 30d22ddf6ab33610af48a89158acf75cad49918fdd29c669d91e58658ba8872cf07db337fef6003e18017dd82876d1ff1c120e6226e32a0d7a26bcf676b7c850 SHA512 4eb0e212524fc489600f3de1afab32b54ce53ac98e14eff6c60979e22cc65587625fde7d662acb7ffd6d494927c7e020ba8232405ea9db2b4fcec51a09328568 -MISC metadata.xml 250 BLAKE2B 3da840670804a57e90b314ab9673cf6dd0adcc836dd5511037b3553b4d6eb727f0dc5ab0c6386f52dcbe57b04d0da4ba00b7449106bc4eac32a7e87662144588 SHA512 db3b134f1e0c0a92de7c23bd65eddb27b1291ef8624cf7f5bf3e40cf63edc5286459d385b2a09d58c244f253e953441980d1fad1b224f75a9d5cb32c38e3b95f diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch deleted file mode 100644 index 789925c0bc97..000000000000 --- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 70add06dec8413965f3e98b6ba9a3c82168ea72c -Author: Hiroyuki Ikezoe <poincare@ikezoe.net> -Date: Tue Mar 16 19:56:17 2010 +0900 - - Fix crash. - - We need to get xinput property if there is no gconf value for tapping time. - - Fix for #613022. - -diff --git a/modules/gpds-touchpad-ui.c b/modules/gpds-touchpad-ui.c -index 3bbcda6..a1cd31b 100644 ---- a/modules/gpds-touchpad-ui.c -+++ b/modules/gpds-touchpad-ui.c -@@ -1067,8 +1067,14 @@ set_tapping_time_from_preference (GpdsUI *ui, GtkBuilder *builder) - } - } - -- if (!gpds_ui_get_gconf_int(ui, GPDS_TOUCHPAD_TAP_TIME_KEY, &value)) -+ if (!gpds_ui_get_gconf_int(ui, GPDS_TOUCHPAD_TAP_TIME_KEY, &value) && !values) { -+ if (!gpds_xinput_ui_get_xinput_int_property(GPDS_XINPUT_UI(ui), -+ GPDS_TOUCHPAD_TAP_TIME, -+ &values, &n_values)) { -+ return; -+ } - value = values[0]; -+ } - - double_value = value; - object = gpds_ui_get_ui_object_by_name(GPDS_UI(ui), "tapping_time_scale"); diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch deleted file mode 100644 index 341d96fc9b50..000000000000 --- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gpointing-device-settings-1.5.1.orig/configure.ac gpointing-device-settings-1.5.1/configure.ac ---- gpointing-device-settings-1.5.1.orig/configure.ac 2010-02-05 00:38:20.000000000 +0100 -+++ gpointing-device-settings-1.5.1/configure.ac 2013-12-17 15:00:08.394574115 +0100 -@@ -3,10 +3,9 @@ - - AC_INIT(gpointing-device-settings, 1.5.1, - [http://bugzilla.gnome.org/enter_bug.cgi?product=GPointingDeviceSettings]) --AM_INIT_AUTOMAKE([1.9 tar-pax]) --AM_INIT_AUTOMAKE([foreign]) -+AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR([m4]) - - AM_PROG_LIBTOOL -@@ -146,9 +145,6 @@ - - GPDS_CFLAGS="$XINPUT_CFLAGS $GTK_CFLAGS" - GPDS_CFLAGS="$GPDS_CFLAGS $GCONF2_CFLAGS" --GPDS_CFLAGS="$GPDS_CFLAGS -DGTK_DISABLE_DEPRECATED" --GPDS_CFLAGS="$GPDS_CFLAGS -DGDK_DISABLE_DEPRECATED" --GPDS_CFLAGS="$GPDS_CFLAGS -DG_DISABLE_DEPRECATED" - GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_MODULEDIR=\\\"\"\$(gpds_moduledir)\"\\\"" - GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_DATADIR=\\\"\"\$(gpds_datadir)\"\\\"" - GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UIDIR=\\\"\"\$(gpds_uidir)\"\\\"" diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch deleted file mode 100644 index c92f0bd54c95..000000000000 --- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fixes build failnure on gnome-base/gnome-settings-daemon-3.2.2 - - gsd-pointing-device-plugin.c:59:1: warning: 'gsd_pointing_device_plugin_class_finalize' used but never defined [enabled by default] - CCLD libpointing-device.la - ld: .libs/libpointing_device_la-gsd-pointing-device-plugin.o: relocation R_X86_64_PC32 against undefined symbol `gsd_pointing_device_plugin_class_finalize' - -Gentoo-bug: http://bugs.gentoo.org/384001 -Patch-by: battle.jerboa@gmail.com ---- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2012-02-02 13:32:20.000000000 +0400 -+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2012-02-02 13:32:04.000000000 +0400 -@@ -214,6 +214,11 @@ - plugin_class->activate = activate; - plugin_class->deactivate = deactivate; - } -+ -+static void -+gsd_pointing_device_plugin_class_finalize (GsdPointingDevicePluginClass *klass) -+{ -+} - /* - vi:ts=4:nowrap:ai:expandtab:sw=4 - */ diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch deleted file mode 100644 index f694556b74ec..000000000000 --- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ru gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c ---- gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2010-12-20 01:29:09.204274003 -0500 -+++ gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2010-12-20 02:15:21.652274002 -0500 -@@ -96,19 +96,21 @@ - XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev; - - device_info = gpds_xinput_utils_get_device_info_from_id(notify_event->deviceid, NULL); -- if (notify_event->devchange == DeviceEnabled) { -- GsdPointingDeviceManager *manager; -+ if (device_info) { -+ if (notify_event->devchange == DeviceEnabled) { -+ GsdPointingDeviceManager *manager; - -- if (has_manager(plugin, device_info->name)) -- return GDK_FILTER_CONTINUE; -+ if (has_manager(plugin, device_info->name)) -+ return GDK_FILTER_CONTINUE; - -- manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type), -- device_info->name); -- if (manager) { -- gsd_pointing_device_manager_start(manager, NULL); -- plugin->managers = g_list_prepend(plugin->managers, manager); -+ manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type), -+ device_info->name); -+ if (manager) { -+ gsd_pointing_device_manager_start(manager, NULL); -+ plugin->managers = g_list_prepend(plugin->managers, manager); -+ } -+ } else if (notify_event->devchange == DeviceRemoved) { - } -- } else if (notify_event->devchange == DeviceRemoved) { - } - } - diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch deleted file mode 100644 index 154c54728540..000000000000 --- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -index 8a2d98f..ac0bcf1 100644 ---- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -@@ -124,7 +124,9 @@ add_device_presence_filter (GsdPointingDevicePlugin *plugin) - - gint op_code, event, error; - -- if (!XQueryExtension(GDK_DISPLAY(), -+ display = gdk_x11_get_default_xdisplay(); -+ -+ if (!XQueryExtension(display, - "XInputExtension", - &op_code, - &event, -@@ -132,8 +134,6 @@ add_device_presence_filter (GsdPointingDevicePlugin *plugin) - return; - } - -- display = gdk_x11_get_default_xdisplay(); -- - gdk_error_trap_push(); - DevicePresence(display, xi_presence, class_presence); - XSelectExtensionEvent(display, -diff --git a/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c b/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c -index 2038d53..f47e0a4 100644 ---- a/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c -+++ b/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c -@@ -348,7 +348,9 @@ add_device_presence_filter (GsdPointingDeviceManager *manager) - - gint op_code, event, error; - -- if (!XQueryExtension(GDK_DISPLAY(), -+ display = gdk_x11_get_default_xdisplay(); -+ -+ if (!XQueryExtension(display, - "XInputExtension", - &op_code, - &event, -@@ -356,8 +358,6 @@ add_device_presence_filter (GsdPointingDeviceManager *manager) - return; - } - -- display = gdk_x11_get_default_xdisplay(); -- - gdk_error_trap_push(); - DevicePresence(display, xi_presence, class_presence); - XSelectExtensionEvent(display, -diff --git a/src/gpds-xinput-pointer-info.c b/src/gpds-xinput-pointer-info.c -index d38afad..ce9a952 100644 ---- a/src/gpds-xinput-pointer-info.c -+++ b/src/gpds-xinput-pointer-info.c -@@ -55,7 +55,8 @@ gpds_xinput_utils_collect_pointer_infos (void) - XDeviceInfo *device_infos; - gint i, n_device_infos; - -- device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos); -+ device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), -+ &n_device_infos); - - for (i = 0; i < n_device_infos; i++) { - GpdsXInputPointerInfo *info; -diff --git a/src/gpds-xinput-utils.c b/src/gpds-xinput-utils.c -index 0f7ceea..5a3e3a2 100644 ---- a/src/gpds-xinput-utils.c -+++ b/src/gpds-xinput-utils.c -@@ -41,7 +41,8 @@ gpds_xinput_utils_get_device_info (const gchar *device_name, GError **error) - XDeviceInfo *device_infos; - gint i, n_device_infos; - -- device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos); -+ device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), -+ &n_device_infos); - - for (i = 0; i < n_device_infos; i++) { - if (device_infos[i].use != IsXExtensionPointer) -@@ -68,7 +69,7 @@ gpds_xinput_utils_get_device_info_from_id (XID id, GError **error) - XDeviceInfo *device_infos; - gint i, n_device_infos; - -- device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos); -+ device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), &n_device_infos); - - for (i = 0; i < n_device_infos; i++) { - if (device_infos[i].use != IsXExtensionPointer) -@@ -125,7 +126,7 @@ gpds_xinput_utils_open_device (const gchar *device_name, GError **error) - return NULL; - - gdk_error_trap_push(); -- device = XOpenDevice(GDK_DISPLAY(), device_info->id); -+ device = XOpenDevice(gdk_x11_get_default_xdisplay(), device_info->id); - gdk_error_trap_pop(); - if (!device) { - g_set_error(error, -diff --git a/src/gpds-xinput.c b/src/gpds-xinput.c -index d8bd1a2..66634b3 100644 ---- a/src/gpds-xinput.c -+++ b/src/gpds-xinput.c -@@ -100,7 +100,7 @@ dispose (GObject *object) - g_free(priv->device_name); - - if (priv->device) { -- XCloseDevice(GDK_DISPLAY(), priv->device); -+ XCloseDevice(gdk_x11_get_default_xdisplay(), priv->device); - priv->device = NULL; - } - -@@ -199,7 +199,8 @@ get_x_error_text (int x_error_code) - { - gchar buf[64]; - -- XGetErrorText(GDK_DISPLAY(), x_error_code, buf, sizeof(buf) - 1); -+ XGetErrorText(gdk_x11_get_default_xdisplay(), x_error_code, -+ buf, sizeof(buf) - 1); - - return g_strdup(buf); - } -@@ -273,7 +274,7 @@ gpds_xinput_set_int_properties_by_name_with_format_type - } - - gdk_error_trap_push(); -- XChangeDeviceProperty(GDK_DISPLAY(), -+ XChangeDeviceProperty(gdk_x11_get_default_xdisplay(), - device, property_atom, - XA_INTEGER, format_type, PropModeReplace, - (unsigned char*)property_data, n_properties); -@@ -383,7 +384,8 @@ get_atom (GpdsXInput *xinput, const gchar *property_name, GError **error) - if (!device) - return -1; - -- properties = XListDeviceProperties(GDK_DISPLAY(), device, &n_properties); -+ properties = XListDeviceProperties(gdk_x11_get_default_xdisplay(), -+ device, &n_properties); - for (i = 0; i < n_properties; i++) { - const gchar *name; - -@@ -427,9 +429,9 @@ gpds_xinput_get_int_properties_by_name (GpdsXInput *xinput, - return FALSE; - - gdk_error_trap_push(); -- status = XGetDeviceProperty(GDK_DISPLAY(), device, atom, 0, 1000, False, -- XA_INTEGER, &actual_type, &actual_format, -- n_values, &bytes_after, &data); -+ status = XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device, atom, -+ 0, 1000, False, XA_INTEGER, &actual_type, -+ &actual_format, n_values, &bytes_after, &data); - gdk_flush(); - x_error_code = gdk_error_trap_pop(); - if (status != Success || x_error_code != 0) { -@@ -523,7 +525,7 @@ gpds_xinput_set_float_properties_by_name (GpdsXInput *xinput, - *(property_data + i) = (gfloat)properties[i]; - - gdk_error_trap_push(); -- XChangeDeviceProperty(GDK_DISPLAY(), -+ XChangeDeviceProperty(gdk_x11_get_default_xdisplay(), - device, property_atom, - float_atom, 32, PropModeReplace, - (unsigned char*)property_data, n_properties); -@@ -594,7 +596,8 @@ gpds_xinput_get_float_properties_by_name (GpdsXInput *xinput, - return FALSE; - - gdk_error_trap_push(); -- status = XGetDeviceProperty(GDK_DISPLAY(), device, property_atom, 0, 1000, False, -+ status = XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device, -+ property_atom, 0, 1000, False, - float_atom, &actual_type, &actual_format, - n_properties, &bytes_after, &data); - gdk_flush(); -@@ -676,7 +679,8 @@ gpds_xinput_get_button_map (GpdsXInput *xinput, - *map = g_new0(guchar, *n_buttons); - - gdk_error_trap_push(); -- status = XGetDeviceButtonMapping(GDK_DISPLAY(), device, *map, *n_buttons); -+ status = XGetDeviceButtonMapping(gdk_x11_get_default_xdisplay(), -+ device, *map, *n_buttons); - gdk_flush(); - - x_error_code = gdk_error_trap_pop(); -@@ -705,7 +709,8 @@ gpds_xinput_set_button_map (GpdsXInput *xinput, - return FALSE; - - gdk_error_trap_push(); -- status = XSetDeviceButtonMapping(GDK_DISPLAY(), device, map, n_buttons); -+ status = XSetDeviceButtonMapping(gdk_x11_get_default_xdisplay(), -+ device, map, n_buttons); - gdk_flush(); - - x_error_code = gdk_error_trap_pop(); -diff --git a/test/test-xinput-utils.c b/test/test-xinput-utils.c -index a06dcbc..f97f9d4 100644 ---- a/test/test-xinput-utils.c -+++ b/test/test-xinput-utils.c -@@ -29,7 +29,7 @@ void - teardown (void) - { - if (device) -- XCloseDevice(GDK_DISPLAY(), device); -+ XCloseDevice(gdk_x11_get_default_xdisplay(), device); - g_clear_error(&error); - g_clear_error(&expected_error); - } diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch deleted file mode 100644 index 3e8612d96a53..000000000000 --- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch +++ /dev/null @@ -1,107 +0,0 @@ -commit 255334e6749ec4d4358e627dc6693b4159aaf912 -Author: Hiroyuki Ikezoe <poincare@ikezoe.net> -Date: Fri Mar 12 19:13:54 2010 +0900 - - mouse extension -> pointing device. - - Why did I use this weird name? - -diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -index db4dd8e..31dd336 100644 ---- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -@@ -29,34 +29,34 @@ - #include "gpds-gconf.h" - #include "gpds-xinput-pointer-info.h" - --#define GSD_TYPE_MOUSE_EXTENSION_PLUGIN (gsd_mouse_extension_plugin_get_type ()) --#define GSD_MOUSE_EXTENSION_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdMouseExtensionPlugin)) --#define GSD_MOUSE_EXTENSION_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdTracklassPointPluginClass)) --#define GSD_IS_MOUSE_EXTENSION_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN)) --#define GSD_IS_MOUSE_EXTENSION_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_MOUSE_EXTENSION_PLUGIN)) --#define GSD_MOUSE_EXTENSION_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdTracklassPointPluginClass)) -+#define GSD_TYPE_POINTING_DEVICE_PLUGIN (gsd_pointing_device_plugin_get_type ()) -+#define GSD_POINTING_DEVICE_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdPointingDevicePlugin)) -+#define GSD_POINTING_DEVICE_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdTracklassPointPluginClass)) -+#define GSD_IS_POINTING_DEVICE_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN)) -+#define GSD_IS_POINTING_DEVICE_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_POINTING_DEVICE_PLUGIN)) -+#define GSD_POINTING_DEVICE_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdTracklassPointPluginClass)) - --typedef struct _GsdMouseExtensionPlugin GsdMouseExtensionPlugin; --typedef struct _GsdMouseExtensionPluginClass GsdMouseExtensionPluginClass; -+typedef struct _GsdPointingDevicePlugin GsdPointingDevicePlugin; -+typedef struct _GsdPointingDevicePluginClass GsdPointingDevicePluginClass; - --struct _GsdMouseExtensionPlugin -+struct _GsdPointingDevicePlugin - { - GnomeSettingsPlugin parent; - GList *managers; - }; - --struct _GsdMouseExtensionPluginClass -+struct _GsdPointingDevicePluginClass - { - GnomeSettingsPluginClass parent_class; - }; - --GType gsd_mouse_extension_plugin_get_type (void) G_GNUC_CONST; -+GType gsd_pointing_device_plugin_get_type (void) G_GNUC_CONST; - G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module); - --GNOME_SETTINGS_PLUGIN_REGISTER(GsdMouseExtensionPlugin, gsd_mouse_extension_plugin) -+GNOME_SETTINGS_PLUGIN_REGISTER(GsdPointingDevicePlugin, gsd_pointing_device_plugin) - - static void --gsd_mouse_extension_plugin_init (GsdMouseExtensionPlugin *plugin) -+gsd_pointing_device_plugin_init (GsdPointingDevicePlugin *plugin) - { - plugin->managers = NULL; - } -@@ -104,10 +104,10 @@ collect_pointer_device_infos_from_gconf (void) - static void - activate (GnomeSettingsPlugin *plugin) - { -- GsdMouseExtensionPlugin *mouse_extension_plugin; -+ GsdPointingDevicePlugin *pointing_device_plugin; - GList *pointer_device_infos, *node; - -- mouse_extension_plugin = GSD_MOUSE_EXTENSION_PLUGIN(plugin); -+ pointing_device_plugin = GSD_POINTING_DEVICE_PLUGIN(plugin); - - pointer_device_infos = collect_pointer_device_infos_from_gconf(); - for (node = pointer_device_infos; node; node = g_list_next(node)) { -@@ -120,8 +120,8 @@ activate (GnomeSettingsPlugin *plugin) - continue; - - gsd_pointing_device_manager_start(manager, NULL); -- mouse_extension_plugin->managers = -- g_list_prepend(mouse_extension_plugin->managers, manager); -+ pointing_device_plugin->managers = -+ g_list_prepend(pointing_device_plugin->managers, manager); - } - g_list_foreach(pointer_device_infos, - (GFunc)gpds_xinput_pointer_info_free, NULL); -@@ -129,7 +129,7 @@ activate (GnomeSettingsPlugin *plugin) - } - - static void --stop_all_managers (GsdMouseExtensionPlugin *plugin) -+stop_all_managers (GsdPointingDevicePlugin *plugin) - { - GList *node; - -@@ -147,11 +147,11 @@ stop_all_managers (GsdMouseExtensionPlugin *plugin) - static void - deactivate (GnomeSettingsPlugin *plugin) - { -- stop_all_managers(GSD_MOUSE_EXTENSION_PLUGIN(plugin)); -+ stop_all_managers(GSD_POINTING_DEVICE_PLUGIN(plugin)); - } - - static void --gsd_mouse_extension_plugin_class_init (GsdMouseExtensionPluginClass *klass) -+gsd_pointing_device_plugin_class_init (GsdPointingDevicePluginClass *klass) - { - GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS(klass); - diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch deleted file mode 100644 index 1793bdfaa0a0..000000000000 --- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch +++ /dev/null @@ -1,266 +0,0 @@ -commit ff25a24d387887bc3bbacfb5bcaf2756695df096 -Author: Hiroyuki Ikezoe <hiikezoe@gnome.org> -Date: Sat Jun 26 19:55:40 2010 +0900 - - Watch DevicePresenceNotify event. - - Some devices are not reported by xserver at the time of startiung up - of gnome-settings-daemon, so we need to watch DevicePresenceNotify - event at that time. - - Fix for bug #609050. - -diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -index 31dd336..8a2d98f 100644 ---- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -@@ -24,10 +24,13 @@ - #include <gnome-settings-daemon/gnome-settings-plugin.h> - #include <glib/gi18n.h> - #include <gconf/gconf-client.h> -+#include <gdk/gdkx.h> -+#include <X11/extensions/XInput.h> - - #include "gsd-pointing-device-manager.h" - #include "gpds-gconf.h" - #include "gpds-xinput-pointer-info.h" -+#include "gpds-xinput-utils.h" - - #define GSD_TYPE_POINTING_DEVICE_PLUGIN (gsd_pointing_device_plugin_get_type ()) - #define GSD_POINTING_DEVICE_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdPointingDevicePlugin)) -@@ -61,44 +64,90 @@ gsd_pointing_device_plugin_init (GsdPointingDevicePlugin *plugin) - plugin->managers = NULL; - } - --static GList * --collect_pointer_device_infos_from_gconf (void) -+static gboolean -+has_manager (GsdPointingDevicePlugin *plugin, const gchar *device_name) - { -- GConfClient *gconf; -- GSList *dirs, *node; -- GList *infos = NULL; -- -- gconf = gconf_client_get_default(); -- dirs = gconf_client_all_dirs(gconf, GPDS_GCONF_DIR, NULL); -- -- for (node = dirs; node; node = g_slist_next(node)) { -- const gchar *dir = node->data; -- gchar *device_type; -- gchar *device_type_key; -- -- device_type_key = gconf_concat_dir_and_key(dir, GPDS_GCONF_DEVICE_TYPE_KEY); -- device_type = gconf_client_get_string(gconf, device_type_key, NULL); -- if (device_type) { -- GpdsXInputPointerInfo *info; -- gchar *device_name, *unescaped_device_name; -- -- device_name = g_path_get_basename(dir); -- unescaped_device_name = gconf_unescape_key(device_name, -1); -- info = gpds_xinput_pointer_info_new(unescaped_device_name, device_type); -- infos = g_list_prepend(infos, info); -- g_free(unescaped_device_name); -- g_free(device_name); -+ GList *node; -+ -+ for (node = plugin->managers; node; node = g_list_next(node)) { -+ GsdPointingDeviceManager *manager = node->data; -+ -+ if (g_str_equal(gsd_pointing_device_manager_get_device_name(manager), device_name)) -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static GdkFilterReturn -+device_presence_filter (GdkXEvent *xevent, -+ GdkEvent *event, -+ gpointer data) -+{ -+ XEvent *xev = (XEvent *)xevent; -+ XEventClass class_presence; -+ int xi_presence; -+ GsdPointingDevicePlugin *plugin = GSD_POINTING_DEVICE_PLUGIN(data); -+ -+ DevicePresence(gdk_x11_get_default_xdisplay(), xi_presence, class_presence); -+ -+ if (xev->type == xi_presence) { -+ XDeviceInfo *device_info = NULL; -+ XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev; -+ -+ device_info = gpds_xinput_utils_get_device_info_from_id(notify_event->deviceid, NULL); -+ if (notify_event->devchange == DeviceEnabled) { -+ GsdPointingDeviceManager *manager; -+ -+ if (has_manager(plugin, device_info->name)) -+ return GDK_FILTER_CONTINUE; -+ -+ manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type), -+ device_info->name); -+ if (manager) { -+ gsd_pointing_device_manager_start(manager, NULL); -+ plugin->managers = g_list_prepend(plugin->managers, manager); -+ } -+ } else if (notify_event->devchange == DeviceRemoved) { - } -+ } - -- g_free(device_type_key); -- g_free(device_type); -+ return GDK_FILTER_CONTINUE; -+} -+ -+static void -+add_device_presence_filter (GsdPointingDevicePlugin *plugin) -+{ -+ Display *display; -+ XEventClass class_presence; -+ gint xi_presence; -+ -+ gint op_code, event, error; -+ -+ if (!XQueryExtension(GDK_DISPLAY(), -+ "XInputExtension", -+ &op_code, -+ &event, -+ &error)) { -+ return; - } - -- g_slist_foreach(dirs, (GFunc)g_free, NULL); -- g_slist_free(dirs); -- g_object_unref(gconf); -+ display = gdk_x11_get_default_xdisplay(); - -- return infos; -+ gdk_error_trap_push(); -+ DevicePresence(display, xi_presence, class_presence); -+ XSelectExtensionEvent(display, -+ RootWindow(display, DefaultScreen(display)), -+ &class_presence, 1); -+ gdk_flush(); -+ if (!gdk_error_trap_pop()) -+ gdk_window_add_filter(NULL, device_presence_filter, plugin); -+} -+ -+static void -+remove_device_presence_filter (GsdPointingDevicePlugin *plugin) -+{ -+ gdk_window_remove_filter(NULL, device_presence_filter, plugin); - } - - static void -@@ -109,7 +158,10 @@ activate (GnomeSettingsPlugin *plugin) - - pointing_device_plugin = GSD_POINTING_DEVICE_PLUGIN(plugin); - -- pointer_device_infos = collect_pointer_device_infos_from_gconf(); -+ add_device_presence_filter(pointing_device_plugin); -+ -+ pointer_device_infos = gpds_xinput_utils_collect_pointer_infos(); -+ - for (node = pointer_device_infos; node; node = g_list_next(node)) { - GsdPointingDeviceManager *manager; - GpdsXInputPointerInfo *info = node->data; -@@ -133,6 +185,8 @@ stop_all_managers (GsdPointingDevicePlugin *plugin) - { - GList *node; - -+ remove_device_presence_filter(plugin); -+ - for (node = plugin->managers; node; node = g_list_next(node)) { - GsdPointingDeviceManager *manager = node->data; - -diff --git a/src/gpds-xinput-utils.c b/src/gpds-xinput-utils.c -index 48dc2a5..0f7ceea 100644 ---- a/src/gpds-xinput-utils.c -+++ b/src/gpds-xinput-utils.c -@@ -62,6 +62,33 @@ gpds_xinput_utils_get_device_info (const gchar *device_name, GError **error) - return NULL; - } - -+XDeviceInfo * -+gpds_xinput_utils_get_device_info_from_id (XID id, GError **error) -+{ -+ XDeviceInfo *device_infos; -+ gint i, n_device_infos; -+ -+ device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos); -+ -+ for (i = 0; i < n_device_infos; i++) { -+ if (device_infos[i].use != IsXExtensionPointer) -+ continue; -+ if (device_infos[i].id == id) { -+ XFreeDeviceList(device_infos); -+ return &device_infos[i]; -+ } -+ } -+ -+ XFreeDeviceList(device_infos); -+ -+ g_set_error(error, -+ GPDS_XINPUT_UTILS_ERROR, -+ GPDS_XINPUT_UTILS_ERROR_NO_DEVICE, -+ _("No device found for %d."), (int)id); -+ -+ return NULL; -+} -+ - gshort - gpds_xinput_utils_get_device_num_buttons (const gchar *device_name, GError **error) - { -diff --git a/src/gpds-xinput-utils.h b/src/gpds-xinput-utils.h -index 9cc4564..74e491a 100644 ---- a/src/gpds-xinput-utils.h -+++ b/src/gpds-xinput-utils.h -@@ -38,6 +38,8 @@ typedef enum - GQuark gpds_xinput_utils_error_quark (void); - XDeviceInfo *gpds_xinput_utils_get_device_info (const gchar *device_name, - GError **error); -+XDeviceInfo *gpds_xinput_utils_get_device_info_from_id (XID id, -+ GError **error); - XDevice *gpds_xinput_utils_open_device (const gchar *device_name, GError **error); - Atom gpds_xinput_utils_get_float_atom (GError **error); - gshort gpds_xinput_utils_get_device_num_buttons (const gchar *device_name, GError **error); -diff --git a/test/test-xinput-utils.c b/test/test-xinput-utils.c -index 29b3f4e..a06dcbc 100644 ---- a/test/test-xinput-utils.c -+++ b/test/test-xinput-utils.c -@@ -6,6 +6,7 @@ - void test_exist_device (void); - void test_get_float_atom (void); - void test_get_device_info (void); -+void test_get_device_info_from_id (void); - void test_open_device (void); - void test_open_no_device (void); - void test_get_device_num_buttons (void); -@@ -49,7 +50,7 @@ test_get_float_atom (void) - void - test_get_device_info (void) - { -- XDeviceInfo *device_info = NULL; -+ XDeviceInfo *device_info = NULL; - device_info = gpds_xinput_utils_get_device_info(DEVICE_NAME, &error); - cut_assert(device_info); - -@@ -57,6 +58,19 @@ test_get_device_info (void) - } - - void -+test_get_device_info_from_id (void) -+{ -+ XDeviceInfo *device_info = NULL; -+ device_info = gpds_xinput_utils_get_device_info(DEVICE_NAME, &error); -+ cut_assert(device_info); -+ -+ gcut_assert_error(error); -+ -+ device_info = gpds_xinput_utils_get_device_info_from_id(device_info->id, &error); -+ cut_assert_equal_string(DEVICE_NAME, device_info->name); -+} -+ -+void - test_open_device (void) - { - device = gpds_xinput_utils_open_device(DEVICE_NAME, &error); diff --git a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild deleted file mode 100644 index 5fe0cde0a667..000000000000 --- a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 - -DESCRIPTION="A GTK+ based configuration utility for the synaptics driver" -HOMEPAGE="https://wiki.gnome.org/Attic/GPointingDeviceSettings" -SRC_URI="mirror://sourceforge.jp/gsynaptics/45812/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -# recent enough x11-base/xorg-server required -RDEPEND=" - >=dev-libs/glib-2.10:2 - >=x11-libs/gtk+-2.14.0:2 - >=gnome-base/gconf-2.24:2 - >=gnome-base/gnome-settings-daemon-2.28 - >=x11-libs/libXi-1.2 - >=x11-libs/libX11-1.2.0 - !<=x11-base/xorg-server-1.6.0 - !gnome-extra/gsynaptics -" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=dev-util/intltool-0.35.5 -" - -src_prepare() { - epatch \ - "${FILESDIR}/${P}-crash.patch" \ - "${FILESDIR}/${P}-plugin.patch" \ - "${FILESDIR}/${P}-reboot.patch" \ - "${FILESDIR}/${P}-gtk22.patch" \ - "${FILESDIR}/${P}-gsd-crash.patch" \ - "${FILESDIR}/${P}-gsd-3.2-fix.patch" \ - "${FILESDIR}/${P}-fix-build.patch" - - # Disable gsd plugin as it's incompatible since 3.8, bug #514672 - sed -i -e 's/ gnome-settings-daemon-plugins//' modules/Makefile.am || die - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure --disable-static -} diff --git a/gnome-extra/gpointing-device-settings/metadata.xml b/gnome-extra/gpointing-device-settings/metadata.xml deleted file mode 100644 index 39015a1f00d8..000000000000 --- a/gnome-extra/gpointing-device-settings/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge-jp">gsynaptics</remote-id> - </upstream> -</pkgmetadata> diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest index 7b2e85e34585..6dd1b4809bcb 100644 --- a/gnome-extra/nm-applet/Manifest +++ b/gnome-extra/nm-applet/Manifest @@ -2,12 +2,11 @@ AUX 1.4.6-CVE-2017-6590.patch 8963 BLAKE2B d725254a4cee53f4d24aaa062f1782ecf4e5c AUX 1.4.6-fix-nma-bindings.patch 1350 BLAKE2B e09dbb79718de55270405de02efd48c0df45448e3073762088523070346076c0fa0c42813beeb3de377108c55516908e9b37440f8089a308d9840be74d8d1a41 SHA512 a2237c8fd94260c1681e97aabe6a8c203acb5e743996c280e6e7f8890cf4ccf1525c7d61d768e3418915258ef2a9416614a41eee6d223e4db11f1f168c17cf4f AUX 1.4.6-fix-translations-in-g-c-c.patch 4530 BLAKE2B 34f76eb8ffc74d58be05e05dfe636ca594149b1a101c2611d4df896e2148519d18087ebd12a3cc5e17253be5e57bf6bf90ed87aa5895e5a100fbfc82f74e4fbf SHA512 3af403696d1e647bfdf5a2316c17064b7fd4eb07c4ccce6d23fb0b6ce59143a90ba5b37377ed559d3abbe7fbe06642958c8a59b39cb67c19541dd6dd81831f7d AUX 1.4.6-improved-certfile-error-msg.patch 1481 BLAKE2B ca880144ffe78153b4989399d883def5d318668e886449f2bb2fdf094742cf2a6d25e6fa36fd6faba505d9caa97771fd6c1969c721bf14352c8665b072f07fca SHA512 dce3cbd0e8184d2558ffc63b068b7d1d396473f428fdba60c566eb1c5aae8c2519ee427516efebd63e69518ca55cac86c21db18a3753dd2780f0db2743d80bad +AUX nm-applet-1.8.10-cert-chooser.patch 1421 BLAKE2B 6c867f5cca1c3b67a27cdfc9a80da728be65f80a8619dcfa0d53f910884e56d7cc1e6c2aa4a2661079d29f3abd49257a0720d59c09d0ba8024e140dc086ce033 SHA512 79ac1445ee0885b63092f28d2fbfd74b6b926696d44ee0ff47d079adc293301c05b8984ad812c66d4b7cab34c32902faed467fee1a2f14af66d2c43914858ed6 +AUX nm-applet-1.8.10-vpn-crash.patch 4613 BLAKE2B 44dbc67736d2025f177de3c29961234c8f8f1f0002bd7a4275cdd2631e5a3961f011c73c9c1a9ee77b2471945d5ce83c5120b2b26e8395f5666338e64b067359 SHA512 e2a9bc66b13f84270ac9735315d197c1ab264c99e5941218df310ebaa40900490661dec5f5972734e75c89b6db27530fd6ef02ad91a61a20c0eb388cff0b42aa DIST network-manager-applet-1.4.6.tar.xz 1388916 BLAKE2B 697587e4451d37ab91e99e25e40a1d797724e26568d252c77361e25f32508722a58dba1b2b4d2c784150479493c0451173da0b42314ebb17f1b7215628675444 SHA512 f0eab5c50739c2309fa19336e23ead6603dc953b62fff0600a91988df8d41c2f300c22ebd4d5be8654a3fd7bac38dacc23be149f1a7085f10bb55e1830d9472f DIST network-manager-applet-1.8.10.tar.xz 1479032 BLAKE2B 482c7a644edaf4f19ed02ca3f29ffbbcf11c01b1c9572affa430a7edb8314d1381ca6738d998e91537903f6eceea0cff1b82b88e7acd1e9b5665c566271cdf3c SHA512 319a280ad56efe8d1b31db7879aebd6242f2e67453287476d397835069f5f5c6ce7884c84d65e0177a94a554b8f1a6e1d353ab33f8ddfc63269d8133b76b1372 -DIST network-manager-applet-1.8.2.tar.xz 1445920 BLAKE2B 583090089b48cf5265f5f52aa2f412f357a62042863d6eaeb515316ad27e384654004ae3b8fdc05af962d660f99c19d4a047e0ecc803cc295b7ce48da77f0fc8 SHA512 1e9019ca17a55138e08eaf34c7889b7d5f531e918412bf025c0e03eb0794dc323b59f0d3521f14e93b6a94756f8e2a52139c76117ed430c73bcd1366eeffb5c9 -DIST network-manager-applet-1.8.6.tar.xz 1478992 BLAKE2B cb037aab17e9802c52724a894cb2e998e9d81b8831ee850754f63c176ebf737070a87eb6495388e59bd97516608bdb0ff91c9464cce78b705fbd8a3b132e592a SHA512 9080fe1ef252837f16c698fe2083ebe66949e2a30f626619ef7eb82f44e988a0b8488f4f8cd0946a78a240f9bf7a5d054afc988b25c1bedeba7f79a7c84d46fa EBUILD nm-applet-1.4.6-r1.ebuild 1670 BLAKE2B 3119a19f109ee03c9a149167b4e11812b6303fda297485f61c5494c669dbdb99e9b40e0721d8c9180ab7ea95af1e1d20f83a96f85c3915fc53fb3f2f67e8ffaf SHA512 ba565628ef8430a0e93e85ee5495409cd36094801a5ec9cf6207df3cf829405a0c74848e8840c4e6d0cb9ceb642d8abe3f888fc793e57bf9272f66ebb6fe7cf5 +EBUILD nm-applet-1.8.10-r1.ebuild 1777 BLAKE2B c101d9c941f29a3211445c872ef03b6d2f7cec1ce222e56c96a045bd70c4572311f17df525fb5b18567caaad545e220399a96bc7f19b671d13248e337753a015 SHA512 a01dd88a4b504b3df18ad7c509fe48f6524526a1c904866b1054ee7cdb88dcb7ac7651323cdcdd481191d1e866cf4cc4dba2b314bd17eed6e1cc57918e6ecb99 EBUILD nm-applet-1.8.10.ebuild 1521 BLAKE2B 745e2371612905c6d42ff9bc57b1e29f4bfcf078a0ed32ee5bcd9bd6f106d7f44204e84fdeca46701fa64fee6cecad28d155a5b4a56d0fa08514c246b95930fa SHA512 4c498d9b8bba82485134556025b9be43640a259bbb01be404537c655102a1d08198c58c9f28e4bc0b720810a5d4842e92b67885303f6b0a6a3c279bc65224166 -EBUILD nm-applet-1.8.2.ebuild 1522 BLAKE2B 4d8889cc8dac6b585c7d004faa920d948f315e009160ceb7a31dab479cb4d298effd5ce0aa2bb0fc7edb25aa5e517e6c1ae9454c97feca1e39366d8bf8b78d29 SHA512 9f6382da7112978a74cb6cb74d17d9494a9325d3610204e383f2f3e53cba69ae684d50b1fd5baeef523e80e6a15aed1d7fcb74245c53ecd60336e270c26795fa -EBUILD nm-applet-1.8.6.ebuild 1521 BLAKE2B 745e2371612905c6d42ff9bc57b1e29f4bfcf078a0ed32ee5bcd9bd6f106d7f44204e84fdeca46701fa64fee6cecad28d155a5b4a56d0fa08514c246b95930fa SHA512 4c498d9b8bba82485134556025b9be43640a259bbb01be404537c655102a1d08198c58c9f28e4bc0b720810a5d4842e92b67885303f6b0a6a3c279bc65224166 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067 diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch new file mode 100644 index 000000000000..9aad2396953e --- /dev/null +++ b/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch @@ -0,0 +1,38 @@ +From 4d2523b482ab78134dafc02c9b99bd15f1a9174a Mon Sep 17 00:00:00 2001 +From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de> +Date: Sun, 14 Jan 2018 23:28:15 +0100 +Subject: [PATCH 1/1] libnma/cert-chooser: handle case of no avalable modules + +Cause: Apparently it's perfectly okay if the list of modules is empty +(e.g., NULL). However, the code assume that this indicates an error, +tries to print the NULL error, and crashes. + +[lkundrak@v3.sk: cosmetic changes] + +https://bugzilla.gnome.org/show_bug.cgi?id=785674 +(cherry picked from commit a37483c1a364ef3cc1cfa29e7ad51ca108d75674) +--- + src/libnma/nma-cert-chooser-button.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/libnma/nma-cert-chooser-button.c b/src/libnma/nma-cert-chooser-button.c +index c7089390..00651765 100644 +--- a/src/libnma/nma-cert-chooser-button.c ++++ b/src/libnma/nma-cert-chooser-button.c +@@ -93,10 +93,10 @@ modules_initialized (GObject *object, GAsyncResult *res, gpointer user_data) + gchar *label; + + modules = gck_modules_initialize_registered_finish (res, &error); +- if (!modules) { ++ if (error) { + /* The Front Fell Off. */ +- g_critical ("Error getting registered modules: %s", error->message); +- g_error_free (error); ++ g_warning ("Error getting registered modules: %s", error->message); ++ g_clear_error (&error); + } + + model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (self))); +-- +2.14.3 + diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch new file mode 100644 index 000000000000..8f217af2dac6 --- /dev/null +++ b/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch @@ -0,0 +1,137 @@ +From 46f99b295e59f44dfde50ec90e7c09627d32431e Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Wed, 20 Dec 2017 13:23:12 +0100 +Subject: [PATCH 1/2] shared/compat: fix memory handling of + nm_setting_vpn_get_*_keys + +The compat implementations return a (transfer none) strv instead of a +(transfer container) one. This has caused double frees in nm-applet: +https://bugs.archlinux.org/task/56772 + +Don't copy the keys and don't free the container later. + +[thaller@redhat.com: patch adjusted to avoid compiler warning] + +Patch imported from NetworkManager commit 8ac8c01162235c2c198bfaf25fb7d1a57a595ce5. + +Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2 +(cherry picked from commit 0c90e08f77b71d2bda699cf032fceec0122bbf82) +--- + shared/nm-utils/nm-compat.c | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c +index 22ab675d..47035e62 100644 +--- a/shared/nm-utils/nm-compat.c ++++ b/shared/nm-utils/nm-compat.c +@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data) + { + GPtrArray *a = user_data; + +- g_ptr_array_add (a, g_strdup (key)); ++ g_ptr_array_add (a, (gpointer) key); + } + + static const char ** +@@ -55,14 +55,6 @@ _get_keys (NMSettingVpn *setting, + g_ptr_array_sort (a, nm_strcmp_p); + g_ptr_array_add (a, NULL); + keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE); +- +- /* we need to cache the keys *somewhere*. */ +- g_object_set_qdata_full (G_OBJECT (setting), +- is_secrets +- ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys") +- : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"), +- keys, +- (GDestroyNotify) g_strfreev); + } + + NM_SET_OUT (out_length, len); +-- +2.14.3 + + +From 0d13a8b4064c83146714ecee86b69042aca35f9e Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Thu, 21 Dec 2017 20:36:48 +0100 +Subject: [PATCH 2/2] shared/compat: fix memory handling of + nm_setting_vpn_get_*_keys() + +The previous fix was bad because the keys do not come from NMSettingVpn's hash +table but are copies that are freed by nm_setting_vpn_foreach_* before +it returns. + +[thaller@redhat.com: import shared code from NetworkManager, merging +three patches together.] + +Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2 +Fixes: 0c90e08f77b71d2bda699cf032fceec0122bbf82 + +https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00069.html +https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00070.html +(cherry picked from commit a52ccb2fe170558fc0aab4dd1d15ba8808b10951) +--- + shared/nm-utils/nm-compat.c | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) + +diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c +index 47035e62..90328c06 100644 +--- a/shared/nm-utils/nm-compat.c ++++ b/shared/nm-utils/nm-compat.c +@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data) + { + GPtrArray *a = user_data; + +- g_ptr_array_add (a, (gpointer) key); ++ g_ptr_array_add (a, g_strdup (key)); + } + + static const char ** +@@ -40,22 +40,37 @@ _get_keys (NMSettingVpn *setting, + { + guint len; + const char **keys = NULL; +- gs_unref_ptrarray GPtrArray *a = NULL; ++ GPtrArray *a; + + nm_assert (NM_IS_SETTING_VPN (setting)); + +- a = g_ptr_array_new (); ++ if (is_secrets) ++ len = nm_setting_vpn_get_num_secrets (setting); ++ else ++ len = nm_setting_vpn_get_num_data_items (setting); ++ ++ a = g_ptr_array_sized_new (len + 1); ++ + if (is_secrets) + nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a); + else + nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a); +- len = a->len; + +- if (a->len) { ++ len = a->len; ++ if (len) { + g_ptr_array_sort (a, nm_strcmp_p); + g_ptr_array_add (a, NULL); +- keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE); +- } ++ keys = g_memdup (a->pdata, a->len * sizeof (gpointer)); ++ ++ /* we need to cache the keys *somewhere*. */ ++ g_object_set_qdata_full (G_OBJECT (setting), ++ is_secrets ++ ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys") ++ : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"), ++ g_ptr_array_free (a, FALSE), ++ (GDestroyNotify) g_strfreev); ++ } else ++ g_ptr_array_free (a, TRUE); + + NM_SET_OUT (out_length, len); + return keys; +-- +2.14.3 + diff --git a/gnome-extra/nm-applet/nm-applet-1.8.6.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild index 52554e8a0baa..651cf34423a7 100644 --- a/gnome-extra/nm-applet/nm-applet-1.8.6.ebuild +++ b/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild @@ -12,8 +12,8 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" LICENSE="GPL-2+" SLOT="0" -IUSE="+introspection gcr +modemmanager selinux teamd" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86" +IUSE="+introspection +gcr +modemmanager selinux teamd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" RDEPEND=" >=app-crypt/libsecret-0.18 @@ -44,6 +44,16 @@ DEPEND="${RDEPEND} PDEPEND="virtual/notification-daemon" #546134 +PATCHES=( + # shared/compat: fix memory handling of nm_setting_vpn_get_*_keys + # (from 'master') + "${FILESDIR}"/${P}-vpn-crash.patch + + # libnma/cert-chooser: handle case of no avalable modules (from + # 'master') + "${FILESDIR}"/${P}-cert-chooser.patch +) + src_configure() { local myconf=( --without-appindicator diff --git a/gnome-extra/nm-applet/nm-applet-1.8.2.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.2.ebuild deleted file mode 100644 index a937ab737f58..000000000000 --- a/gnome-extra/nm-applet/nm-applet-1.8.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME_ORG_MODULE="network-manager-applet" - -inherit gnome2 - -DESCRIPTION="GNOME applet for NetworkManager" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+introspection gcr +modemmanager selinux teamd" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" - -RDEPEND=" - >=app-crypt/libsecret-0.18 - >=dev-libs/glib-2.32:2[dbus] - >=dev-libs/dbus-glib-0.88 - >=sys-apps/dbus-1.4.1 - >=sys-auth/polkit-0.96-r1 - >=x11-libs/gtk+-3.4:3[introspection?] - >=x11-libs/libnotify-0.7.0 - - app-text/iso-codes - >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] - net-misc/mobile-broadband-provider-info - - introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) - virtual/freedesktop-icon-theme - virtual/libgudev:= - gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) - modemmanager? ( net-misc/modemmanager ) - selinux? ( sys-libs/libselinux ) - teamd? ( >=dev-libs/jansson-2.3 ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.0 - >=dev-util/intltool-0.50.1 - virtual/pkgconfig -" - -PDEPEND="virtual/notification-daemon" #546134 - -src_configure() { - local myconf=( - --without-appindicator - --disable-lto - --disable-ld-gc - --disable-more-warnings - --disable-static - --localstatedir=/var - $(use_enable introspection) - $(use_with gcr) - $(use_with modemmanager wwan) - $(use_with selinux) - $(use_with teamd team) - ) - gnome2_src_configure "${myconf[@]}" -} |