Attachment 122556 Details for Bug 165767 – merkaartor-0.18.a.patch

[patch] merkaartor-0.18.a.patch

merkaartor-0.18.a.patch (text/x-patch; charset="UTF-8"), 4.55 KB, created by Oliver Heesakkers on 2012-03-06 14:04:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Heesakkers

Created: 2012-03-06 14:04:34 UTC

Size: 4.55 KB

patch

obsolete

>diff -ruN merkaartor.orig/Makefile merkaartor/Makefile
>--- merkaartor.orig/Makefile	2012-01-21 01:47:16.000000000 +0100
>+++ merkaartor/Makefile	2012-03-06 14:55:17.000000000 +0100
>@@ -6,17 +6,17 @@
> #
> 
> PORTNAME=	merkaartor
>-PORTVERSION=	0.17.2
>-PORTREVISION=	2
>+PORTVERSION=	0.18.a
> CATEGORIES=	astro
>-MASTER_SITES=	http://www.merkaartor.be/attachments/download/253/
>+MASTER_SITES=	https://secure.ohos.nl/downloads/
> 
> MAINTAINER=	dev2@heesakkers.info
> COMMENT=	An openstreetmap mapping program
> 
> LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
>+LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
>+		proj:${PORTSDIR}/graphics/proj
> 
> USE_BZIP2=	yes
> USE_LDCONFIG=	yes
>@@ -33,8 +33,6 @@
> QMAKEFLAGS=	PREFIX=${PREFIX}
> 
> OPTIONS=	GEOIMAGE "Enable geotagged images (needs exiv2)" on\
>-		GDAL     "Use the Geospatial Data Abstraction Library" on\
>-		PROJ     "Use the Cartographic Projections Library" on\
> 		ZBAR     "Read barcodes from walking papers" off\
> 		DEBUG    "Enable debugging and verbose logging" off
> 
>@@ -45,26 +43,13 @@
> LIB_DEPENDS+=	exiv2.10:${PORTSDIR}/graphics/exiv2
> .endif
> 
>-.if defined(WITH_GDAL)
>-QMAKEFLAGS+=	GDAL=1
>-LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
>-PLIST_SUB+=	GDAL=""
>-.else
>-PLIST_SUB+=	GDAL="@comment "
>-.endif
>-
>-.if defined(WITH_PROJ)
>-QMAKEFLAGS+=	PROJ=1
>-LIB_DEPENDS+=	proj:${PORTSDIR}/graphics/proj
>-.endif
>-
> .if defined(WITH_ZBAR)
> QMAKEFLAGS+=	ZBAR=1
> LIB_DEPENDS+=	zbar:${PORTSDIR}/graphics/zbar
> .endif
> 
> .if !defined(WITH_DEBUG)
>-QMAKEFLAGS+=	RELEASE=1 NODEBUG=1
>+QMAKEFLAGS+=	NODEBUG=1
> .endif
> 
> .if defined(WITHOUT_NLS)
>diff -ruN merkaartor.orig/distinfo merkaartor/distinfo
>--- merkaartor.orig/distinfo	2011-02-12 13:50:56.000000000 +0100
>+++ merkaartor/distinfo	2012-03-06 14:48:12.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (merkaartor-0.17.2.tar.bz2) = 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a
>-SIZE (merkaartor-0.17.2.tar.bz2) = 7138991
>+SHA256 (merkaartor-0.18.a.tar.bz2) = 10c7d132e243f7ce789b33dfcb163d169ef102b925ea97e6e1cc982a27bcff0d
>+SIZE (merkaartor-0.18.a.tar.bz2) = 5537190
>diff -ruN merkaartor.orig/files/patch-src__Config.pri merkaartor/files/patch-src__Config.pri
>--- merkaartor.orig/files/patch-src__Config.pri	1970-01-01 01:00:00.000000000 +0100
>+++ merkaartor/files/patch-src__Config.pri	2012-03-05 23:22:54.000000000 +0100
>@@ -0,0 +1,10 @@
>+--- ./src/Config.pri.orig	2012-03-05 23:22:23.000000000 +0100
>++++ ./src/Config.pri	2012-03-05 23:22:47.000000000 +0100
>+@@ -13,6 +13,7 @@
>+         REVISION="-git"
>+     }
>+ }
>++REVISION="-dev"
>+ 
>+ win32|macx {
>+     system(echo $${LITERAL_HASH}define SVNREV $${SVNREV} > revision.h )
>diff -ruN merkaartor.orig/files/patch-src__Sync__DownloadOSM.cpp merkaartor/files/patch-src__Sync__DownloadOSM.cpp
>--- merkaartor.orig/files/patch-src__Sync__DownloadOSM.cpp	2011-07-03 17:49:55.000000000 +0200
>+++ merkaartor/files/patch-src__Sync__DownloadOSM.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- ./src/Sync/DownloadOSM.cpp.orig	2011-06-28 02:32:00.000000000 +0200
>-+++ ./src/Sync/DownloadOSM.cpp	2011-06-28 02:33:10.000000000 +0200
>-@@ -252,7 +252,7 @@
>- 
>-     QString sReq = url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority);
>-     QHttpRequestHeader Header(Method,sReq);
>--    Header.setValue("Host",url.host()+':'+url.port(80));
>-+    Header.setValue("Host",url.host()+':'+QString::number(url.port(80)));
>-     Header.setValue("User-Agent", USER_AGENT);
>- 
>-     QString auth = QString("%1:%2").arg(User).arg(Password);
>diff -ruN merkaartor.orig/pkg-plist merkaartor/pkg-plist
>--- merkaartor.orig/pkg-plist	2011-04-12 10:24:31.000000000 +0200
>+++ merkaartor/pkg-plist	2012-03-06 14:38:58.000000000 +0100
>@@ -4,8 +4,8 @@
> lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so
> lib/merkaartor/plugins/background/libMCadastreFranceBackgroundPlugin.so
> lib/merkaartor/plugins/background/libMMsBingMapBackgroundPlugin.so
>-%%GDAL%%lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so
>-%%GDAL%%lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so
>+lib/merkaartor/plugins/background/libMGdalBackgroundPlugin.so
>+lib/merkaartor/plugins/background/libMGeoTiffBackgroundPlugin.so
> lib/merkaartor/plugins/styles/libskulpture.so
> share/applications/merkaartor.desktop
> share/icons/hicolor/48x48/apps/merkaartor.png
>@@ -31,7 +31,6 @@
> %%NLS%%%%DATADIR%%/translations/merkaartor_et.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm
> %%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm
>-%%DATADIR%%/world_background.osb
> %%NLS%%@dirrm %%DATADIR%%/translations
> @dirrm %%DATADIR%%
> @dirrmtry share/icons/hicolor/48x48/apps

Actions: View | Diff

Attachments on bug 165767: 122555 | 122556