# ChangeLog for gnome-extra/cinnamon-control-center
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.17 2015/03/15 13:24:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.18 2015/03/22 12:51:41 pacho Exp $
+
+ 22 Mar 2015; Pacho Ramos <pacho@gentoo.org>
+ -cinnamon-control-center-2.2.11-r1.ebuild,
+ -cinnamon-control-center-2.2.11.ebuild,
+ -cinnamon-control-center-2.4.2-r1.ebuild,
+ -files/cinnamon-control-center-2.2.11-networkmanager-version.patch,
+ -files/cinnamon-control-center-2.2.5-nm-applet.patch, metadata.xml:
+ drop old
15 Mar 2015; Pacho Ramos <pacho@gentoo.org>
cinnamon-control-center-2.4.2-r2.ebuild:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX cinnamon-control-center-2.2.11-networkmanager-version.patch 1568 SHA256 3a95f61f7c6cb2c5484187f2a7be5da650fffbe5321176ea8061b97681c90e70 SHA512 bdc1b980681f4bf1f28e61593ba4ab02d643c972d212a9ccbb81cebffa5c8ac63c50ca1509d91a8cbfe4a0a9b9ae6431c798b30c828cbaf4b2b19ea2b4cf41f6 WHIRLPOOL 84fe3ccc282ddca7243c1739e90b7754ef6b2ba1fcde1e0dc57088b40ffc6d0451c0c6baa129d29db863fc4731e8853d0cdfb7dedec79776a57e855f6a95c055
-AUX cinnamon-control-center-2.2.5-nm-applet.patch 1366 SHA256 f19a142d93b2649e2d20075e05d0ef7be00b315d61f50a0218fa45d62c56429e SHA512 0f088f14e3bda696c04ee23af8c42804d0d638f7529a4ac693d794002554d8f1deaa6c3cb300c784ac55aee5b1848c20999533fa5dbed3f67bb93dba0e807155 WHIRLPOOL 408c1f9ddaf1af5120a82b133179e1f3c74bbaf6c47e917d13cd420475951d1587bcca357931dd7bc08fc36f9871d97d95117b4a48893c24ff88e30d0c231462
AUX cinnamon-control-center-2.2.5-optional.patch 3164 SHA256 409d944613f8e66cc413673239888d5fc8bb2e56f635909b14fd9f26d33474ba SHA512 587e93d79386f32ab122b329042e971eda6ba41a3bbf53ce300ba312701a817254cea1814ab777ded2689f29b974af02d07cf827ec5e801dcf47aab23664c5b1 WHIRLPOOL dcb1ab88b0b00e3d091d2b64778a9f37cfcf601dff6641d9aa8c3f365c10a694f3fc937d3cbea04285b9e07f716dee3f8e5ffb1af238e23d1d859769b23b49d9
AUX cinnamon-control-center-2.4.2-networkmanager-version.patch 1570 SHA256 9b42ea89bfd7206e6131e720a026ddc7074c54a1d8cb460f5dd35818b07e05a9 SHA512 ca040071c60326ec686f7bccc5a1a8650299227c965bb4e41fc6b2e27ef7a965f6ed58bc764bdc45e09b263be444b4575c2c457f70a6807405c8e4218a0bbd58 WHIRLPOOL ef8eaefceac0b2d3aea0a1eda9dd72489d41ad8ea41363596969b462b3852a9f343a6736ddab341b484d9c8d8f117347c0e14bf42f64e5fae9730ac1734cceca
-DIST cinnamon-control-center-2.2.11.tar.gz 4855291 SHA256 9cd9d9dcad3a6f9a1957f3c92a2be5316dd74a91e9efa62a6e5f9fada110929f SHA512 e1de66f6ccf2122e8adc2a036b3424bf0ea416db492700d4cedab9b13db852ca9ae0aef4ed0264f850c4743a5b0a62a812785e2c45ef7bf59555025e0aed5eca WHIRLPOOL 7678ea607a460b69817ce14b2bbaaeff5d7523848a68e3791157841cbd4fe99d87a8e3559142fff732619aede9cf86de9aa41f644b00fa2fb4aa71d39ec44f3a
DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621
-EBUILD cinnamon-control-center-2.2.11-r1.ebuild 3151 SHA256 85c8e84e114f16d284eccf2b04d06270897be17596570f525c08ea29614b5542 SHA512 4776b318f5d7e79dc59f8257ed487776b101c2f754327124906cb4f116bc5d52340a055751f98198a694afc1031f10529b32824cf2f22cdd1a070cfa33be819b WHIRLPOOL 428e1be3e1127ab57ef04dd5f69b7e375190cfd332f683223cf565de67e69425e603d0164e58bd5c6fc8cd168195ab2613cf8a611cd8a8aff97196087a4fa957
-EBUILD cinnamon-control-center-2.2.11.ebuild 3041 SHA256 42f0ab68c50fbe97cfa6b4826b74e2d93da2f043e4a293845aa2fc183bdc6a0a SHA512 81f5dbbd6f34d317f802906c8fa190ca039d5a84b5381b384c4721bf44bc64f2ab2e6ae3ea8890478ac75d8edd5c7ef1b9181a0faca0674f9f098c9681c32087 WHIRLPOOL 76dc36f7a3d832f4dd36d44f44d87b1740d3151166c4dbb4973ab218f88bc4b78df55c824adf80599e72de3c8961e31b0c3fcb6620da3ad62a55a1b987a809a3
-EBUILD cinnamon-control-center-2.4.2-r1.ebuild 3069 SHA256 455bce07ddd5d36bff83a93360aab5960cfd29c69e6aae56096f27b4b15dbddd SHA512 c99f756f1ef69b24b63f958da54b082708900b18e95473c428d48e38a8fd65ab9680d9a03291350f5a1c0d2fe008702f321e246c03bb301ce732854d3d5cfae7 WHIRLPOOL 484d249e574632d9c8e7a693fafdb2bf7a77eb2439abc3f9af5b75f609687905824f85137ac1723fe8f8342add888da77cf427f7725739f5f963080e5dcb6001
EBUILD cinnamon-control-center-2.4.2-r2.ebuild 3008 SHA256 6f991f9472f357007bcbc1e458cee7a78d8da117052964ea23df59e49b5df7d3 SHA512 cd3d2b1ab44ce9705b4eee52912bf530c983d2503d681209f67e8a7a3c28bc7fb565a6e8e133399b20f0dd8e61419df56074b66e687a61a7c01a3b00145b03a3 WHIRLPOOL 3c6411e2e9fb0058b94a12b0ac878ee3ae79577ad23765f4a52c0e9ee24581ff6692fe3d09172352d714c35be3bea30e89d5c2d3c347b8c585be75b05950cf1d
-MISC ChangeLog 3500 SHA256 a0dd918bd376eae7a92d47bdab2ae1c734702601e43c6733769e805e24762aef SHA512 29f92c6adb30016eed61f0e192b48731fbb8de19dadbc4108074ac1a2d1dc24b9c51e7e87601970382da398bc141d054a0b568472e69e4ee2213bba3671bcd05 WHIRLPOOL f05e9617d09bf221513d121744338354265f8c9d852bee38ab1d76f5bff36116b30c46c9ce6f2aed01d1537a03da9ad50fc4e187258f3d9e36eaff2b14cb7d16
-MISC metadata.xml 392 SHA256 c000f51bfac9296d6a015c136e6a079d1e013cd68436589473205b9f6a352dc5 SHA512 059abffc02a5d0338acaeaf1e9874fd34aa455458c7cedcae37a5a2a6194851446755dac509f68554d47c2afb675e0934e95e57a2515724ed575df34f2e0d80a WHIRLPOOL f379cc0c4d84c9bc2d7135e1e7f83f43206971c1dba811d9abbafc429e0320dcc3e7f1333e56857eacae8b51529200d38e065ad9b898bac69727c921f2dd0366
+MISC ChangeLog 3829 SHA256 2f71730dc9a8755228f37577c0567a1b5fe98d9031576e8f486763f662eb1193 SHA512 dd53ac86c66b38c3f223241f950dee3bfba4c5ab9f36490fe990844362f70a0749c27c237ad1ea4e359089980003e6b2f6d6d1abd7bd8ecc3573cdac65580980 WHIRLPOOL 4859356d0f5d335d334ca1a0a0d2ad10a5d02bbd0290e7350e14dfeb9e25c577ed58c9d4e46037f9c84d46a0122f45173dac6a76489cb38d8f17f39a97fc2fd0
+MISC metadata.xml 264 SHA256 2e50112b25938beb221f3c808331e92cfd6fefec0e4d09313dbea942dae1eaab SHA512 599b439e6a6aa39fe870f55d3cf63797340d856d394d687674e07f90197431877de7f564a7d31d8d669ce264075fbf5b93838d5bfe908673a4eddf65f07646a0 WHIRLPOOL 1faf78d340058ded6aa2c05353cb3bb474c574bf81ed456734488e0f26936732c99f68254347875627bca3962a7b1c76e26fe0f5e8460e2affa9549ac580c0e3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlUFh+MACgkQCaWpQKGI+9Q3KQCfbnLrOwNE10oxyGlnylj5kecQ
-UwEAnAzLCGzGGgVTLotziuOdqUDDIx+/
-=h+jj
+iEYEAREIAAYFAlUOusMACgkQCaWpQKGI+9QcdACfcEWj9wo6wB9fGdV8uSg1TH+r
+s1sAnieB4zmmjIeGVdBVaGMXX5bnx9lX
+=M+7u
-----END PGP SIGNATURE-----
+++ /dev/null
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.11-r1.ebuild,v 1.1 2015/01/17 15:39:50 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom socialweb"
-KEYWORDS="~amd64 ~x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-# networkmanager is not optional
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.31:2
- dev-libs/libxml2:2
- >=gnome-base/libgnomekbd-2.91.91:0=
- >=gnome-extra/cinnamon-desktop-1.0:0=
- >=gnome-extra/cinnamon-menus-1.0:0=
- >=gnome-extra/cinnamon-settings-daemon-1.0:0=
- >=gnome-extra/nm-applet-0.9.8
- media-libs/fontconfig
- >=media-libs/libcanberra-0.13[gtk3]
- >=media-sound/pulseaudio-1.1[glib]
- net-misc/modemmanager
- >=net-misc/networkmanager-0.8.9[modemmanager]
- >=sys-auth/polkit-0.103
- || ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.4.1:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libxklavier
- colord? ( >=x11-misc/colord-0.1.8:0= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/gtk+-3.8:3
- >=x11-libs/libXi-1.2 )
- socialweb? ( net-libs/libsocialweb )
-
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
- || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
- x11-themes/gnome-icon-theme
- x11-themes/gnome-icon-theme-symbolic
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- >=app-admin/system-config-printer-gnome-1.3.5
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
-
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-src_prepare() {
- # make some panels optional
- epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
- # fix wrong nm-applet dependency
- epatch "${FILESDIR}"/${PN}-2.2.5-nm-applet.patch
-
- # Fix NM version checking, bug #536850
- epatch "${FILESDIR}"/${PN}-2.2.11-networkmanager-version.patch
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-systemd doesn't do anything in $PN-2.2.5
- gnome2_src_configure \
- --disable-update-mimedb \
- --disable-static \
- --enable-documentation \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_with socialweb libsocialweb) \
- $(use_enable input_devices_wacom wacom)
-}
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.11.ebuild,v 1.3 2014/12/19 13:37:51 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom socialweb"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-# networkmanager is not optional
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.31:2
- dev-libs/libxml2:2
- >=gnome-base/libgnomekbd-2.91.91:0=
- >=gnome-extra/cinnamon-desktop-1.0:0=
- >=gnome-extra/cinnamon-menus-1.0:0=
- >=gnome-extra/cinnamon-settings-daemon-1.0:0=
- >=gnome-extra/nm-applet-0.9.8
- media-libs/fontconfig
- >=media-libs/libcanberra-0.13[gtk3]
- >=media-sound/pulseaudio-1.1[glib]
- net-misc/modemmanager
- >=net-misc/networkmanager-0.8.9[modemmanager]
- >=sys-auth/polkit-0.103
- || ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.4.1:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libxklavier
- colord? ( >=x11-misc/colord-0.1.8:0= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/gtk+-3.8:3
- >=x11-libs/libXi-1.2 )
- socialweb? ( net-libs/libsocialweb )
-
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
- || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
- x11-themes/gnome-icon-theme
- x11-themes/gnome-icon-theme-symbolic
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- >=app-admin/system-config-printer-gnome-1.3.5
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
-
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-src_prepare() {
- # make some panels optional
- epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
- # fix wrong nm-applet dependency
- epatch "${FILESDIR}"/${PN}-2.2.5-nm-applet.patch
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-systemd doesn't do anything in $PN-2.2.5
- gnome2_src_configure \
- --disable-update-mimedb \
- --disable-static \
- --enable-documentation \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_with socialweb libsocialweb) \
- $(use_enable input_devices_wacom wacom)
-}
+++ /dev/null
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r1.ebuild,v 1.2 2015/01/17 22:43:05 ulm Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom socialweb"
-KEYWORDS="~amd64 ~x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-# networkmanager is not optional
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.31:2
- dev-libs/libxml2:2
- >=gnome-base/libgnomekbd-2.91.91:0=
- >=gnome-extra/cinnamon-desktop-1.0:0=
- >=gnome-extra/cinnamon-menus-1.0:0=
- >=gnome-extra/cinnamon-settings-daemon-1.0:0=
- >=gnome-extra/nm-applet-0.9.8
- media-libs/fontconfig
- >=media-libs/libcanberra-0.13[gtk3]
- >=media-sound/pulseaudio-1.1[glib]
- >=net-misc/modemmanager-0.7
- >=net-misc/networkmanager-0.9.8[modemmanager]
- >=sys-auth/polkit-0.103
- || ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.4.1:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libxklavier
- colord? ( >=x11-misc/colord-0.1.8:0= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/gtk+-3.8:3
- >=x11-libs/libXi-1.2 )
- socialweb? ( net-libs/libsocialweb )
-
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
- || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
- x11-themes/gnome-icon-theme
- x11-themes/gnome-icon-theme-symbolic
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- >=app-admin/system-config-printer-gnome-1.3.5
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
-
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-src_prepare() {
- # make some panels optional
- epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
-
- # Fix NM version checking, bug #536850
- epatch "${FILESDIR}"/${PN}-2.4.2-networkmanager-version.patch
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-systemd doesn't do anything in $PN-2.2.5
- gnome2_src_configure \
- --disable-update-mimedb \
- --disable-static \
- --enable-documentation \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_with socialweb libsocialweb) \
- $(use_enable input_devices_wacom wacom)
-}
+++ /dev/null
---- panels/network/cc-network-panel.c.old 2015-01-17 16:29:12.561444207 +0100
-+++ panels/network/cc-network-panel.c 2015-01-17 16:30:46.778068711 +0100
-@@ -940,30 +940,18 @@
- panel_check_network_manager_version (CcNetworkPanel *panel)
- {
- const gchar *version;
-- gchar **split = NULL;
-- guint major = 0;
-- guint micro = 0;
-- guint minor = 0;
- gboolean ret = TRUE;
-
- /* parse running version */
- version = nm_client_get_version (panel->priv->client);
-- if (version != NULL) {
-- split = g_strsplit (version, ".", -1);
-- major = atoi (split[0]);
-- minor = atoi (split[1]);
-- micro = atoi (split[2]);
-- }
-
-- /* is it too new or old */
-- if (major > 0 || major > 9 || (minor <= 8 && micro < 992)) {
-+ if (version == NULL) {
- ret = FALSE;
-
- /* do modal dialog in idle so we don't block startup */
- panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
- }
-
-- g_strfreev (split);
- return ret;
- }
-
-@@ -1029,8 +1017,9 @@
- {
- gboolean ret;
-
-- /* is the user compiling against a new version, but running an
-- * old daemon version? */
-+ /* is the user compiling against a new version, but not running
-+ * the daemon? */
-+
- ret = panel_check_network_manager_version (panel);
- if (ret) {
- manager_running (panel->priv->client, NULL, panel);
+++ /dev/null
-From 17ebeb557335c297d4925e04a2f5b02a2410e48c Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 7 May 2014 22:23:25 -0400
-Subject: [PATCH] network: the new libnm-gtk wifi API was introduced in
- 0.9.8.0, not 0.9.9.0
-
-See https://git.gnome.org/browse/network-manager-applet/commit/?id=3a18b5a92f774680336758834f0b7f71968f469e
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b900c53..d0271af 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -93,7 +93,7 @@ CANBERRA_REQUIRED_VERSION=0.13
- GDKPIXBUF_REQUIRED_VERSION=2.23.0
- POLKIT_REQUIRED_VERSION=0.103
- NETWORK_MANAGER_REQUIRED_VERSION=0.8.992
--LIBNM_GTK_REQUIRED_VERSION=0.9.9.0
-+LIBNM_GTK_REQUIRED_VERSION=0.9.8.0
- LIBNOTIFY_REQUIRED_VERSION=0.7.3
- CINNAMON_DESKTOP_REQUIRED_VERSION=1.0.0
- CLUTTER_REQUIRED_VERSION=1.11.3
-@@ -139,7 +139,7 @@ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_V
- libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
- libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION)
-
--# Check for libnm-gtk + 0.9.9.0
-+# Check for libnm-gtk + 0.9.8.0
- PKG_CHECK_MODULES(LIBNM_GTK_COMPAT, libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION
- libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION,
- [have_libnmgtk=yes], have_libnmgtk=no)
---
-1.9.2
-
<use>
<flag name="colord">Support color management using
<pkg>x11-misc/colord</pkg></flag>
- <flag name="socialweb">Add support for desktop background images from
- Flickr using <pkg>net-libs/libsocialweb</pkg></flag>
</use>
</pkgmetadata>
projects / gentoo.git / commitdiff