Update QLGT to 1.7.3,
use arc4random, License changed to GPLv3 looks good dcoppa@
This commit is contained in:
parent
873a49a078
commit
5d249f8f6c
@ -1,16 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2013/07/02 04:30:20 sebastia Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2013/09/12 16:30:59 sebastia Exp $
|
||||
|
||||
VMEM_WARNING = yes
|
||||
COMMENT = garmin gps map management tool
|
||||
|
||||
DISTNAME = qlandkartegt-1.7.0
|
||||
DISTNAME = qlandkartegt-1.7.3
|
||||
CATEGORIES = geo x11
|
||||
|
||||
HOMEPAGE = http://www.qlandkarte.org/
|
||||
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
|
||||
MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
|
||||
|
||||
# GPLv2
|
||||
# GPLv3
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
|
||||
MODULES = devel/cmake x11/qt4
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (qlandkartegt-1.7.0.tar.gz) = Tbq57QCCRkepr9MVYZ55dOF2o7R+UPN1REHmnx2+5y0=
|
||||
SIZE (qlandkartegt-1.7.0.tar.gz) = 8136806
|
||||
SHA256 (qlandkartegt-1.7.3.tar.gz) = 2/yWNvSozIhzff+MvTtBHksawXxVJRY5a1XR5oCtlTw=
|
||||
SIZE (qlandkartegt-1.7.3.tar.gz) = 8334026
|
||||
|
35
geo/qlandkartegt/patches/patch-3rdparty_map2jnx_main_cpp
Normal file
35
geo/qlandkartegt/patches/patch-3rdparty_map2jnx_main_cpp
Normal file
@ -0,0 +1,35 @@
|
||||
$OpenBSD: patch-3rdparty_map2jnx_main_cpp,v 1.1 2013/09/12 16:30:59 sebastia Exp $
|
||||
|
||||
use arc4random
|
||||
|
||||
--- 3rdparty/map2jnx/main.cpp.orig Mon Jun 17 14:27:52 2013
|
||||
+++ 3rdparty/map2jnx/main.cpp Thu Sep 12 09:09:12 2013
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
**********************************************************************************************/
|
||||
|
||||
+#include "config.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define fseeko _fseeki64
|
||||
@@ -419,14 +420,20 @@ static uint32_t scale2jnx(double scale)
|
||||
static char randChar()
|
||||
{
|
||||
char buf[2];
|
||||
+#if defined(HAVE_ARC4RANDOM)
|
||||
+ int r = (int)((arc4random() * 16.0) / UINT_MAX);
|
||||
+#else
|
||||
int r = (int)((rand() * 16.0) / RAND_MAX);
|
||||
+#endif
|
||||
sprintf(buf,"%X", r & 0x0F);
|
||||
return buf[0];
|
||||
}
|
||||
|
||||
static void createGUID(char * guid)
|
||||
{
|
||||
+#if !defined(HAVE_ARC4RANDOM)
|
||||
srand((unsigned int)time(0));
|
||||
+#endif
|
||||
|
||||
guid[0] = randChar();
|
||||
guid[1] = randChar();
|
15
geo/qlandkartegt/patches/patch-ConfigureChecks_cmake
Normal file
15
geo/qlandkartegt/patches/patch-ConfigureChecks_cmake
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-ConfigureChecks_cmake,v 1.1 2013/09/12 16:30:59 sebastia Exp $
|
||||
|
||||
use arc4random
|
||||
|
||||
--- ConfigureChecks.cmake.orig Wed Sep 11 15:08:42 2013
|
||||
+++ ConfigureChecks.cmake Wed Sep 11 15:09:18 2013
|
||||
@@ -31,6 +31,8 @@ check_include_file(byteswap.h HAVE_BYTESWAP_H)
|
||||
|
||||
test_big_endian(HAVE_BIGENDIAN)
|
||||
|
||||
+check_function_exists(arc4random HAVE_ARC4RANDOM)
|
||||
+
|
||||
# check if we're on a 64bit host
|
||||
if(CMAKE_SIZEOF_VOID_P MATCHES "8")
|
||||
SET(HOST_IS_64_BIT 1)
|
15
geo/qlandkartegt/patches/patch-config_h_cmake
Normal file
15
geo/qlandkartegt/patches/patch-config_h_cmake
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-config_h_cmake,v 1.1 2013/09/12 16:30:59 sebastia Exp $
|
||||
|
||||
use arc4random
|
||||
|
||||
--- config.h.cmake.orig Thu Sep 12 08:36:49 2013
|
||||
+++ config.h.cmake Thu Sep 12 08:37:05 2013
|
||||
@@ -19,6 +19,8 @@
|
||||
|
||||
#cmakedefine HAVE_BIGENDIAN 1
|
||||
|
||||
+#cmakedefine HAVE_ARC4RANDOM 1
|
||||
+
|
||||
/* build with native file dialogs */
|
||||
#define FILE_DIALOG_FLAGS ${FILEDIALOGFLAGS}
|
||||
|
27
geo/qlandkartegt/patches/patch-src_CTrackDB_cpp
Normal file
27
geo/qlandkartegt/patches/patch-src_CTrackDB_cpp
Normal file
@ -0,0 +1,27 @@
|
||||
$OpenBSD: patch-src_CTrackDB_cpp,v 1.1 2013/09/12 16:30:59 sebastia Exp $
|
||||
|
||||
use arc4random
|
||||
|
||||
--- src/CTrackDB.cpp.orig Wed Aug 14 19:56:40 2013
|
||||
+++ src/CTrackDB.cpp Thu Sep 12 09:08:18 2013
|
||||
@@ -16,6 +16,8 @@
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
**********************************************************************************************/
|
||||
+#include "config.h"
|
||||
+
|
||||
#include <stdio.h>
|
||||
#include <limits>
|
||||
|
||||
@@ -173,7 +175,11 @@ void CTrackDB::loadGPX(CGpx& gpx)
|
||||
hasItems = true;
|
||||
CTrack* track = new CTrack(this);
|
||||
//preset a random color
|
||||
+#if defined(HAVE_ARC4RANDOM)
|
||||
+ track->setColor((arc4random() % 13)+1);
|
||||
+#else
|
||||
track->setColor((rand() % 13)+1);
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Global track information
|
Loading…
x
Reference in New Issue
Block a user