cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.8.1, some usual feature additions and bug fixes.

Browse Source 
Getting rid of most of the patches.
This commit is contained in:
sebastia 2015-05-10 16:53:19 +00:00
parent f7ecf6cee6
commit 3836ccbe46
7 changed files with 5 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
geo/qlandkartegt/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.23 2014/12/19 22:17:06 zhuk Exp $
# $OpenBSD: Makefile,v 1.24 2015/05/10 16:53:19 sebastia Exp $
COMMENT = garmin gps map management tool
DISTNAME = qlandkartegt-1.7.7
REVISION = 0
DISTNAME = qlandkartegt-1.8.1
CATEGORIES = geo x11
HOMEPAGE = http://www.qlandkarte.org/
@ -14,7 +13,7 @@ MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
PERMIT_PACKAGE_CDROM = Yes
MODULES = devel/cmake x11/qt4
WANTLIB += GL GLU ICE SM X11 Xext c m pthread stdc++ z gdal gps>=19
WANTLIB += GL GLU c m pthread stdc++ z gdal gps>=19
WANTLIB += exif QtDBus QtGui QtNetwork QtOpenGL QtSql QtXml QtCore proj
WANTLIB += QtWebKit QtXmlPatterns phonon jpeg dmtx QtScript
BUILD_DEPENDS += geo/gpsbabel

4
geo/qlandkartegt/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qlandkartegt-1.7.7.tar.gz) = Cw1lm+9YC/98aqvVY62b8M8tMkZ/4R5hPOqrWL5zY9A=
SIZE (qlandkartegt-1.7.7.tar.gz) = 6723780
SHA256 (qlandkartegt-1.8.1.tar.gz) = ngYFq49MvSd0G1B/JS8INw6czKTgXsNYeCVsWbIqm+c=
SIZE (qlandkartegt-1.8.1.tar.gz) = 6706349

14
geo/qlandkartegt/patches/patch-CMakeLists_txt
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2014/08/29 12:01:41 sebastia Exp $
do not build failing experimental feature
--- CMakeLists.txt.orig Thu Aug 28 00:18:25 2014
+++ CMakeLists.txt Thu Aug 28 00:19:56 2014
@@ -94,7 +94,6 @@ endif (NOT QK_QT5_SERIAL_PORT)
add_subdirectory(3rdparty/QZip)
add_subdirectory(3rdparty/QTextHtmlExporter)
-add_subdirectory(3rdparty/QDeviceWatcher)
add_subdirectory(3rdparty/getopt)
add_subdirectory(3rdparty/map2gcm)
add_subdirectory(3rdparty/map2rmap)

18
geo/qlandkartegt/patches/patch-src_CDeviceGarminBulk_cpp
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_CDeviceGarminBulk_cpp,v 1.1 2014/08/29 12:01:41 sebastia Exp $
do not build failing experimental feature
--- src/CDeviceGarminBulk.cpp.orig Thu Aug 28 00:21:21 2014
+++ src/CDeviceGarminBulk.cpp Thu Aug 28 00:22:01 2014
@@ -37,11 +37,9 @@
CDeviceGarminBulk::CDeviceGarminBulk(QObject * parent)
: IDevice("Garmin Mass Storage", parent)
{
- deviceWatcher = new QDeviceWatcher(this);
connect(deviceWatcher, SIGNAL(deviceAdded(QString)), SLOT(slotDevice(QString)));
connect(deviceWatcher, SIGNAL(deviceChanged(QString)), SLOT(slotDevice(QString)));
connect(deviceWatcher, SIGNAL(deviceRemoved(QString)), SLOT(slotDevice(QString)));
- deviceWatcher->start();
qDebug() << "***************************************CDeviceGarminBulk";
}

24
geo/qlandkartegt/patches/patch-src_CMakeLists_txt
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.1 2014/08/29 12:01:41 sebastia Exp $
fix includes for OpenGL
do not build failing experimental feature
--- src/CMakeLists.txt.orig Wed Aug 27 23:36:56 2014
+++ src/CMakeLists.txt Thu Aug 28 00:19:29 2014
@@ -672,7 +672,7 @@ endif(UNIX)
set(qlandkarte_include_dirs
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${OPENGL_INCLUDE_DIRS}
+ ${OPENGL_INCLUDE_DIR}
${GDAL_INCLUDE_DIRS}
${PROJ_INCLUDE_DIRS}
${QT_QTXML_INCLUDE_DIR}
@@ -800,7 +800,6 @@ set(qlandkarte_link_libs
${GPSD_LIBRARIES}
qzip
qtexthtmlexporter
- qdevicewatcher
getopt
${QTSOAP_LIBRARIES}
${PROFILING_LIBRARIES}

17
geo/qlandkartegt/patches/patch-src_CMouseMoveMap_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_CMouseMoveMap_cpp,v 1.1 2014/08/29 12:01:41 sebastia Exp $
fix crash deleting a waypoint via right mouse button
from upstream r3982
--- src/CMouseMoveMap.cpp.orig Thu Aug 28 11:56:09 2014
+++ src/CMouseMoveMap.cpp Thu Aug 28 11:56:29 2014
@@ -421,6 +421,9 @@ void CMouseMoveMap::slotDeleteWpt()
CWpt * selWpt = selWpts.first().wpt;
QString key = selWpt->getKey();
+
+ selWpts.clear();
+
CWptDB::self().delWpt(key);
}

16
geo/qlandkartegt/patches/patch-src_CWptDB_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_CWptDB_cpp,v 1.1 2014/08/29 12:01:41 sebastia Exp $
fix crash on aborting waypoint creation
from upstream r3984
--- src/CWptDB.cpp.orig Thu Aug 28 12:05:40 2014
+++ src/CWptDB.cpp Thu Aug 28 12:06:10 2014
@@ -307,7 +307,7 @@ CWpt * CWptDB::newWpt(float lon, float lat, float ele,
CDlgEditWpt dlg(*wpt,theMainWindow->getCanvas());
if(dlg.exec() == QDialog::Rejected)
{
- delete wpt;
+ wpt->deleteLater();
return 0;
}
}