diff --git a/.checkpackageignore b/.checkpackageignore index 2a09961f74..e5706e2afa 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -977,7 +977,6 @@ package/unifdef/0001-Makefile-fix-error-on-install.patch lib_patch.Upstream package/unscd/S46unscd Shellcheck lib_sysv.Indent lib_sysv.Variables package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch lib_patch.Upstream package/upmpdcli/S99upmpdcli Shellcheck lib_sysv.Indent lib_sysv.Variables -package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch lib_patch.Upstream package/urg/0001-select-h.patch lib_patch.Upstream package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch lib_patch.Upstream package/usb_modeswitch/0001-fix-systemd-detection.patch lib_patch.Upstream diff --git a/package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch b/package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch deleted file mode 100644 index e2199228b9..0000000000 --- a/package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 63ab887be90c7fe37d537ea75e60eb95d6d87d3f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 5 Mar 2023 22:08:13 +0100 -Subject: [PATCH] uqmi: avoid gcc-12.x false error reporting (storing the - address of local variable 'complete' in '*req.complete') - -Avoid gcc-12.x false error reporting (req->complete is later reset to NULL -in case of use of local complete): - - dev.c:217:23: error: storing the address of local variable 'complete' in '*req.complete' [-Werror=dangling-pointer=] - 217 | req->complete = &complete; - | ~~~~~~~~~~~~~~^~~~~~~~~~~ - -Signed-off-by: Peter Seiderer -[Upstream: http://lists.openwrt.org/pipermail/openwrt-devel/2023-March/040667.html] -Signed-off-by: Peter Seiderer ---- -Changes v1 -> v2: - - apply pragma ignored only for gcc >= 12.x (as the warning - '-Wdangling-pointer' was introduced with gcc-12.x) ---- - dev.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/dev.c b/dev.c -index bd10207..dbd42d4 100644 ---- a/dev.c -+++ b/dev.c -@@ -203,6 +203,15 @@ void qmi_request_cancel(struct qmi_dev *qmi, struct qmi_request *req) - __qmi_request_complete(qmi, req, NULL); - } - -+/* avoid gcc-12.x false error reporting: -+ * dev.c:217:23: error: storing the address of local variable ‘complete’ in ‘*req.complete’ [-Werror=dangling-pointer=] -+ * 217 | req->complete = &complete; -+ * | ~~~~~~~~~~~~~~^~~~~~~~~~~ -+ */ -+#if __GNUC__ >= 12 -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wdangling-pointer" -+#endif - int qmi_request_wait(struct qmi_dev *qmi, struct qmi_request *req) - { - bool complete = false; -@@ -231,6 +240,9 @@ int qmi_request_wait(struct qmi_dev *qmi, struct qmi_request *req) - - return req->ret; - } -+#if __GNUC__ >= 12 -+#pragma GCC diagnostic pop -+#endif - - struct qmi_connect_request { - struct qmi_request req; --- -2.39.2 - diff --git a/package/uqmi/uqmi.hash b/package/uqmi/uqmi.hash index 3277b17645..cae2a08b02 100644 --- a/package/uqmi/uqmi.hash +++ b/package/uqmi/uqmi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ecec1ab5a9cf91e54d29496d6793ce5821246261b99c743126899fcf9837af48 uqmi-0a19b5b77140465c29e2afa7d611fe93abc9672f-git4.tar.gz -sha256 a69bf44dbff15d727578d2069a654d60e9034c5e2cc3e199a012e72afef6c259 main.c +sha256 ff4850ca3c1517ac79614a39fdb47560c99f1159163e96e1f5037bf5507756c6 uqmi-7914da43cddaaf6cfba116260c81e6e9adffd5ab-git4.tar.gz +sha256 a69bf44dbff15d727578d2069a654d60e9034c5e2cc3e199a012e72afef6c259 uqmi/uqmi.c diff --git a/package/uqmi/uqmi.mk b/package/uqmi/uqmi.mk index f20c3f5141..5cb9ebde43 100644 --- a/package/uqmi/uqmi.mk +++ b/package/uqmi/uqmi.mk @@ -4,11 +4,11 @@ # ################################################################################ -UQMI_VERSION = 0a19b5b77140465c29e2afa7d611fe93abc9672f +UQMI_VERSION = 7914da43cddaaf6cfba116260c81e6e9adffd5ab UQMI_SITE = https://git.openwrt.org/project/uqmi.git UQMI_SITE_METHOD = git UQMI_LICENSE = LGPL-2.0+ -UQMI_LICENSE_FILES = main.c +UQMI_LICENSE_FILES = uqmi/uqmi.c UQMI_DEPENDENCIES = json-c libubox $(eval $(cmake-package))