From nobody Tue Aug 1 18:49:31 2023 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 4RFkgB4MLnz4pjdR; Tue, 1 Aug 2023 18:49:32 +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 4RFkfz6hF6z4Wxv; Tue, 1 Aug 2023 18:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690915772; 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=9Pz2ib+sVyVMsTa+6tdw5XeiBaIhylCOxM9zqVfzc/M=; b=nXDEi0Zp3Lv3BwS3O5Oe2XHWxI/Uu+uib2I69QZKyDm495O40kXdJffbepQ4+N87j+AKHg 6tC71rQ4/ZI+tdkshibVqS9Ufb+KnnPuIVInU2QsPs8Csr89pbamxH0hhr18UXVgXkH0RL bCiiIl4SDe2XPLihYvA7d79VCi2n6xQXa/vkT09ymAksX7exyAu8Th6cavR7WkpMgl1IvV XMgtEt+6rW67UDjQILKCKSkFbQw8Fvh+6SppSuhxIomjN1MEA7OIShErOsxHpxhh+gB5Ld o3DEw6PfS3PaF/k05Q/g8+ntg4mYl8VuNYpoQKvxMBFKIxigsL1G2NDec7otgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690915772; a=rsa-sha256; cv=none; b=PM68nQFF8OI3PdP1vouZeAC1HxkDpwtMAT5nfWSIAbvtqLbvH3GRxDFUyF57KS7p2GonFA 85bpu8mpitAoDnvA+zcQjzcP7XEsaxm9eVkhPJzScNhhEx/efOU5gX9BB4dO97t6QL85wf W6B6Nyn7KdsnQxqDIhR/Sid2f4XsjRUR0K6ta9P3eEqJb6ErJdGSOIDxNvHwdrwPky6vUB LAnmMLiRoZWckrLK7e9i9IJBfKcxFQq6263w8MJLl8yCOLg+LR8anhCgUdyaLFVUz7GejD Kair2RWexyfj6WrIpsUNnB9W1D0pSCfmf/Ge9iQFh2r0D1gOeIp9O3u4RS4IIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690915772; 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=9Pz2ib+sVyVMsTa+6tdw5XeiBaIhylCOxM9zqVfzc/M=; b=A4tDcibMPu9JVo/bBhMkGjhdY8L+kH2dQp3JbJ+W7zmpJjFWtD/aTgf89ud0CFHtaINGsW aso/W/X9V5M3s7LDsEEq0I/OY5v/pVzVcHWpQMWRLFMHZWrvhP4twDld9CENE+sbn89tLA XBdEiQu3Zlj1WZTYj8gTpTqgs6zFtVf6U5r53JeTpKDeDIPkyHKMYDOCXkk1/BmuoGrV91 VG1PpaNj03q7X9st1jcWDpE9UeGlxiquE97oHHUZrKYTfa0d0EYgHL8A0VEVO5e/orqhEX 44ZKfqlmmcEhzjKuGWWLdC64wIYrFlHF9k+1CnAjM/uXEs9Vw+67TH9Etce7Kw== 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 4RFkfz5YTLzpD3; Tue, 1 Aug 2023 18:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371InVB5079270; Tue, 1 Aug 2023 18:49:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371InVS8079269; Tue, 1 Aug 2023 18:49:31 GMT (envelope-from git) Date: Tue, 1 Aug 2023 18:49:31 GMT Message-Id: <202308011849.371InVS8079269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: bd6acab37559 - main - astro/qmapshack: Update version 1.16.1=>1.17.0 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd6acab3755914e88e576491227f3ff86127d2cd Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd6acab3755914e88e576491227f3ff86127d2cd commit bd6acab3755914e88e576491227f3ff86127d2cd Author: Muhammad Moinur Rahman AuthorDate: 2023-08-01 17:30:44 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-01 18:49:12 +0000 astro/qmapshack: Update version 1.16.1=>1.17.0 - Refresh patches Changelog: https://github.com/Maproom/qmapshack/releases/tag/V_1.17.0 --- astro/qmapshack/Makefile | 3 +-- astro/qmapshack/distinfo | 6 +++--- astro/qmapshack/files/patch-CMakeLists.txt | 4 ++-- .../files/patch-src_qmapshack_CMakeLists.txt | 4 ++-- ...ch-src_qmapshack_device_CDeviceWatcherLinux.cpp | 22 +++++++++++----------- ...te_router_brouter_CRouterBRouterSetupWizard.cpp | 10 +++++----- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile index 66c3f1fdd035..b85a4d2ee5af 100644 --- a/astro/qmapshack/Makefile +++ b/astro/qmapshack/Makefile @@ -1,6 +1,5 @@ PORTNAME= qmapshack -PORTVERSION= 1.16.1 -PORTREVISION= 10 +PORTVERSION= 1.17.0 DISTVERSIONPREFIX= V_ CATEGORIES= astro diff --git a/astro/qmapshack/distinfo b/astro/qmapshack/distinfo index 477925a2533d..25a2fefe45ff 100644 --- a/astro/qmapshack/distinfo +++ b/astro/qmapshack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639169100 -SHA256 (Maproom-qmapshack-V_1.16.1_GH0.tar.gz) = b407c0710c77e87c9c1f9e1e0d9d6b9055b28dda41b77f9c69ca10a9a6f4e0d5 -SIZE (Maproom-qmapshack-V_1.16.1_GH0.tar.gz) = 54433326 +TIMESTAMP = 1690898633 +SHA256 (Maproom-qmapshack-V_1.17.0_GH0.tar.gz) = 6a5ab283fa82a3405653ce99c49f10018eff177b24917ba3a9193d2f9728d2e8 +SIZE (Maproom-qmapshack-V_1.17.0_GH0.tar.gz) = 56693181 diff --git a/astro/qmapshack/files/patch-CMakeLists.txt b/astro/qmapshack/files/patch-CMakeLists.txt index a7ddfc23540e..1425b5d86060 100644 --- a/astro/qmapshack/files/patch-CMakeLists.txt +++ b/astro/qmapshack/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2021-05-24 09:18:08 UTC +--- CMakeLists.txt.orig 2023-07-20 14:13:59 UTC +++ CMakeLists.txt @@ -47,6 +47,7 @@ include(TranslateDesktop) include(DefineCMakeDefaults) @@ -8,7 +8,7 @@ include(CPackConfig.cmake) include(ConfigureChecks.cmake) -@@ -151,7 +152,10 @@ find_package(Qt5WebEngineWidgets REQUIRED) +@@ -185,7 +186,10 @@ find_package(Qt5WebEngineWidgets REQUIRED) find_package(Qt5Qml REQUIRED) find_package(Qt5Help REQUIRED) find_package(GDAL REQUIRED) diff --git a/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt b/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt index 7a8e1fbaaac0..85e491ba02cc 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt +++ b/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/qmapshack/CMakeLists.txt.orig 2021-05-24 14:06:57 UTC +--- src/qmapshack/CMakeLists.txt.orig 2023-07-20 14:13:59 UTC +++ src/qmapshack/CMakeLists.txt -@@ -971,7 +971,7 @@ target_link_libraries(${APPLICATION_NAME} +@@ -993,7 +993,7 @@ target_link_libraries(${APPLICATION_NAME} Qt5::Help ${DBUS_LIB} ${GDAL_LIBRARIES} diff --git a/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp b/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp index 551da113e187..349802a14a16 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp @@ -1,13 +1,13 @@ ---- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2023-07-20 14:13:59 UTC +++ src/qmapshack/device/CDeviceWatcherLinux.cpp -@@ -58,6 +58,10 @@ void CDeviceWatcherLinux::slotDeviceAdded(const QDBusO - // create path of to drive the block device belongs to - QDBusInterface* blockIface = new QDBusInterface("org.freedesktop.UDisks2", path.path(), "org.freedesktop.UDisks2.Block", QDBusConnection::systemBus(), this); - QDBusObjectPath drive_object = blockIface->property("Drive").value(); -+ if(drive_object.path() == nullptr) -+ { -+ return; -+ } - QString idLabel = blockIface->property("IdLabel").toString().toUpper(); +@@ -47,6 +47,10 @@ void CDeviceWatcherLinux::slotDeviceAdded(const QDBusO + QDBusInterface* blockIface = new QDBusInterface("org.freedesktop.UDisks2", path.path(), + "org.freedesktop.UDisks2.Block", QDBusConnection::systemBus(), this); + QDBusObjectPath drive_object = blockIface->property("Drive").value(); ++ if(drive_object.path() == nullptr) ++ { ++ return; ++ } + QString idLabel = blockIface->property("IdLabel").toString().toUpper(); - // read vendor string attached to drive + // read vendor string attached to drive diff --git a/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp b/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp index 1848e32dd13e..0458ce5709f1 100644 --- a/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp +++ b/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp @@ -1,11 +1,11 @@ ---- src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp.orig 2021-05-24 09:18:08 UTC +--- src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp.orig 2023-07-20 14:13:59 UTC +++ src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp -@@ -24,7 +24,7 @@ - #include "helpers/CWebPage.h" - #include "setup/IAppSetup.h" +@@ -18,7 +18,7 @@ + + #include "gis/rte/router/brouter/CRouterBRouterSetupWizard.h" -#include +#include + #include #include - #include