summaryrefslogtreecommitdiffstats
path: root/source/xfce
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-12-31 23:17:20 +0000
committer Eric Hameleers <alien@slackware.com>2020-01-01 08:59:48 +0100
commitc01d25f478b3333130586a203534d27eeb6fe93d (patch)
tree050611f940050a6dc732b2a52c227b74834d4581 /source/xfce
parenta25634cd2673da378042be73ad304b3c2b9350b7 (diff)
downloadcurrent-c01d25f478b3333130586a203534d27eeb6fe93d.tar.gz
current-c01d25f478b3333130586a203534d27eeb6fe93d.tar.xz
Tue Dec 31 23:17:20 UTC 201920191231231720
a/kernel-generic-5.4.7-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.7-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.7-x86_64-1.txz: Upgraded. a/ncompress-4.2.4.6-x86_64-1.txz: Upgraded. d/kernel-headers-5.4.7-x86-1.txz: Upgraded. k/kernel-source-5.4.7-noarch-1.txz: Upgraded. l/imagemagick-7.0.9_13-x86_64-1.txz: Upgraded. l/libarchive-3.4.1-x86_64-1.txz: Upgraded. l/libjpeg-turbo-2.0.4-x86_64-1.txz: Upgraded. xfce/xfce4-weather-plugin-0.8.11-x86_64-1.txz: Upgraded. Bugfix release to address the upcoming obsolescence of the locationforecastLTS API from met.no. Thanks to Robby Workman. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to '')
-rw-r--r--source/xfce/xfce4-weather-plugin/update-met_no-API.patch51
-rwxr-xr-xsource/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild4
2 files changed, 54 insertions, 1 deletions
diff --git a/source/xfce/xfce4-weather-plugin/update-met_no-API.patch b/source/xfce/xfce4-weather-plugin/update-met_no-API.patch
new file mode 100644
index 000000000..3cfe31215
--- /dev/null
+++ b/source/xfce/xfce4-weather-plugin/update-met_no-API.patch
@@ -0,0 +1,51 @@
+From 139545eeda3cff72dc7148cd8765a5650575e661 Mon Sep 17 00:00:00 2001
+From: Olivier Duchateau <duchateau.olivier@gmail.com>
+Date: Sun, 22 Dec 2019 19:29:58 +0100
+Subject: [PATCH] Switch to 'locationforecast' product
+
+---
+ panel-plugin/weather.c | 8 +++++---
+ panel-plugin/weather.h | 1 +
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
+index be745b3..7d79566 100644
+--- a/panel-plugin/weather.c
++++ b/panel-plugin/weather.c
+@@ -588,6 +588,7 @@ cb_weather_update(SoupSession *session,
+ static gboolean
+ update_handler(plugin_data *data)
+ {
++ gchar *api_version = FORECAST_API;
+ gchar *url;
+ gboolean night_time;
+ time_t now_t;
+@@ -653,9 +654,10 @@ update_handler(plugin_data *data)
+ data->weather_update->started = TRUE;
+
+ /* build url */
+- url = g_strdup_printf("https://api.met.no/weatherapi"
+- "/locationforecastlts/1.3/?lat=%s&lon=%s&"
+- "msl=%d",
++ url = g_strdup_printf("https://api.met.no"
++ "/weatherapi/locationforecast/%s/"
++ "?lat=%s&lon=%s&msl=%d",
++ api_version,
+ data->lat, data->lon, data->msl);
+
+ /* start receive thread */
+diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h
+index 86629c7..2723fc4 100644
+--- a/panel-plugin/weather.h
++++ b/panel-plugin/weather.h
+@@ -31,6 +31,7 @@
+ #define MAX_FORECAST_DAYS 10
+ #define DEFAULT_FORECAST_DAYS 5
+ #define MAX_SCROLLBOX_LINES 10
++#define FORECAST_API "1.9"
+
+ G_BEGIN_DECLS
+
+--
+2.24.1
+
diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
index 209885d17..73fab2fc6 100755
--- a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
+++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfce4-weather-plugin
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -78,6 +78,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+zcat $CWD/update-met_no-API.patch.gz | patch -p1 --verbose || exit 1
+
GEONAMES_USERNAME="slackware" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \