Attachment 169164 Details for Bug 208684 – Patch.diff

[patch] Patch.diff

patch-merkaartor.diff (text/plain), 2.20 KB, created by Andriy Voskoboinyk on 2016-04-10 20:39:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2016-04-10 20:39:23 UTC

Size: 2.20 KB

patch

obsolete

>Index: astro/merkaartor/Makefile
>===================================================================
>--- astro/merkaartor/Makefile	(revision 412976)
>+++ astro/merkaartor/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	merkaartor
> PORTVERSION=	0.18.2
>+PORTREVISION=	1
> CATEGORIES=	astro
> 
> MAINTAINER=	dev2@heesakkers.info
>@@ -13,13 +14,12 @@
> 
> LIB_DEPENDS=	libgdal.so:graphics/gdal \
> 		libproj.so:graphics/proj \
>-		libquazip5.so:archivers/quazip-qt5 \
>-		libsqlite3.so:databases/sqlite3
>+		libquazip5.so:archivers/quazip-qt5
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	openstreetmap
> GH_PROJECT=	${PORTNAME}
>-USES=		pkgconfig qmake
>+USES=		pkgconfig sqlite:3 qmake
> USE_LDCONFIG=	yes
> 
> QMAKE_ARGS=	SYSTEM_QUAZIP=1
>@@ -27,7 +27,7 @@
> 		concurrent core gui imageformats network printsupport svg \
> 		webkit widgets xml
> 
>-OPTIONS_DEFINE=	DEBUG GEOIMAGE NLS ZBAR
>+OPTIONS_DEFINE=	DEBUG GEOIMAGE NLS PROTOBUF ZBAR
> OPTIONS_DEFAULT=	GEOIMAGE
> 
> GEOIMAGE_DESC=	Enable geotagged images (needs exiv2)
>@@ -34,6 +34,10 @@
> GEOIMAGE_QMAKE_ON=	GEOIMAGE=1
> GEOIMAGE_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
> 
>+PROTOBUF_DESC=	Protobuf Binary Format support
>+PROTOBUF_QMAKE_ON=	PROTOBUF=1
>+PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
>+
> ZBAR_DESC=	Read barcodes from walking papers (BROKEN)
> ZBAR_QMAKE_ON=	ZBAR=1
> ZBAR_LIB_DEPENDS=	libzbar.so:graphics/zbar
>@@ -42,7 +46,7 @@
> 
> DEBUG_QMAKE_OFF=	NODEBUG=1 RELEASE=1
> 
>-NLS_USE=	QT5=linguist_build
>+NLS_USE=	QT5=linguisttools_build
> 
> OPTIONS_SUB=	yes
> 
>@@ -49,6 +53,10 @@
> pre-build-NLS-on:
> 	@cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro
> 
>+pre-build-PROTOBUF-on:
>+	@cd ${WRKSRC}/src/ImportExport && ${LOCALBASE}/bin/protoc --cpp_out=. \
>+		fileformat.proto osmformat.proto
>+
> post-install-NLS-on:
> 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
> 	@(cd ${WRKSRC}/translations && ${COPYTREE_SHARE} "merkaartor_*.qm" \
>Index: astro/merkaartor/pkg-descr
>===================================================================
>--- astro/merkaartor/pkg-descr	(revision 412976)
>+++ astro/merkaartor/pkg-descr	(working copy)
>@@ -2,6 +2,6 @@
> providing a visually pleasing but performant editing environment for
> free geographical data.
> 
>-It is based on Qt4.
>+It is based on Qt5.
> 
> WWW: http://merkaartor.be/

Actions: View | Diff

Attachments on bug 208684: 169164 | 169165 | 169166