gnome-extra/nm-applet: Fix systray icon size (bug #471178)

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

5 files changed, 180 insertions, 5 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 5e75f00f6345..b17751d575fe 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.102 2013/06/10 09:48:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.103 2013/06/10 10:08:14 sping Exp $
+
+*nm-applet-0.9.8.0-r1 (10 Jun 2013)
+*nm-applet-0.9.6.4-r1 (10 Jun 2013)
+
+  10 Jun 2013; Sebastian Pipping <sping@gentoo.org>
+  +nm-applet-0.9.6.4-r1.ebuild,
+  +files/nm-applet-0.9.6.4-systray-icon-size.patch,
+  +nm-applet-0.9.8.0-r1.ebuild:
+  Apply patch on systray icon size from 0.9.8.2 to previous versions (bug
+  #471178)
 
 *nm-applet-0.9.8.2 (10 Jun 2013)
 
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 7453607533b1..eef78b726398 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX nm-applet-0.9.6.4-systray-icon-size.patch 1599 SHA256 6aae8a3533072581fe25571df55e00a304514cfba98eee4f4dffe1ccf7626db8 SHA512 7aadf6333ad2dde827699fe3339a26e239a099ea5cd683fb4ccc6970caef7fb68dadfc9ad80d6b15fc351dd828ef8e5efd8e58dba0a800baf6fbc874f2fb97a7 WHIRLPOOL 9c901f2e8433066b03d36ae5d9570df72ebc995a3579c170f14caf256b8121bf33622e25d87acdd3c5a61b7513b6fa48b3731e45bd447562a711d7d969d111bc
 DIST network-manager-applet-0.9.6.4.tar.xz 1140868 SHA256 ae5667b165f0f83244ec76c42f17553ec2169f5250e144904994497137374141 SHA512 16aab6e5786d0d6e89b880e34c6b8883bd57a190fb7ae73048db69ad2757317822eff4c8e825239fba969f67a760ce90ac94c27c79780158f3a2d82a9069d242 WHIRLPOOL 940c31ef95cd0b3b7a78ca5083c442dd229c98cf389a0615e4a6ba39b39e3df947b2d3e9b59100e8379b8cdfb845eb2899b637a89a09647b777b2143018e5e80
 DIST network-manager-applet-0.9.8.0.tar.xz 1214956 SHA256 1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590 SHA512 0c2acb8ded7621369e96a9fc748bfbc75af1eb03415c2109e6f577c9c5d8996cc6b9b11d9c2c445ae7b50c2016f5c90f5a649632738eb056bfa99f115a3b1270 WHIRLPOOL e49e11bec0c2a292567c403b689db429db0aab71778f8b328106a33d95dee66da9d36f04dea7c2f55bb0e887342b3c7ea9ad6f43b2a80e4df592f6a3b495bc41
 DIST network-manager-applet-0.9.8.2.tar.xz 1214284 SHA256 a540c743971c199a7b8663a8d0a38eb66a4c13a6b5124cd3a7495c75560aadc7 SHA512 c2c8e264bdafc367ffd31f1c6ad3278cb2cdb042a532c260982803109601906e61be6b2ea9298e19b06646acf995a36875d18f9c3c2a0edfac61929a77f885c5 WHIRLPOOL add58064103039b5fc527450714fc3b47966a665c40cb6f2950fe0dacef9dc5134e277dadc511e08f89c2962c9a7a2ee1ba180abab08d57ab307a8a603e13199
 DIST pngcrush-fixed-nm-signal-icons.tar.xz 2052 SHA256 49adffa785572463e17674caec605d9ce5b6021f1c91b918380654cfc380defa SHA512 88af2109e2e2a26775af1121b4e9bab0a03aa817fe60cd4bdb0bed5e56e046fdb87d2783cf96b36d22da66869884313d9635e4a70f1e2579b5536e7d62595b39 WHIRLPOOL f50b2ba429e9bded025e97995ecd96c7a3b2b668cb6aafaae1d4c3785393fbebb5bdd61f44eff2398023550524c0459b281a07813b94d38e61dc865aec584c0d
+EBUILD nm-applet-0.9.6.4-r1.ebuild 1473 SHA256 108807aed96b1ea28475035dd9f73aaf334903fa927f19c30698a6c2cc68e564 SHA512 0acabd3b523cdc38e38e623ee3248a4a018a1832619cd55ce0fdbc72fe037f68bc83f81a11f934d0ceccb08f82813193cb75dff4cd367fcba4e8d3bfba4c6f0a WHIRLPOOL f8acf4737f20743ec64034a97985f590dc2dc77fe8f528a9bf4805bd1f99a62288e6b808d7f866c8188f1d401eb0c8196625d99b61e939fc27b56fc4f1dc5d97
 EBUILD nm-applet-0.9.6.4.ebuild 1410 SHA256 6c50aefdc6754be70240fca4841aad950ad99255640260827256322c3168bbd8 SHA512 0c0b5b028a08e1be60268c0797a9da79c8ff42b17d8e314ab040572d2de321bb66747945ce9a47ab78f34afea4032abdee0d832d5d7fbc3801074d2a6604ce05 WHIRLPOOL f3050eff77f2f67104c827ebf224b9b58ff297aad36ee69eb318d81f3d6dab215b58fcc982dd3f928b68786164734f262acd3d584ef876b979e42240c74cf621
+EBUILD nm-applet-0.9.8.0-r1.ebuild 1705 SHA256 b4b7aa0b34fff9be0f3dad34e65905c1e8eb31893db0f638ad48ec15b239cc45 SHA512 eb382bc78f639d282a597a95f1f80c08cc521bb9e6ae6e25554c42f1187ee47affd6a10d0b49b70516289588b1eb7ffff76e1f91b37fcc750a892ffab0b72eb3 WHIRLPOOL b4aede3f982fe24bf871a90e6893135f2149bf56a59264011ddea2a13de48dd989c969e9e21667d21244a33291bee4e55eb836aa570c4d84cdc0a2a6cbf57bd7
 EBUILD nm-applet-0.9.8.0.ebuild 1641 SHA256 f6373d048d8e2befc6ac24c7910cbe008c64b4cdcde664d85acaad578232cb15 SHA512 8841b9d647d82f76f096dd5f5c7a4de0f3fc7be7d06ae19116b56651696de9b8c04d32075edb4fbff66858dfdcfc0967bd3bdea592c3a1ac91b3111ab7c40e47 WHIRLPOOL d70b440fb5f1f9252bc78e34f8d774aca0a8c55db39ad950be47dedcaf836ed9802475839e13806da422da1ae6b7de71061b506413af6ae420a0174d59d4f37e
 EBUILD nm-applet-0.9.8.2.ebuild 1483 SHA256 4238d7777e33ed727a4a40755489fff2ff471899d91a5bd260969a6660384861 SHA512 352cd66d3f1178465962cef472b686e2d1d90b718fb2ca763b57c72a5b3b1aa818dfec4b66a84d703eb2108e06b28dcf644a540a1771c930f07c234800cc6ebd WHIRLPOOL b8fb8b2696cad3e1a54cae152e4b78bceb3af07030a18cc67040a07504b934fbaa581330eed1d013461d54d33dc72d8372736e30cd2c20151055feafe3552c72
-MISC ChangeLog 17513 SHA256 2de6e1d0e19fbf56bd1979d7262e2a35b3835fe5257ade1d84846c41b501f5c3 SHA512 e970898aa04522d7148ab7ea8fa6108dba2d4b830f178f98249eae5b31052b5ec7638edfe63ded702da45b60dff18af214242fab6ff844918f56b9ba3b5dba35 WHIRLPOOL 8d925759bf269371fab724457edbb3c511eec9f84932c91ab66109f686760b298b65012011cf8abcbd9369159dc6d4fb60d302cc9f36dcbf6e615d4b696556ab
+MISC ChangeLog 17840 SHA256 732be8549819d39cf4a2611d9df769845505a3198dd7db2cfee40a633b61400a SHA512 a76ff474466148c883065223b6067923768f63863deb81fcec698bbfcec755d50afdc7f5ce30cced36d4bc03dde1b47edbc5f36b237796a3fef3aa30748ee1f9 WHIRLPOOL bafb33d584071e43af21900f28910f9f2bf906e6ef994b862c80d954f4c3a9d379055539a296e54a5570a0c3929972f2469bd851d29f88d02efa83677a5b7d13
 MISC metadata.xml 568 SHA256 287c10633139a1bb2c4a58faa5c77425442627db42ce65e7dc97596fe6a4dff9 SHA512 e23d8fdcfcda1c126cb074a28b13e2abcb45809d0a33302452c1d35bc55ae1d2d9725c9ae6e1fed39ba31b30b7bdd14b142b6a75d7f6a8eccf3ec17178c97a3a WHIRLPOOL 87f86d28d8de6d73b8d8c921b1efdf1811f604af85a2895af6b7b1d09d4f24424b51ca61a5c84df029afcfeeb07891b49da19092394da2df52de108e86bc1018
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlG1oPgACgkQCaWpQKGI+9QofwCcCPtIM8kMANHoXkhK3jM68vww
-yXIAnR/XjFqodANTAVwntrrfLOdSMZdP
-=ydyW
+iEYEAREIAAYFAlG1pbQACgkQsAvGakAaFgA3fgCcCcDmawnANMR/E0fTxq+20fiU
+R4oAn0/c6E9OE+pzWhzzPhj0biDppMsS
+=YL2e
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.9.6.4-systray-icon-size.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.6.4-systray-icon-size.patch
new file mode 100644
index 000000000000..c06d47e150ee
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.9.6.4-systray-icon-size.patch
@@ -0,0 +1,41 @@
+From d6f5bd36387d278e60ffc746f79d2b1851fc441a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 08 Apr 2013 19:48:23 +0000
+Subject: applet: improve icon size handling
+
+Always return an icon of exactly the requested size, and let that size
+be less than 16. Fixes the display in various non-GNOME panels.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=698901
+---
+diff --git a/src/applet.c b/src/applet.c
+index 6c39509..a213173 100644
+--- a/src/applet.c
++++ b/src/applet.c
+@@ -3321,7 +3321,7 @@ nma_icon_check_and_load (const char *name, GdkPixbuf **icon, NMApplet *applet)
+ 	/* Try to load the icon; if the load fails, log the problem, and set
+ 	 * the icon to the fallback icon if requested.
+ 	 */
+-	*icon = gtk_icon_theme_load_icon (applet->icon_theme, name, applet->icon_size, 0, &error);
++	*icon = gtk_icon_theme_load_icon (applet->icon_theme, name, applet->icon_size, GTK_ICON_LOOKUP_FORCE_SIZE, &error);
+ 	if (!*icon) {
+ 		g_warning ("Icon %s missing: (%d) %s",
+ 		           name,
+@@ -3425,13 +3425,13 @@ status_icon_size_changed_cb (GtkStatusIcon *icon,
+                              NMApplet *applet)
+ {
+ 	if (getenv ("NMA_SIZE_DEBUG")) {
+-		g_message ("%s(): status icon size now %d", __func__, size);
++		g_message ("%s(): status icon size %d requested", __func__, size);
+ 	}
+ 
+ 	/* icon_size may be 0 if for example the panel hasn't given us any space
+ 	 * yet.  We'll get resized later, but for now just load the 16x16 icons.
+ 	 */
+-	applet->icon_size = MAX (16, size);
++	applet->icon_size = size ? size : 16;
+ 
+ 	nma_icons_reload (applet);
+ 
+--
+cgit v0.9.2
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild
new file mode 100644
index 000000000000..a403b6a3690d
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild,v 1.1 2013/06/10 10:08:14 sping Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~ssuominen/pngcrush-fixed-nm-signal-icons.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="bluetooth gconf"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+	>=dev-libs/dbus-glib-0.88
+	>=gnome-base/gnome-keyring-2.20
+	>=sys-apps/dbus-1.4.1
+	>=sys-auth/polkit-0.96-r1
+	>=x11-libs/gtk+-3:3
+	>=x11-libs/libnotify-0.7.0
+
+	app-text/iso-codes
+	>=net-misc/networkmanager-0.9.6
+	net-misc/mobile-broadband-provider-info
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
+	gconf? ( >=gnome-base/gconf-2.20:2 )
+	virtual/freedesktop-icon-theme"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		--with-gtkver=3
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		$(use_with bluetooth)
+		$(use_enable gconf migration)"
+
+	mv -f "${WORKDIR}"/nm-signal-*.png icons/22/
+
+	gnome2_src_prepare
+
+	epatch "${FILESDIR}"/${PN}-0.9.6.4-systray-icon-size.patch
+}
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.8.0-r1.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.8.0-r1.ebuild
new file mode 100644
index 000000000000..8e69158360df
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-0.9.8.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.8.0-r1.ebuild,v 1.1 2013/06/10 10:08:14 sping Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~ssuominen/pngcrush-fixed-nm-signal-icons.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="bluetooth gconf +introspection modemmanager"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/dbus-glib-0.88
+	>=gnome-base/gnome-keyring-2.20
+	>=sys-apps/dbus-1.4.1
+	>=sys-auth/polkit-0.96-r1
+	>=x11-libs/gtk+-3:3
+	>=x11-libs/libnotify-0.7.0
+
+	app-text/iso-codes
+	>=net-misc/networkmanager-0.9.8
+	net-misc/mobile-broadband-provider-info
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
+	gconf? ( >=gnome-base/gconf-2.20:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
+	virtual/freedesktop-icon-theme
+	virtual/udev[gudev]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+"
+
+src_prepare() {
+	mv -f "${WORKDIR}"/nm-signal-*.png icons/22/
+	gnome2_src_prepare
+
+	epatch "${FILESDIR}"/${PN}-0.9.6.4-systray-icon-size.patch
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-gtkver=3 \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		$(use_with bluetooth) \
+		$(use_enable gconf migration) \
+		$(use_enable introspection) \
+		$(use_with modemmanager modem-manager-1)
+}