From nobody Wed Dec 14 05:45:05 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NX4816MWQz4kv5f; Wed, 14 Dec 2022 05:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NX4815wXfz3Mqv; Wed, 14 Dec 2022 05:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670996705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qYpgVf08HcOMzvOW8xh1+EEstAMVOYt/qCvkJKjpLM=; b=NmLWMOytXpH2j24sP+dAKpBZP7XTdZwnZP2oHcFDI/XT+WrZAfurigGHLOmapcy1pGg6Bs GbE6yHrrHJsKRH20Ld7anv0hvsO+GbZNp4WFZEBFDULxqeNYP/HjMrrQH+KWt4TLlbyk2A bw8tKOS7Pd4u1oMsi/xwmMt3J9bH93XoN8WJbrXVrBJe+H7gqwjLcW30s+N3x7Ir/q0ooE RZUqiALxVPuPQG2VNCmuRpnAnwriA1QI3JFlkTrotQqxMSulkWdQKSY/yDOIQdtkBmfSK3 6uYFZiyXPQEnZBAcx37P4JLtM55oKRvIJ7NNMZ52J2Z+MQGLon4tRkEeOSjA3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670996705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qYpgVf08HcOMzvOW8xh1+EEstAMVOYt/qCvkJKjpLM=; b=jG/Nc7xGLvpfRkFkWlRUxQ9h6PFVNTCHEps21fOu4mOssSh3JlkkzLWsvq7dmNGQnyh844 HeZjsji7MT9ts6z/3zFUnOqfbizs+1pRSSQQv2siGKTq9PVPiGCeItDcC2TISE94uFW3+S MfFSYflFcLp3+YgG5LKbBMy/94bvYdQvgkqcsIRZfweKG+nQu4hKJMVRIo97BDjYte8JOF OCymz7p+YZS+9DWdVfZDm8o8FUWbR78G5rAoaQvdvTOrwZ0pxepk/WuUIpT2yoFHNExd2g Y9nisyA4db4kZtv6V9byRFtJjfNbliB1FounYtenpRl64taiVgs10Ufj3bmAwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670996705; a=rsa-sha256; cv=none; b=PMV8gW09fWJ76uiCLNd/23LFK9Pq8twtJFWqPKoQcwSxrS5DPvCVHU9rr9tlcLKNLSja0Y iTCzfEr+PvFImdclW/sJzng1jwVUP51YQCe62Jeidlkb6ipm0v3a0QdbM8MwB7WXlv+COh COqYhORjnaOcvXerPBiV819AMNlVeTWnne6Lbq9Y4j/OsEBMXG45uO1LfbyKiH13JVVbqR gvIRXXfWyXH/WToVPUwyOw2JhrqdLMLEvAVkA8RXzP1zYbANeg62D6i8KlBwQ2KgJwh+zd ys6ZLJ74fEaKWL2rcJTo41cEcwsEwz1BBnmcWqGPbnMbmI9A003ulSgWi2TzyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NX4814zZQzj6v; Wed, 14 Dec 2022 05:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BE5j5cR033771; Wed, 14 Dec 2022 05:45:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BE5j5iL033770; Wed, 14 Dec 2022 05:45:05 GMT (envelope-from git) Date: Wed, 14 Dec 2022 05:45:05 GMT Message-Id: <202212140545.2BE5j5iL033770@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 9b662bcfee88 - main - sysutils/qflipper: Update to 1.2.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b662bcfee88f092459180035ac52e486a3b2f11 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b662bcfee88f092459180035ac52e486a3b2f11 commit 9b662bcfee88f092459180035ac52e486a3b2f11 Author: Kevin Bowling AuthorDate: 2022-12-14 05:44:01 +0000 Commit: Kevin Bowling CommitDate: 2022-12-14 05:44:46 +0000 sysutils/qflipper: Update to 1.2.2 Also fix build on x86 --- sysutils/qflipper/Makefile | 2 +- sysutils/qflipper/distinfo | 6 +- .../files/patch-dfu_device_stm32wb55_infotable.h | 10 -- sysutils/qflipper/files/patch-time_t.patch | 116 +++++++++++++++++++++ 4 files changed, 120 insertions(+), 14 deletions(-) diff --git a/sysutils/qflipper/Makefile b/sysutils/qflipper/Makefile index 93b2a4242abc..44a771d67a29 100644 --- a/sysutils/qflipper/Makefile +++ b/sysutils/qflipper/Makefile @@ -1,5 +1,5 @@ PORTNAME= qFlipper -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= sysutils MAINTAINER= kbowling@FreeBSD.org diff --git a/sysutils/qflipper/distinfo b/sysutils/qflipper/distinfo index d4d1e2f3e2a7..1e86227c8612 100644 --- a/sysutils/qflipper/distinfo +++ b/sysutils/qflipper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669525166 -SHA256 (flipperdevices-qFlipper-1.2.1_GH0.tar.gz) = 3780c77c09e3837e01af8bdc12ea55e052b2f540812736421224112e66a06f00 -SIZE (flipperdevices-qFlipper-1.2.1_GH0.tar.gz) = 1282416 +TIMESTAMP = 1670995165 +SHA256 (flipperdevices-qFlipper-1.2.2_GH0.tar.gz) = 486543a66fcf899073972d4f081f89a709a66628d71e9412c74be0a7a1fb79a7 +SIZE (flipperdevices-qFlipper-1.2.2_GH0.tar.gz) = 1285161 diff --git a/sysutils/qflipper/files/patch-dfu_device_stm32wb55_infotable.h b/sysutils/qflipper/files/patch-dfu_device_stm32wb55_infotable.h deleted file mode 100644 index 9e22d3f21fe9..000000000000 --- a/sysutils/qflipper/files/patch-dfu_device_stm32wb55_infotable.h +++ /dev/null @@ -1,10 +0,0 @@ ---- dfu/device/stm32wb55/infotable.h.orig 2022-11-27 21:57:44 UTC -+++ dfu/device/stm32wb55/infotable.h -@@ -52,6 +52,7 @@ struct FUSDeviceInfoTable - uint32_t reserved2; - uint64_t UID64; - uint16_t deviceID; -+ uint32_t padding_ /* padding for 32 bit build */; - }; - - struct DeviceInfoTable { diff --git a/sysutils/qflipper/files/patch-time_t.patch b/sysutils/qflipper/files/patch-time_t.patch new file mode 100644 index 000000000000..4deeea6f36e2 --- /dev/null +++ b/sysutils/qflipper/files/patch-time_t.patch @@ -0,0 +1,116 @@ +commit 7342af72793989b72a2a7ff80bdcaeb81dee4459 +Author: Kevin Bowling +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 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 {