Add a submenu to the app menu to choose the temperature unit (from 'master'), drop old.

Package-Manager: portage-2.1.12.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 83 insertions, 9 deletions

diff --git a/gnome-extra/gnome-weather/ChangeLog b/gnome-extra/gnome-weather/ChangeLog
index 6685e5bfcc9a..0907163966e7 100644
--- a/gnome-extra/gnome-weather/ChangeLog
+++ b/gnome-extra/gnome-weather/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-weather
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-weather/ChangeLog,v 1.2 2013/05/13 20:53:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-weather/ChangeLog,v 1.3 2013/06/29 21:01:55 pacho Exp $
+
+*gnome-weather-3.8.2-r1 (29 Jun 2013)
+
+  29 Jun 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-weather-3.8.2-temp-unit.patch, +gnome-weather-3.8.2-r1.ebuild,
+  -gnome-weather-3.8.1.ebuild:
+  Add a submenu to the app menu to choose the temperature unit (from 'master'),
+  drop old.
 
 *gnome-weather-3.8.2 (13 May 2013)
 
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index b3a622e65840..f3219100c4f8 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gnome-weather-3.8.1.tar.xz 10338404 SHA256 9dbbf0aa50a940894a9ebf63001163a8fa89c3aa8febbddcd3c6c6eefbc00f3d SHA512 8172738e69c065321d064df49d02fec8461a244756ff52f90abebc298a1741a5149d682538c2e88712336e6f9869eb871d367f2261f1cf63a2391e5f07a056ed WHIRLPOOL e350b4e3d14a06ab2180497fb690560c4e2759c110f35e18871e820337bdcfd72e3c627cf0bd019531e7301e89164c531c3fdecd09a4030eebc41ea985de8c91
+AUX gnome-weather-3.8.2-temp-unit.patch 2205 SHA256 e0a3f8efa0fc79598f67017c557cf04825d953f6a628385c22550be0dfe3ce64 SHA512 445d5608aad75408f739ea92034cc82dc9f08508b94349fab26fc6d3508cf5f86286f465f2fe25cb43f305cd95da76b757787a146ef89038ce416a4add936e6a WHIRLPOOL 1c39ab35169f5cf5b2531edec7079977e3cf3cea698a19b368e4a5d19e6c7a66d8c3b49b61d8eca265ec6f5cdbdca1dd5c3ff9c1982b0e2a12db5fd1406df7e6
 DIST gnome-weather-3.8.2.tar.xz 10338608 SHA256 cf61afac1435dbdb87e8d9e4d86bca29cf1ff2c64cefc8db696cd27dad15adf4 SHA512 bb217c3412e076edc025ff1c7da99d20db5859556978bec98089a2c02ae60166ef2409bbd23f19cd8146b831005928091372272a2ff538feeda957f7bc1bf9df WHIRLPOOL a8d0062d92155d625ced0a01273c517b6be1f71d3537d30a062929060b9c2737c2ea060a678b437ffc58c81c1eb8c31283832d2a8d4350f80cb6d7bc578b309e
-EBUILD gnome-weather-3.8.1.ebuild 616 SHA256 d90d775654c44da3eeafe02d6dd26c7872c69c48aae8d71d53a9bbc107be60c1 SHA512 b4fd07b8aafd5c2e3b4e8cafab5a1c7d17fd0dc5494e64171b53892a1c9a3126865f8aea8da1c3c92ba288323f9368fd2025158fcb60ea64357ad561ace8d25f WHIRLPOOL 925223ef830dce25a1be5fe9a64f19dadd428c3b891468e84318e59def1e6eb8475c98d177dbb25cb279762d7a38a2f9fd92c86fa85de1060da068f8f80352cd
+EBUILD gnome-weather-3.8.2-r1.ebuild 796 SHA256 a7fd3abc43c74e990c2f5170bebea56813e3f86951567ae4ab629cb392e02d38 SHA512 fc4a73a609811591797745aa422460b9581f0aa2048a87540bc4cd3f4517b937c4134452e1f9e27811646f14443b0dcb11a19e58bc2f95de3e34930042433bc4 WHIRLPOOL 4213afe798c054311c20d84c2e0561e55a2132c1023ddb5c6eabf7c8ed5ea9e055ad15157dec3fa59c2ab7a7ec94b9b6a89118f57b0fab9e11019db56cbd4277
 EBUILD gnome-weather-3.8.2.ebuild 616 SHA256 905f32bbc94fb634bae3cc4c5077d69a791dac09e6822fc732ac3b703610f962 SHA512 115df5d19fcf1754e629f41bcd56563f45648964ffd412d481e66439226fdafb3d73966fe5a59c97851fc91c854aedfe89afc3777be123ace31d2bd8de9af30e WHIRLPOOL c77eb747f5d8c51fe1ea6021dbe4354ce3fe2c295dc3fed8e61ffcca536c7d48651fb09c0c595220e16b425e6c3268f8eee8b6170ce2d1b2c6961adb124196f7
