Attachment 171075 Details for Bug 210063 – update qmapshack

[patch] update qmapshack

qmapshack_1_6_1.diff (text/plain), 6.31 KB, created by Christoph Moench-Tegeder on 2016-06-05 20:29:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Moench-Tegeder

Created: 2016-06-05 20:29:38 UTC

Size: 6.31 KB

patch

obsolete

>Index: astro/qmapshack/Makefile
>===================================================================
>--- astro/qmapshack/Makefile	(revision 416394)
>+++ astro/qmapshack/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	qmapshack
>-PORTVERSION=	1.3.1
>+PORTVERSION=	1.6.1
> CATEGORIES=	astro
> MASTER_SITES=	https://bitbucket.org/maproom/qmapshack/downloads/
> 
>@@ -11,14 +11,13 @@
> 
> LICENSE=	GPLv3
> 
>-BROKEN=		unfetchable
>-DEPRECATED=	Broken for more than 6 months
>-EXPIRATION_DATE=	2016-07-04
>-
>-LIB_DEPENDS=	libgdal.so:graphics/gdal \
>+LIB_DEPENDS=	libQt5DBus.so:devel/dbus-qt5 \
>+		libgdal.so:graphics/gdal \
>+		libproj.so:graphics/proj \
> 		libroutino.so:astro/routino
> 
> USES=		cmake desktop-file-utils
>-USE_QT5=	buildtools linguisttools qmake script sql webkit widgets xml
>+USE_QT5=	buildtools core gui linguisttools network printsupport \
>+		qmake script sql sql-sqlite3 webkit widgets xml
> 
> .include <bsd.port.mk>
>Index: astro/qmapshack/distinfo
>===================================================================
>--- astro/qmapshack/distinfo	(revision 416394)
>+++ astro/qmapshack/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (qmapshack-1.3.1.tar.gz) = 8f4bcb5454786d7f81681abe4f96cc8e3598f62219708d1efe4c94d19ab0dfea
>-SIZE (qmapshack-1.3.1.tar.gz) = 3758785
>+TIMESTAMP = 1465057676
>+SHA256 (qmapshack-1.6.1.tar.gz) = e702482ef894ec3fdbc5a932dd220bbb34eef1580b1645a314e9a3fa99956c22
>+SIZE (qmapshack-1.6.1.tar.gz) = 4538423
>Index: astro/qmapshack/files/patch-src_device_IDevice.cpp
>===================================================================
>--- astro/qmapshack/files/patch-src_device_IDevice.cpp	(nonexistent)
>+++ astro/qmapshack/files/patch-src_device_IDevice.cpp	(working copy)
>@@ -0,0 +1,29 @@
>+--- src/device/IDevice.cpp.orig	2016-06-04 19:56:45 UTC
>++++ src/device/IDevice.cpp
>+@@ -22,7 +22,7 @@
>+ #include "gis/prj/IGisProject.h"
>+ #include "helpers/CSelectCopyAction.h"
>+ 
>+-#ifdef Q_OS_LINUX
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+ #include <QtDBus>
>+ #endif
>+ 
>+@@ -52,7 +52,7 @@ IDevice::~IDevice()
>+ 
>+ void IDevice::mount(const QString& path)
>+ {
>+-#ifdef Q_OS_LINUX
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Mount");
>+     QVariantMap args;
>+     args.insert("options", "sync");
>+@@ -63,7 +63,7 @@ void IDevice::mount(const QString& path)
>+ 
>+ void IDevice::umount(const QString &path)
>+ {
>+-#ifdef Q_OS_LINUX
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Unmount");
>+     QVariantMap args;
>+     message << args;
>
>Property changes on: astro/qmapshack/files/patch-src_device_IDevice.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+URL Author Date Rev Id
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: astro/qmapshack/files/patch-src_gis_CGisListWks.cpp
>===================================================================
>--- astro/qmapshack/files/patch-src_gis_CGisListWks.cpp	(nonexistent)
>+++ astro/qmapshack/files/patch-src_gis_CGisListWks.cpp	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/gis/CGisListWks.cpp.orig	2016-06-04 19:56:53 UTC
>++++ src/gis/CGisListWks.cpp
>+@@ -18,7 +18,7 @@
>+ 
>+ #include "CMainWindow.h"
>+ #include "canvas/CCanvas.h"
>+-#ifdef Q_OS_LINUX
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+ #include "device/CDeviceWatcherLinux.h"
>+ #endif
>+ #ifdef Q_OS_WIN
>+@@ -196,7 +196,7 @@ CGisListWks::CGisListWks(QWidget *parent
>+         QTimer::singleShot(saveEvery * 60000, this, SLOT(slotSaveWorkspace()));
>+     }
>+ 
>+-#ifdef Q_OS_LINUX
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     deviceWatcher = new CDeviceWatcherLinux(this);
>+     connect(deviceWatcher, &CDeviceWatcherLinux::sigChanged, this, &CGisListWks::sigChanged);
>+ #endif
>
>Property changes on: astro/qmapshack/files/patch-src_gis_CGisListWks.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+URL Author Date Rev Id
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: astro/qmapshack/files/patch-src_setup_IAppSetup.cpp
>===================================================================
>--- astro/qmapshack/files/patch-src_setup_IAppSetup.cpp	(nonexistent)
>+++ astro/qmapshack/files/patch-src_setup_IAppSetup.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/setup/IAppSetup.cpp.orig	2016-06-04 19:55:57 UTC
>++++ src/setup/IAppSetup.cpp
>+@@ -36,7 +36,7 @@ IAppSetup* IAppSetup::getPlatformInstanc
>+     {
>+ #if defined(Q_OS_MAC)
>+         instance = new CAppSetupMac();
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+         instance = new CAppSetupLinux();
>+ #elif defined (Q_OS_WIN32)
>+         instance = new CAppSetupWin();
>
>Property changes on: astro/qmapshack/files/patch-src_setup_IAppSetup.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+URL Author Date Rev Id
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: astro/qmapshack/pkg-plist
>===================================================================
>--- astro/qmapshack/pkg-plist	(revision 416394)
>+++ astro/qmapshack/pkg-plist	(working copy)
>@@ -1,8 +1,12 @@
> bin/qmapshack
> man/man1/qmapshack.1.gz
> share/applications/qmapshack.desktop
>+share/icons/hicolor/32x32/apps/QMapShack.png
>+share/icons/hicolor/48x48/apps/QMapShack.png
>+share/icons/hicolor/scalable/apps/QMapShack.svg
> share/pixmaps/QMapShack.png
> %%DATADIR%%/translations/qmapshack_cs.qm
> %%DATADIR%%/translations/qmapshack_de.qm
> %%DATADIR%%/translations/qmapshack_es.qm
> %%DATADIR%%/translations/qmapshack_fr.qm
>+%%DATADIR%%/translations/qmapshack_nl.qm

Actions: View | Diff

Attachments on bug 210063: 171075 | 171076 | 171260