Attachment 164542 Details for Bug 205161 – Proposed patch to disable builtin quazip and use archivers/quazip instead

[patch] Proposed patch to disable builtin quazip and use archivers/quazip instead

patch (text/plain), 2.05 KB, created by Arrigo Marchiori on 2015-12-23 11:46:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Arrigo Marchiori

Created: 2015-12-23 11:46:57 UTC

Size: 2.05 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 404084)
>+++ Makefile	(working copy)
>@@ -14,7 +14,8 @@
> LICENSE=	GPLv3
> 
> BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
>-		${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs
>+		${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs \
>+		${LOCALBASE}/lib/libquazip.so:${PORTSDIR}/archivers/quazip
> 
> MAKE_JOBS_UNSAFE=yes
> 
>@@ -40,8 +41,7 @@
> .endif
> 
> SHRLIBS=	qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations	\
>-		qcadsnap qcadspatialindex qcadstemmer spatialindexnavel qcadzip \
>-		quazip
>+		qcadsnap qcadspatialindex qcadstemmer spatialindexnavel qcadzip 
> STALIBS=	dxflib stemmer
> SHRDIR=		fonts libraries patterns plugins scripts ts
> #QSCRIPTS should not be installed to avoid conflicts with texlive-base
>Index: files/patch-src_3rdparty_3rdparty.pro
>===================================================================
>--- files/patch-src_3rdparty_3rdparty.pro	(revision 404084)
>+++ files/patch-src_3rdparty_3rdparty.pro	(working copy)
>@@ -1,14 +1,18 @@
>---- ./src/3rdparty/3rdparty.pro.orig	2013-08-06 17:32:09.000000000 +0200
>-+++ ./src/3rdparty/3rdparty.pro	2013-08-08 10:03:33.000000000 +0200
>-@@ -4,9 +4,8 @@
>+--- src/3rdparty/3rdparty.pro.orig	2015-11-24 15:13:30.000000000 +0100
>++++ src/3rdparty/3rdparty.pro	2015-12-23 10:01:28.113511000 +0100
>+@@ -2,12 +2,10 @@
>+ TEMPLATE = subdirs
>+ SUBDIRS = \
>      spatialindexnavel \
>-     stemmer
>+-    stemmer \
>+-    quazip
>++    stemmer
>++
>++# FreeBSD: prefer quazip and opennurbs from dependent ports
>  
> -!r_no_opennurbs {
> -    SUBDIRS += opennurbs
> -}
>-+# FreeBSD: prefer opennurbs from a dependent port
>-+
>  !rs_no_dxf {
>      SUBDIRS += dxflib
>  }
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 404084)
>+++ pkg-plist	(working copy)
>@@ -21,8 +21,6 @@
> lib/libqcadstemmer.so.0
> lib/libqcadzip.so
> lib/libqcadzip.so.0
>-lib/libquazip.so
>-lib/libquazip.so.0
> lib/libspatialindexnavel.so
> lib/libspatialindexnavel.so.0
> lib/libstemmer.a

Actions: View | Diff

Attachments on bug 205161: 164499 | 164542 | 164813 | 164862