mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

sysutils/qflipper: Update to 1.3.0

Browse Source
This commit is contained in:
Kevin Bowling 2023-05-03 11:22:11 -07:00
parent bf0088e4a9
commit c2f57deb21
9 changed files with 42 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/qflipper/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= qFlipper
PORTVERSION= 1.2.2
PORTVERSION= 1.3.0
CATEGORIES= sysutils
MAINTAINER= kbowling@FreeBSD.org

6
sysutils/qflipper/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1670995165
SHA256 (flipperdevices-qFlipper-1.2.2_GH0.tar.gz) = 486543a66fcf899073972d4f081f89a709a66628d71e9412c74be0a7a1fb79a7
SIZE (flipperdevices-qFlipper-1.2.2_GH0.tar.gz) = 1285161
TIMESTAMP = 1683137023
SHA256 (flipperdevices-qFlipper-1.3.0_GH0.tar.gz) = 866d81322b184e467b366f124db66e4595150bd83258016ac773bb5ed6c87c01
SIZE (flipperdevices-qFlipper-1.3.0_GH0.tar.gz) = 1290478

4
sysutils/qflipper/files/patch-application_application.pro
View File

@ -1,6 +1,6 @@
--- application/application.pro.orig 2022-11-27 22:12:16 UTC
--- application/application.pro.orig 2023-03-27 09:51:38 UTC
+++ application/application.pro
@@ -100,8 +100,8 @@ unix:!macx {
@@ -109,8 +109,8 @@ unix:!macx {
iconfiles.files = $$PWD/assets/icons/$${TARGET}.png
iconfiles.path = $$PREFIX/share/icons/hicolor/512x512/apps

14
sysutils/qflipper/files/patch-application_applicationupdater.cpp
View File

@ -1,6 +1,6 @@
--- application/applicationupdater.cpp.orig 2022-11-27 21:54:15 UTC
--- application/applicationupdater.cpp.orig 2023-03-27 09:51:38 UTC
+++ application/applicationupdater.cpp
@@ -57,6 +57,9 @@ void ApplicationUpdater::installUpdate(const Flipper::
@@ -63,6 +63,9 @@ void ApplicationUpdater::installUpdate(const Flipper::
void ApplicationUpdater::installUpdate(const Flipper::Updates::VersionInfo &versionInfo)
{
@ -10,7 +10,7 @@
#ifdef Q_OS_WINDOWS
const auto fileInfo = versionInfo.fileInfo(QStringLiteral("installer"), QStringLiteral("windows/amd64"));
#elif defined(Q_OS_MAC)
@@ -64,7 +67,7 @@ void ApplicationUpdater::installUpdate(const Flipper::
@@ -70,7 +73,7 @@ void ApplicationUpdater::installUpdate(const Flipper::
#elif defined(Q_OS_LINUX)
const auto fileInfo = versionInfo.fileInfo(QStringLiteral("AppImage"), QStringLiteral("linux/amd64"));
#else
@ -19,15 +19,15 @@
#endif
const auto fileName = QFileInfo(fileInfo.url()).fileName();
@@ -145,6 +148,7 @@ void ApplicationUpdater::installUpdate(const Flipper::
@@ -151,6 +154,7 @@ void ApplicationUpdater::installUpdate(const Flipper::
qCWarning(CATEGORY_SELFUPDATES) << "Downloading the application update package...";
setState(State::Downloading);
setState(Downloading);
}
+#endif
}
void ApplicationUpdater::setState(State state)
@@ -207,6 +211,7 @@ bool ApplicationUpdater::performUpdate(const QString &
void ApplicationUpdater::setState(ApplicationUpdater::State state)
@@ -213,6 +217,7 @@ bool ApplicationUpdater::performUpdate(const QString &
return success;
#else

4
sysutils/qflipper/files/patch-backend_flipperzero_helper_deviceinfohelper.cpp
View File

@ -1,6 +1,6 @@
--- backend/flipperzero/helper/deviceinfohelper.cpp.orig 2022-11-28 05:07:31 UTC
--- backend/flipperzero/helper/deviceinfohelper.cpp.orig 2023-03-27 09:51:38 UTC
+++ backend/flipperzero/helper/deviceinfohelper.cpp
@@ -97,7 +97,8 @@ void VCPDeviceInfoHelper::findSerialPort()
@@ -103,7 +103,8 @@ void VCPDeviceInfoHelper::findSerialPort()
void VCPDeviceInfoHelper::findSerialPort()
{

4
sysutils/qflipper/files/patch-backend_flipperzero_protobufsession.cpp
View File

@ -1,6 +1,6 @@
--- backend/flipperzero/protobufsession.cpp.orig 2022-11-27 21:43:32 UTC
--- backend/flipperzero/protobufsession.cpp.orig 2023-03-27 09:51:38 UTC
+++ backend/flipperzero/protobufsession.cpp
@@ -426,7 +426,7 @@ const QString ProtobufSession::protobufPluginFileName(
@@ -445,7 +445,7 @@ const QString ProtobufSession::protobufPluginFileName(
return QStringLiteral("flipperproto%1.dll").arg(versionMajor);
#elif defined(Q_OS_MAC)
return QStringLiteral("libflipperproto%1.dylib").arg(versionMajor);

25
sysutils/qflipper/files/patch-cli_cli.pro
View File

@ -1,18 +1,25 @@
--- cli/cli.pro.orig 2022-11-27 06:21:50 UTC
--- cli/cli.pro.orig 2023-03-27 09:51:38 UTC
+++ cli/cli.pro
@@ -11,13 +11,13 @@ unix|win32 {
@@ -20,18 +20,18 @@ win32:!win32-g++ {
$$OUT_PWD/../dfu/libdfu.a
contains(CONFIG, static): PRE_TARGETDEPS += \
- $$OUT_PWD/../plugins/libflipperproto0.a \
- $$OUT_PWD/../3rdparty/lib3rdparty.a
+ $$OUT_PWD/../plugins/libflipperproto0.a
}
unix|win32 {
LIBS += \
- -L$$OUT_PWD/../3rdparty/ -l3rdparty \
+ -lprotobuf-nanopb \
-L$$OUT_PWD/../plugins/ -lflipperproto0 \
-L$$OUT_PWD/../backend/ -lbackend \
-L$$OUT_PWD/../dfu/ -ldfu
- -L$$OUT_PWD/../dfu/ -ldfu
+ -L$$OUT_PWD/../dfu/ -ldfu \
+ -lprotobuf-nanopb
contains(CONFIG, static): LIBS += \
- -L$$OUT_PWD/../3rdparty/ -l3rdparty \
+ -lprotobuf-nanopb \
-L$$OUT_PWD/../plugins/ -lflipperproto0
-L$$OUT_PWD/../plugins/ -lflipperproto0 \
- -L$$OUT_PWD/../3rdparty/ -l3rdparty
+ -lprotobuf-nanopb
}
win32 {

17
sysutils/qflipper/files/patch-plugins_flipperproto0_flipperproto0.pro
View File

@ -1,4 +1,4 @@
--- plugins/flipperproto0/flipperproto0.pro.orig 2022-10-03 15:15:41 UTC
--- plugins/flipperproto0/flipperproto0.pro.orig 2023-03-27 09:51:38 UTC
+++ plugins/flipperproto0/flipperproto0.pro
@@ -13,7 +13,6 @@ INCLUDEPATH += $$PWD/../protobufinterface \
VERSION = 0.0.0
@ -8,7 +8,7 @@
HEADERS += \
guirequest.h \
@@ -59,13 +58,13 @@ unix|win32 {
@@ -65,14 +64,14 @@ unix|win32 {
systemresponse.cpp
unix|win32 {
@ -18,9 +18,10 @@
DEFINES += PB_ENABLE_MALLOC
unix:!macx {
- target.path = $$PREFIX/lib/$$NAME/plugins
+ target.path = $$PREFIX/lib/qt5/plugins
} else:macx {
target.path = $$DESTDIR/../$${NAME}.app/Contents/PlugIns
} else:win32 {
!contains(CONFIG, static) {
unix:!macx {
- target.path = $$PREFIX/lib/$$NAME/plugins
+ target.path = $$PREFIX/lib/qt5/plugins
} else:macx {
target.path = $$DESTDIR/../$${NAME}.app/Contents/PlugIns
} else:win32 {

116
sysutils/qflipper/files/patch-time_t.patch
View File

@ -1,116 +0,0 @@
commit 7342af72793989b72a2a7ff80bdcaeb81dee4459
Author: Kevin Bowling <kevin.bowling@kev009.com>
Date: Tue Dec 13 22:37:47 2022 -0700
Don't use time_t for timestamps
diff --git backend/flipperzero/assetmanifest.cpp backend/flipperzero/assetmanifest.cpp
index d8c7c84..3b599d1 100644
--- backend/flipperzero/assetmanifest.cpp
+++ backend/flipperzero/assetmanifest.cpp
@@ -36,7 +36,7 @@ int AssetManifest::version() const
return m_version;
}
-time_t AssetManifest::timestamp() const
+qint64 AssetManifest::timestamp() const
{
return m_timestamp;
}
diff --git backend/flipperzero/assetmanifest.h backend/flipperzero/assetmanifest.h
index 1cb922e..8f2724e 100644
--- backend/flipperzero/assetmanifest.h
+++ backend/flipperzero/assetmanifest.h
@@ -25,7 +25,7 @@ public:
AssetManifest(const QByteArray &text);
int version() const;
- time_t timestamp() const;
+ qint64 timestamp() const;
FileNode *tree() const;
private:
@@ -36,7 +36,7 @@ private:
bool parseDirectory(const QStringList &tokens);
int m_version;
- time_t m_timestamp;
+ qint64 m_timestamp;
QSharedPointer<FileNode> m_root;
};
diff --git backend/flipperzero/factoryinfo.cpp backend/flipperzero/factoryinfo.cpp
index 25b29a5..4df59bb 100644
--- backend/flipperzero/factoryinfo.cpp
+++ backend/flipperzero/factoryinfo.cpp
@@ -204,7 +204,7 @@ void FactoryInfo::parseV2(const QByteArray &data)
m_region = (Region)otp->region;
}
-time_t FactoryInfo::date() const
+qint64 FactoryInfo::date() const
{
return m_date;
}
diff --git backend/flipperzero/factoryinfo.h backend/flipperzero/factoryinfo.h
index 8cdca86..eeaa9c3 100644
--- backend/flipperzero/factoryinfo.h
+++ backend/flipperzero/factoryinfo.h
@@ -23,7 +23,7 @@ public:
uint8_t target() const;
uint8_t body() const;
uint8_t connect() const;
- time_t date() const;
+ qint64 date() const;
const QString &name() const;
@@ -44,7 +44,7 @@ private:
uint8_t m_target;
uint8_t m_body;
uint8_t m_connect;
- time_t m_date;
+ qint64 m_date;
QString m_name;
Color m_color;
diff --git backend/flipperzero/radiomanifest.cpp backend/flipperzero/radiomanifest.cpp
index 3088955..943e176 100644
--- backend/flipperzero/radiomanifest.cpp
+++ backend/flipperzero/radiomanifest.cpp
@@ -32,7 +32,7 @@ RadioManifest::Header::Header(const QJsonValue &json)
}
if(obj.contains(QStringLiteral("timestamp"))) {
- m_timestamp = (time_t)obj.value(QStringLiteral("timestamp")).toInt();
+ m_timestamp = obj.value(QStringLiteral("timestamp")).toInt();
} else {
throw std::runtime_error("Failed to read manifest timestamp");
}
@@ -43,7 +43,7 @@ int RadioManifest::Header::version() const
return m_version;
}
-time_t RadioManifest::Header::timestamp() const
+qint64 RadioManifest::Header::timestamp() const
{
return m_timestamp;
}
diff --git backend/flipperzero/radiomanifest.h backend/flipperzero/radiomanifest.h
index f71fed4..04575bb 100644
--- backend/flipperzero/radiomanifest.h
+++ backend/flipperzero/radiomanifest.h
@@ -19,11 +19,11 @@ public:
Header(const QJsonValue &json);
int version() const;
- time_t timestamp() const;
+ qint64 timestamp() const;
private:
int m_version;
- time_t m_timestamp;
+ qint64 m_timestamp;
};
class Condition {