|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-meecast.changes
|
| @@ -1,3 +0,0 @@
-* Wed Oct 11 2023 Mark Washeim <blueprint@poetaster.de> - 1.1.36
-- [Release] add chum meta for next release
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:meecast.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -1,7 +1,7 @@
<services>
<service name="tar_git">
- <param name="url">https://github.com/rinigus/meecast.git</param>
- <param name="branch">obs</param>
- <param name="revision">1.1.36+obs</param>
+ <param name="url">https://github.com/Meecast/meecast.git</param>
+ <param name="branch">sailfishos</param>
+ <param name="revision">v1.1.37</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-meecast-1.1.37.tar.bz2/debian/changelog
^
|
| @@ -1,3 +1,8 @@
+meecast (1.1.37) unstable; urgency=low
+ * Fixed problem with yr.no stations. The reason is incorrect work with locales #44
+
+ -- Vlad Vasiliev <vlad@gas.by> Wen, 11 Nov 2020 11:02:23 +0300
+
meecast (1.1.36) unstable; urgency=low
* Restored source yr.no
-- Vlad Vasiliev <vlad@gas.by> Wen, 11 Nov 2020 11:02:23 +0300
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-meecast-1.1.37.tar.bz2/meecast/core/core.h
^
|
| @@ -51,7 +51,7 @@
#include "databaseabstract.h"
#include "downloader.h"
-#define MEECAST_VERSION "1.1.36"
+#define MEECAST_VERSION "1.1.37"
namespace Core{
class Connection;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-meecast-1.1.37.tar.bz2/meecast/core/databasesqlite.cpp
^
|
| @@ -2,7 +2,7 @@
/*
* This file is part of Other Maemo Weather(omweather) - MeeCast
*
- * Copyright (C) 2006-2013 Vlad Vasilyeu
+ * Copyright (C) 2006-2023 Vlad Vasilyeu
* Copyright (C) 2006-2011 Pavel Fialko
* Copyright (C) 2010-2011 Tanya Makova
* for the code
@@ -520,10 +520,14 @@
return;
}
+
+
+ setlocale(LC_NUMERIC, "POSIX");
latitude = atof(result[ncol+0]);
longitude = atof(result[ncol+1]);
+ setlocale(LC_NUMERIC, "");
-/* std::cerr<<"Latitude "<< latitude << " longitude"<<longitude<<std::endl; */
+ /* std::cerr<<"Latitude "<< latitude << " longitude "<<longitude<<std::endl; */
sqlite3_free_table(result);
#ifdef DEBUGFUNCTIONCALL
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-meecast-1.1.37.tar.bz2/meecast/core/station.cpp
^
|
| @@ -2,7 +2,7 @@
/*
* This file is part of Other Maemo Weather(omweather) - MeeCast
*
- * Copyright (C) 2006-2013 Vlad Vasilyeu
+ * Copyright (C) 2006-2023 Vlad Vasilyeu
* Copyright (C) 2006-2011 Pavel Fialko
* Copyright (C) 2010-2011 Tanya Makova
* for the code
@@ -111,8 +111,10 @@
/* From 2023 Yr.no using lat lon in URL */
if (source_name=="yr.no"){
std::string part_of_url;
+ setlocale(LC_NUMERIC, "POSIX");
part_of_url = "lat=" + std::to_string(latitude) + "&" + "lon=" + std::to_string(longitude);
snprintf(forecast_url, sizeof(forecast_url)-1, url_template.c_str(), part_of_url.c_str());
+ setlocale(LC_NUMERIC, "");
}else{
snprintf(forecast_url, sizeof(forecast_url)-1, url_template.c_str(), id.c_str());
}
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-meecast-1.1.37.tar.bz2/meecast/qt-qml/harbour-meecast.desktop.for_jolla_store
^
|
| @@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=MeeCast
+Icon=harbour-meecast
+X-Nemo-Application-Type=silica-qt5
+Comment=Weather forecast for Sailfish
+Exec=harbour-meecast
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-meecast-1.1.37.tar.bz2/omweather-yr-no-stations-db/src/meego-main.cpp
^
|
| @@ -157,7 +157,6 @@
hash_for_translate = hash_description_yrno_table_create();
-
file_out = fopen(result_file, "w");
if (!file_out)
return -1;
@@ -182,6 +181,10 @@
fprintf(file_out," <h>%%</h> \n <p>mmHg</p>\n </units>\n");
fprintf(file_out," <timezone>%i</timezone>\n", localtimezone);
+ if (root.type() != Json::objectValue){
+ return -5;
+ }
+
val = root["properties"].get("timeseries", nullval);
//fprintf(stderr,"size %i\n", val.size());
|
