Update QlandkarteGT to 1.0.0 release.

No major changes, but getting rid of some patches that were accepted upstream.

OK landry@
This commit is contained in:
sebastia 2011-01-08 11:31:11 +00:00
parent 3eaef10d18
commit e642426cd3
5 changed files with 8 additions and 61 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2010/12/21 09:05:17 sebastia Exp $
# $OpenBSD: Makefile,v 1.2 2011/01/08 11:31:11 sebastia Exp $
VMEM_WARNING = yes
COMMENT = garmin gps map management tool
DISTNAME = qlandkartegt-0.20.3
DISTNAME = qlandkartegt-1.0.0
CATEGORIES = geo x11
HOMEPAGE = http://www.qlandkarte.org/
@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP = Yes
MODULES = devel/cmake x11/qt4
WANTLIB += GL GLU ICE SM X11 Xext c m pthread stdc++ z gdal gps>=19
WANTLIB += exif QtDBus QtGui QtNetwork QtOpenGL QtSql QtXml QtCore proj
WANTLIB += QtWebKit
WANTLIB += QtWebKit QtXmlPatterns phonon
LIB_DEPENDS += devel/proj \
x11/qt4 \
graphics/libexif \

View File

@ -1,5 +1,5 @@
MD5 (qlandkartegt-0.20.3.tar.gz) = jqDIWP2+CXTS1BDGW62u6g==
RMD160 (qlandkartegt-0.20.3.tar.gz) = Q25slfT4dj12n1dEg5ws0HkIMDo=
SHA1 (qlandkartegt-0.20.3.tar.gz) = cAZBioxl48UDJCVvUCdW4b1hxp8=
SHA256 (qlandkartegt-0.20.3.tar.gz) = zDRfNHOm6x5XSv7fDfMvDeqXUI2ygZPP/RkwEBdq55k=
SIZE (qlandkartegt-0.20.3.tar.gz) = 3792179
MD5 (qlandkartegt-1.0.0.tar.gz) = HcChgA+Tag+xbeQHx5KDSg==
RMD160 (qlandkartegt-1.0.0.tar.gz) = NzkkmXynBwB9qgJOOUyOAz30L54=
SHA1 (qlandkartegt-1.0.0.tar.gz) = EVI4Pc7EGz9piJe8TNH4zwtcv+k=
SHA256 (qlandkartegt-1.0.0.tar.gz) = AL/rJQRn5Ms8rmd11wFc/JoEBEey+YoCQfqhlPiwBEU=
SIZE (qlandkartegt-1.0.0.tar.gz) = 3799397

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_CDlgProjWizzard_cpp,v 1.1.1.1 2010/12/21 09:05:17 sebastia Exp $
rename structure, due to name clash with gdal
--- src/CDlgProjWizzard.cpp.orig Thu Dec 9 15:00:02 2010
+++ src/CDlgProjWizzard.cpp Thu Dec 9 15:00:33 2010
@@ -39,7 +39,7 @@ CDlgProjWizzard::CDlgProjWizzard(QLineEdit& line, QWid
mitab_entry_t entry;
QList<mitab_entry_t> list;
int idx = 0;
- const MapInfoDatumInfo * di = asDatumInfoList;
+ const MapInfoDatumInfo * di = asDatumInfoListQL;
while(di->nMapInfoDatumID != -1)
{
@@ -99,7 +99,7 @@ void CDlgProjWizzard::slotChange()
}
int idx = comboDatum->itemData(comboDatum->currentIndex()).toInt();
- const MapInfoDatumInfo di = asDatumInfoList[idx];
+ const MapInfoDatumInfo di = asDatumInfoListQL[idx];
if(di.pszOGCDatumName != QString(""))
{
const MapInfoSpheroidInfo * si = asSpheroidInfoList;

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_mitab_cpp,v 1.1.1.1 2010/12/21 09:05:17 sebastia Exp $
rename structure, due to name clash with gdal
--- src/mitab.cpp.orig Mon Dec 6 20:22:16 2010
+++ src/mitab.cpp Thu Dec 9 14:59:13 2010
@@ -18,7 +18,7 @@
**********************************************************************************************/
#include "mitab.h"
-const MapInfoDatumInfo asDatumInfoList[] =
+const MapInfoDatumInfo asDatumInfoListQL[] =
{
{ // Datum ignore

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_mitab_h,v 1.1.1.1 2010/12/21 09:05:17 sebastia Exp $
rename structure, due to name clash with gdal
--- src/mitab.h.orig Thu Dec 9 14:59:26 2010
+++ src/mitab.h Thu Dec 9 15:00:55 2010
@@ -42,6 +42,6 @@ struct MapInfoSpheroidInfo
double dfInvFlattening; /* Inverse flattening */
};
-extern const MapInfoDatumInfo asDatumInfoList[];
+extern const MapInfoDatumInfo asDatumInfoListQL[];
extern const MapInfoSpheroidInfo asSpheroidInfoList[];
#endif //MITAB_H