-MISC ChangeLog 527 SHA256 c3a656c406d9710fb2749d90aa6b2574c53c25b50354a82023a933f08ef37cfa SHA512 2f71197150ac2416bf82db87152af3fcd83b888f4a009aed144642c8bade0b284b218a2144a751695d32db84ea6842509ba38c4487cb0fad2de56286cbcebb0e WHIRLPOOL 8891c41661135475ed3c14ce99e55254f39cda96a6b86397726017f8526ad608360e5a613e4aab9694eb896e9ef17679fa35ef5757d4b6997271bde7b56a2101
+MISC ChangeLog 814 SHA256 51111f75faa3633ec8f717dc898c119213954c180998e52c289218d7bcaf705d SHA512 9c76f0fac4af0a46d8c44382fe41a9be8a0a0aabbf6abcaf1506ca2feeda7838404266a976e66592e17eda64017199906c29ba9c5e55e0898f43f9347219ddc4 WHIRLPOOL 8e246166db19d4c9226ba5ef60461967e073b468c93d08e63bfeb0f72d0e398a658c957c307096737716f271e19b05433ef7f8b05a7642599b3e379cbbd5f646
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGRUrUACgkQCaWpQKGI+9TUiwCdHkRr9wK5Irg3NGiu0LaDC89i
-h50An0msAkozyDbx72ulUPRzPPkDuGm+
-=wYa2
+iEYEAREIAAYFAlHPS0QACgkQCaWpQKGI+9TuOwCdH5y6HXkdQ8OBIPsoSxc05Z2s
+U58An0WCqwZSSWZ/mMfe8vUD9wfQ48m7
+=k4Wg
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch b/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch
new file mode 100644
index 000000000000..c652651f9737
--- /dev/null
+++ b/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch
@@ -0,0 +1,59 @@
+From 7c901f42d2837e682f37d85b1fa3ee94922f2a05 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Mon, 13 May 2013 21:19:49 +0000
+Subject: Add a submenu to the app menu to choose the temperature unit
+
+Among all the preferences in the old dialog, temperature unit
+is the only one that makes real sense, as we don't show wind
+speed, visibility or pressure.
+Also, exclude the Kelvin entry, which is there just to make
+cool screenshots :)
+---
+diff --git a/data/app-menu.ui b/data/app-menu.ui
+index 42a16a4..c332595 100644
+--- a/data/app-menu.ui
++++ b/data/app-menu.ui
+@@ -6,12 +6,25 @@
+         <attribute name="action">win.new</attribute>
+         <attribute name="accel">&lt;Primary&gt;n</attribute>
+       </item>
++    </section>
++    <submenu>
++      <attribute translatable="yes" name="label">Temperature unit</attribute>
++      <item>
++        <attribute translatable="yes" name="label">Celsius</attribute>
++        <attribute name="action">app.temperature-unit</attribute>
++        <attribute name="target">centigrade</attribute>
++      </item>
++      <item>
++        <attribute translatable="yes" name="label">Fahrenheit</attribute>
++        <attribute name="action">app.temperature-unit</attribute>
++        <attribute name="target">fahrenheit</attribute>
++      </item>
++    </submenu>
++    <section>
+       <item>
+         <attribute name="action">win.about</attribute>
+         <attribute name="label" translatable="yes">About Weather</attribute>
+       </item>
+-    </section>
+-    <section>
+       <item>
+         <attribute name="action">app.quit</attribute>
+         <attribute name="label" translatable="yes">Quit</attribute>
+diff --git a/src/main.js b/src/main.js
+index 687b79e..844a0d4 100644
+--- a/src/main.js
++++ b/src/main.js
+@@ -76,6 +76,9 @@ const Application = new Lang.Class({
+                          [{ name: 'quit',
+                             activate: this._onQuit }]);
+ 
++        let gwSettings = new Gio.Settings({ schema: 'org.gnome.GWeather' });
++        this.add_action(gwSettings.create_action('temperature-unit'));
++
+         this._initAppMenu();
+ 
+         this.add_accelerator("Escape", "win.selection-mode(false)", null);
+--
+cgit v0.9.2
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.8.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.8.2-r1.ebuild
index 79b7cda62406..4f0786ae03fd 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.8.1.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.8.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-weather/gnome-weather-3.8.1.ebuild,v 1.2 2013/05/13 20:53:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-weather/gnome-weather-3.8.2-r1.ebuild,v 1.1 2013/06/29 21:01:55 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="A weather application for GNOME"
 HOMEPAGE="https://live.gnome.org/Design/Apps/Weather"
@@ -24,3 +24,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.26
 	virtual/pkgconfig
 "
+
+src_prepare() {
+	# Add a submenu to the app menu to choose the temperature unit (from 'master')
+	epatch "${FILESDIR}/${PN}-3.8.2-temp-unit.patch"
+
+	gnome2_src_prepare
+}