Add upstream fixes for clock applet

3 files changed, 41 insertions, 30 deletions

diff --git a/Use-16px-menu-icons.patch b/Use-16px-menu-icons.patch
deleted file mode 100644
index 64e94dd..0000000
--- a/Use-16px-menu-icons.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From de049e9a8846270ed643b5c021ecd75fa259e00e Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Mon, 4 Apr 2011 17:48:39 -0400
-Subject: [PATCH] Use 16px menu icons
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646749
----
- gnome-panel/panel-stock-icons.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gnome-panel/panel-stock-icons.h b/gnome-panel/panel-stock-icons.h
-index efac6d4..229d80a 100644
---- a/gnome-panel/panel-stock-icons.h
-+++ b/gnome-panel/panel-stock-icons.h
-@@ -31,7 +31,7 @@
- G_BEGIN_DECLS
- 
- /* themeable size - "panel-menu" -- This is used for the icons in the menus */
--#define PANEL_DEFAULT_MENU_ICON_SIZE 		24
-+#define PANEL_DEFAULT_MENU_ICON_SIZE 		16
- 
- /* stock icons */
- #define PANEL_STOCK_FORCE_QUIT          "gnome-panel-force-quit"
--- 
-1.7.3.4
\ No newline at end of file
diff --git a/gnome-panel-3.14-clock-fixes.patch b/gnome-panel-3.14-clock-fixes.patch
new file mode 100644
index 0000000..6a74b83
--- /dev/null
+++ b/gnome-panel-3.14-clock-fixes.patch
@@ -0,0 +1,34 @@
+commit 3c8387188a699c797bef08c8a24ad2f988cd994c
+commit 6ca0e5dee4142d7995827b28ff674006ee3f8dd4
+
+--- a/applets/clock/clock.c
++++ b/applets/clock/clock.c
+@@ -1213,7 +1213,6 @@ location_set_current_cb (ClockLocation *loc,
+ 	if (cd->map_widget)
+ 		clock_map_refresh (CLOCK_MAP (cd->map_widget));
+         update_location_tiles (cd);
+-	save_cities_store (cd);	
+ }
+ 
+ static void
+@@ -1617,8 +1617,7 @@ edit_clear (ClockData *cd)
+         GtkWidget *lon_combo = _clock_get_widget (cd, "edit-location-longitude-combo");
+ 
+         /* clear out the old data */
+-        /* TODO: reinstate after bumping to gweather >= 3.10.1 */
+-        //gweather_location_entry_set_location (cd->location_entry, NULL);
++        gweather_location_entry_set_location (cd->location_entry, NULL);
+         gweather_timezone_menu_set_tzid (cd->zone_combo, NULL);
+ 
+         gtk_entry_set_text (GTK_ENTRY (lat_entry), "");
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,7 +96,7 @@ TELEPATHY_GLIB_REQUIRED=0.14.0
+ LIBECAL_REQUIRED=3.5.3
+ LIBEDATASERVER_REQUIRED=3.5.3
+ CAIRO_REQUIRED=1.0.0
+-GWEATHER_REQUIRED=3.9.2
++GWEATHER_REQUIRED=3.10.1
+ DCONF_REQUIRED=0.13.4
+ LIBRSVG_REQUIRED=2.36.2
+ 
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 9a6c619..c8d1f77 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -8,7 +8,7 @@
 %define telepathy_glib_version 0.14.0
 %define evolution_data_server_version 3.5.3
 %define cairo_version 1.0.0
-%define libgweather_version 3.9.2
+%define libgweather_version 3.10.1
 %define dconf_version 0.13.4
 %define librsvg_version 2.36.2
 
@@ -17,13 +17,12 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 3.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
 Source0: http://download.gnome.org/sources/gnome-panel/3.14/%{name}-%{version}.tar.xz
+Patch0:  gnome-panel-3.14-clock-fixes.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=646749
-#Patch0: Use-16px-menu-icons.patch
 
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -144,7 +143,7 @@ Panel Applets using the libpanel-applet library.
 
 %prep
 %setup -q -n %{name}-%{version}
-#patch0 -p1 -b .16px
+%patch0 -p1 -b .clock
 
 rm -f libtool
 autoreconf -i -f
@@ -242,6 +241,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %{_datadir}/gir-1.0/PanelApplet-5.0.gir
 
 %changelog
+* Fri Dec 18 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-2
+- Add upstream fixes for clock applet
+
 * Wed Feb 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-1
 - Version bump for GNOME Flashback 3.14.