|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/poetaster/fahrplan</param>
<param name="branch">master</param>
- <param name="revision">2.0.36</param>
+ <param name="revision">2.0.37</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2-2.0.37.tar.bz2/deployment.pri
^
|
| @@ -140,7 +140,7 @@
export(apparmor.files)
export(apparmor.path)
INSTALLS += manifestfile apparmor
- } else:exists("/usr/include/sailfishapp/sailfishapp.h") {
+ } else:exists($$[QT_INSTALL_PREFIX]/include/sailfishapp/sailfishapp.h): {
desktopfile.files = data/sailfishos/$${TARGET}.desktop
# Use different desktop file for openrepos
openrepos {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2-2.0.37.tar.bz2/fahrplan2.pro
^
|
| @@ -2,7 +2,7 @@
APP_NAME = Fahrplan
# Define Version
-VERSION = 2.0.36-1
+VERSION = 2.0.37-1
# Switch for jolla to separate harbour and openrepo version
openrepos {
@@ -26,7 +26,7 @@
DEFINES += FAHRPLAN_VERSION=\\\"$$VERSION\\\"
DEFINES += FAHRPLAN_SETTINGS_NAMESPACE=\\\"$$APP_ID\\\"
}
-exists("/usr/include/sailfishapp/sailfishapp.h"): {
+exists($$[QT_INSTALL_PREFIX]/include/sailfishapp/sailfishapp.h): {
DEFINES += FAHRPLAN_VERSION=\\\"$$VERSION\\\"
DEFINES += FAHRPLAN_SETTINGS_NAMESPACE=\\\"harbour-fahrplan2\\\"
}
@@ -323,7 +323,7 @@
QML_IMPORT_PATH = 3rdparty/bb10-qt-components/imports
}
-exists("/usr/include/sailfishapp/sailfishapp.h"): {
+exists($$[QT_INSTALL_PREFIX]/include/sailfishapp/sailfishapp.h): {
TARGET = harbour-fahrplan2
DEFINES += BUILD_FOR_SAILFISHOS
@@ -334,6 +334,7 @@
# we need additional stuff for calendar support
openrepos {
+ #PKGCONFIG += mkcal-qt5-devel kcalcore-qt5-devel
PKGCONFIG += libmkcal-qt5 libkcalcoren-qt5
INCLUDEPATH += /usr/include/mkcal-qt5 /usr/include/kcalcoren-qt5
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2-2.0.37.tar.bz2/src/parser/parser_dubai_efa.cpp
^
|
| @@ -33,7 +33,7 @@
ParserDubaiEFA::ParserDubaiEFA(QObject *parent) :
ParserEFA(parent)
{
- baseRestUrl = "http://wojhati.rta.ae/dub/";
+ baseRestUrl = "https://wojhati.rta.ae/dub/";
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2-2.0.37.tar.bz2/src/parser/parser_efa.cpp
^
|
| @@ -95,6 +95,7 @@
#include <QFile>
#include <QNetworkReply>
#include <QtCore/QUrl>
+#include <QXmlStreamReader>
#if defined(BUILD_FOR_QT5)
#include <QUrlQuery>
#endif
@@ -176,7 +177,7 @@
sendHttpRequest(uri);
- qDebug() << "search station url:" << uri;
+ //qDebug() << "search station url:" << uri;
}
void ParserEFA::getTimeTableForStation(const Station ¤tStation, const Station &, const QDateTime &dateTime, Mode mode, int)
@@ -373,6 +374,9 @@
QDomElement nameElement = nodeList.item(i).toElement();
Station item;
item.name = nameElement.text();
+ // sidney
+ if(item.name.isNull())
+ item.name = nameElement.attribute("objectName");
item.id = nameElement.attribute("stopID");
if(item.id.isNull())
item.id = nameElement.attribute("id");
@@ -380,6 +384,7 @@
item.longitude = nameElement.attribute("y").toDouble();
result << item;
+ //qDebug() << "Namelist: " << item.name ;
}
}
checkForError(&doc);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2-2.0.37.tar.bz2/src/parser/parser_ireland_efa.cpp
^
|
| @@ -35,7 +35,7 @@
ParserIrelandEFA::ParserIrelandEFA(QObject *parent) :
ParserEFA(parent)
{
- baseRestUrl = "http://www.journeyplanner.transportforireland.ie/nta/";
+ baseRestUrl = "https://www.journeyplanner.transportforireland.ie/nta/";
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2-2.0.37.tar.bz2/src/parser/parser_munich_efa.cpp
^
|
| @@ -28,7 +28,7 @@
ParserEFA(parent)
{
//baseRestUrl = "http://efa-alt.mvv-muenchen.de/mvv/";
- baseRestUrl = "http://efa.mvv-muenchen.de/mobile/";
+ baseRestUrl = "https://efa.mvv-muenchen.de/mobile/";
acceptEncoding = "gzip";
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2-2.0.37.tar.bz2/src/parser/parser_salzburg_efa.cpp
^
|
| @@ -27,7 +27,7 @@
ParserSalzburgEFA::ParserSalzburgEFA(QObject *parent) :
ParserEFA(parent)
{
- baseRestUrl = "http://efa.svv-info.at/svv/";
+ baseRestUrl = "https://efa.svv-info.at/svv/";
acceptEncoding = "gzip";
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2-2.0.37.tar.bz2/src/parser/parser_sf_bay_efa.cpp
^
|
| @@ -33,8 +33,10 @@
ParserSFBayEFA::ParserSFBayEFA(QObject *parent) :
ParserEFA(parent)
+
{
- baseRestUrl = "http://tripplanner.transit.511.org/mtc/";
+ // deprecated!
+ baseRestUrl = "https://tripplanner.transit.511.org/mtc/";
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2-2.0.37.tar.bz2/src/parser/parser_sydney_efa.cpp
^
|
| @@ -34,7 +34,8 @@
ParserSydneyEFA::ParserSydneyEFA(QObject *parent) :
ParserEFA(parent)
{
- baseRestUrl = "http://tp.transportnsw.info/nsw/";
+ baseRestUrl = "https://transportnsw.info/web/";
+ //baseRestUrl = "https://tp.transportnsw.info/nsw/";
//baseRestUrl = "http://mobile.131500.com.au/TripPlanner/mobile/";
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-fahrplan2-2.0.37.tar.bz2/src/parser/parser_xmlnri.cpp
^
|
| @@ -22,6 +22,7 @@
ParserXmlNri::ParserXmlNri(QObject *parent) :
ParserHafasXml(parent)
{
+ // new service at https://www.vy.no/se-reiseforslag
baseXmlUrl = "https://hafas.websrv05.reiseinfo.no/bin/dev/nri/query.exe";
baseSTTableUrl = "https://hafas.websrv05.reiseinfo.no/bin/dev/nri/stboard.exe/en";
baseUrl = "https://hafas.websrv05.reiseinfo.no/bin/dev/nri/query.exe";
|
