Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 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 
+++++++++++++++++++++++++
 wm-addons/cairo-dock/BUILD                     |    4 -
 wm-addons/cairo-dock/HISTORY                   |    4 +
 wm-addons/cairo-dock/PRE_BUILD                 |    4 +
 7 files changed, 69 insertions(+), 6 deletions(-)

New commits:
commit f94b044cf91a13a9d63ac7f2c1b5f45054b793f9
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    wm-addons/cairo-dock-plugins: fixed the weather URL + some code cleanups

commit 347fe8b347bfe4a5f55d808e5aa004cb1239e1aa
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    wm-addons/cairo-dock: reorganized sedding

diff --git a/wm-addons/cairo-dock-plugins/BUILD 
b/wm-addons/cairo-dock-plugins/BUILD
index cba3d9b..e013b8d 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 42a2879..037a815 100644
--- a/wm-addons/cairo-dock-plugins/HISTORY
+++ b/wm-addons/cairo-dock-plugins/HISTORY
@@ -1,3 +1,8 @@
+2016-09-14 Pavel Vinogradov <public AT sourcemage.org>
+       * 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 <public AT sourcemage.org>
        * 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 0000000..9a8c7d6
--- /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 0000000..035143f
--- /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 <fabounet03 AT gmail.com>
+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 {
diff --git a/wm-addons/cairo-dock/BUILD b/wm-addons/cairo-dock/BUILD
index 5664e36..e013b8d 100755
--- a/wm-addons/cairo-dock/BUILD
+++ b/wm-addons/cairo-dock/BUILD
@@ -1,5 +1 @@
-. "$GRIMOIRE"/FUNCTIONS
-
-sed -i "s:glib/gtypes.h:glib.h:" src/gldit/cairo-dock-keybinder.h &&
-
 cmake_build
diff --git a/wm-addons/cairo-dock/HISTORY b/wm-addons/cairo-dock/HISTORY
index 5be7f08..071617b 100644
--- a/wm-addons/cairo-dock/HISTORY
+++ b/wm-addons/cairo-dock/HISTORY
@@ -1,3 +1,7 @@
+2016-09-14 Pavel Vinogradov <public AT sourcemage.org>
+       * BUILD: removed sed and sourcing of functions
+       * PRE_BUILD: sed now is here
+
 2015-12-15 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: updated spell to 3.4.1, got SOURCE_URLs escaped, added
          GitHub mirror
diff --git a/wm-addons/cairo-dock/PRE_BUILD b/wm-addons/cairo-dock/PRE_BUILD
new file mode 100755
index 0000000..13159d6
--- /dev/null
+++ b/wm-addons/cairo-dock/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+sed -i "s:glib/gtypes.h:glib.h:" src/gldit/cairo-dock-keybinder.h