From owner-svn-ports-all@freebsd.org Sat Nov 23 16:25:10 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E37271B9502; Sat, 23 Nov 2019 16:25:10 +0000 (UTC) (envelope-from bofh@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47KzD65nX5z4DmF; Sat, 23 Nov 2019 16:25:10 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB2F1E984; Sat, 23 Nov 2019 16:25:10 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xANGPAne035795; Sat, 23 Nov 2019 16:25:10 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xANGP9FX035791; Sat, 23 Nov 2019 16:25:09 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <201911231625.xANGP9FX035791@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Sat, 23 Nov 2019 16:25:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518253 - in head/astro/qmapshack: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bofh X-SVN-Commit-Paths: in head/astro/qmapshack: . files X-SVN-Commit-Revision: 518253 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Nov 2019 16:25:11 -0000 Author: bofh Date: Sat Nov 23 16:25:09 2019 New Revision: 518253 URL: https://svnweb.freebsd.org/changeset/ports/518253 Log: astro/qmapshack: UNBREAK and Update version 1.13.0=>1.14.0 - Change MASTER_SITES to GITHUB - Update WWW in pkg-descr - Fix USES - Prevent a crash when not getting info on devices back from dbus (this happens when an nvme device (nvd*) is installed in the system, bsdisks doesn't handle these yet). (already reported upstream). PR: 241647 Submitted by: cmt MFH: 2019Q4 (runtime fix) Relnotes: https://github.com/Maproom/qmapshack/releases Modified: head/astro/qmapshack/Makefile head/astro/qmapshack/distinfo head/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp head/astro/qmapshack/pkg-descr Modified: head/astro/qmapshack/Makefile ============================================================================== --- head/astro/qmapshack/Makefile Sat Nov 23 16:24:59 2019 (r518252) +++ head/astro/qmapshack/Makefile Sat Nov 23 16:25:09 2019 (r518253) @@ -2,16 +2,13 @@ # $FreeBSD$ PORTNAME= qmapshack -PORTVERSION= 1.13.0 -PORTREVISION= 2 +PORTVERSION= 1.14.0 +DISTVERSIONPREFIX= V_ CATEGORIES= astro -MASTER_SITES= https://bitbucket.org/maproom/qmapshack/downloads/ MAINTAINER= bofh@FreeBSD.org COMMENT= Ultimate outdoor aficionado's tool -BROKEN= unfetchable - LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE @@ -21,9 +18,13 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \ libroutino.so:astro/routino RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks -USES= cmake compiler:c++11-lib desktop-file-utils jpeg pkgconfig qt:5 +USES= cmake compiler:c++11-lib desktop-file-utils gl jpeg \ + pkgconfig qt:5 xorg USE_QT= buildtools core dbus declarative gui linguisttools location network \ printsupport qmake sql sql-sqlite3 uitools \ webchannel webengine widgets xml +USE_GL= gl +USE_GITHUB= yes +GH_ACCOUNT= Maproom .include Modified: head/astro/qmapshack/distinfo ============================================================================== --- head/astro/qmapshack/distinfo Sat Nov 23 16:24:59 2019 (r518252) +++ head/astro/qmapshack/distinfo Sat Nov 23 16:25:09 2019 (r518253) @@ -1,3 +1,3 @@ -TIMESTAMP = 1554993320 -SHA256 (qmapshack-1.13.0.tar.gz) = 6a658f9188cd96ec53bd051cf475256b4bacc4a76a7043c5f478a38cc27161b3 -SIZE (qmapshack-1.13.0.tar.gz) = 12323773 +TIMESTAMP = 1574525969 +SHA256 (Maproom-qmapshack-V_1.14.0_GH0.tar.gz) = fd50f335b741087ab228ce4f8f45e386562eb128aea84298a1bdcfd299126576 +SIZE (Maproom-qmapshack-V_1.14.0_GH0.tar.gz) = 12541988 Modified: head/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp ============================================================================== --- head/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp Sat Nov 23 16:24:59 2019 (r518252) +++ head/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp Sat Nov 23 16:25:09 2019 (r518253) @@ -1,13 +1,13 @@ ---- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2019-04-20 21:33:23.749597000 +0200 -+++ src/qmapshack/device/CDeviceWatcherLinux.cpp 2019-04-20 21:34:05.021101000 +0200 -@@ -174,7 +174,9 @@ - #if defined(Q_OS_FREEBSD) - for(const QVariant &arg : reply.arguments()) - { -- points.append(arg.value().variant().value().first()); -+ if(!arg.value().variant().value().isEmpty()) { -+ points.append(arg.value().variant().value().first()); -+ } - } - #else - QList list; +--- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2019-11-01 16:47:46 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(); + + // read vendor string attached to drive Modified: head/astro/qmapshack/pkg-descr ============================================================================== --- head/astro/qmapshack/pkg-descr Sat Nov 23 16:24:59 2019 (r518252) +++ head/astro/qmapshack/pkg-descr Sat Nov 23 16:25:09 2019 (r518253) @@ -1,6 +1,6 @@ -Use QMapShack to plan your next outdoor trip or to visualize and archive all the -GPS recordings of your past exciting adventures. QMapShack is the next +Use QMapShack to plan your next outdoor trip or to visualize and archive all +the GPS recordings of your past exciting adventures. QMapShack is the next generation of the famous QLandkarte GT application. And of course it's even better and easier to use. -WWW: https://bitbucket.org/maproom/qmapshack +WWW: https://github.com/Maproom/qmapshack/