From f94b044cf91a13a9d63ac7f2c1b5f45054b793f9 Mon Sep 17 00:00:00 2001 From: Pavel Vinogradov Date: Wed, 14 Sep 2016 17:31:57 -0400 Subject: wm-addons/cairo-dock-plugins: fixed the weather URL + some code cleanups --- wm-addons/cairo-dock-plugins/BUILD | 2 - wm-addons/cairo-dock-plugins/HISTORY | 5 +++ wm-addons/cairo-dock-plugins/PRE_BUILD | 4 ++ wm-addons/cairo-dock-plugins/weather-url.patch | 52 ++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100755 wm-addons/cairo-dock-plugins/PRE_BUILD create mode 100644 wm-addons/cairo-dock-plugins/weather-url.patch (limited to 'wm-addons') diff --git a/wm-addons/cairo-dock-plugins/BUILD b/wm-addons/cairo-dock-plugins/BUILD index cba3d9bda8..e013b8d866 100755 --- a/wm-addons/cairo-dock-plugins/BUILD +++ b/wm-addons/cairo-dock-plugins/BUILD @@ -1,3 +1 @@ -. "$GRIMOIRE"/FUNCTIONS - cmake_build diff --git a/wm-addons/cairo-dock-plugins/HISTORY b/wm-addons/cairo-dock-plugins/HISTORY index 42a28797bf..037a81565a 100644 --- a/wm-addons/cairo-dock-plugins/HISTORY +++ b/wm-addons/cairo-dock-plugins/HISTORY @@ -1,3 +1,8 @@ +2016-09-14 Pavel Vinogradov + * BUILD: removed sourcing of functions + * PRE_BUILD, weather-url.patch: added a patch from upstream to fix + the weather URL + 2015-12-15 Pavel Vinogradov * DETAILS: updated spell to 3.4.1, changed SOURCE, got SOURCE_URLs escaped, added GitHub mirror diff --git a/wm-addons/cairo-dock-plugins/PRE_BUILD b/wm-addons/cairo-dock-plugins/PRE_BUILD new file mode 100755 index 0000000000..9a8c7d6523 --- /dev/null +++ b/wm-addons/cairo-dock-plugins/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} && + +patch -p1 < ${SPELL_DIRECTORY}/weather-url.patch diff --git a/wm-addons/cairo-dock-plugins/weather-url.patch b/wm-addons/cairo-dock-plugins/weather-url.patch new file mode 100644 index 0000000000..035143fd3d --- /dev/null +++ b/wm-addons/cairo-dock-plugins/weather-url.patch @@ -0,0 +1,52 @@ +From 402a2d7bb657be4ad4072f07612e008e846d5e97 Mon Sep 17 00:00:00 2001 +From: Fabounet +Date: Sun, 22 May 2016 21:13:21 +0200 +Subject: [PATCH] [1581725] Updated the weather URL we retrieve data from + +--- + weather/src/applet-config.c | 2 +- + weather/src/applet-read-data.c | 3 --- + weather/src/applet-struct.h | 3 +++ + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/weather/src/applet-config.c b/weather/src/applet-config.c +index c9a33c2..0a27a8a 100755 +--- a/weather/src/applet-config.c ++++ b/weather/src/applet-config.c +@@ -174,7 +174,7 @@ static void _on_got_location_data (const gchar *cLocationData, GldiModuleInstanc + gldi_task_discard (myData.pGetLocationTask); + myData.pGetLocationTask = NULL; + } +-#define CD_WEATHER_BASE_URL "http://xml.weather.com" ++ + static void _cd_weather_search_for_location (GtkEntry *pEntry, GldiModuleInstance *myApplet) + { + const gchar *cLocationName = gtk_entry_get_text (pEntry); +diff --git a/weather/src/applet-read-data.c b/weather/src/applet-read-data.c +index 0bbdce7..8ca8d21 100755 +--- a/weather/src/applet-read-data.c ++++ b/weather/src/applet-read-data.c +@@ -30,9 +30,6 @@ + #include "applet-load-icons.h" + #include "applet-read-data.h" + +-#define CD_WEATHER_BASE_URL "http://xml.weather.com" +- +- + static xmlDocPtr _cd_weather_open_xml_buffer (const gchar *cData, xmlNodePtr *root_node, const gchar *cRootNodeName, GError **erreur) + { + if (cData == NULL || *cData == '\0') +diff --git a/weather/src/applet-struct.h b/weather/src/applet-struct.h +index e96191e..02ba3d0 100755 +--- a/weather/src/applet-struct.h ++++ b/weather/src/applet-struct.h +@@ -29,6 +29,9 @@ + + #define WEATHER_DEFAULT_NAME "weather" + ++#define CD_WEATHER_BASE_URL "http://wxdata.weather.com/wxdata" ++ ++ + #define _display(cValue) ((cValue) == NULL || *((gchar*)cValue) == 'N' ? "?" : (const gchar*)(cValue)) + + struct _AppletConfig { -- cgit v1.2.3