Attachment 227089 Details for Bug 257625 – Prepends namespace to select 'advance' from boost libraries.

[patch] Prepends namespace to select 'advance' from boost libraries.

pdfedit.patch (text/plain), 1.80 KB, created by David Marec on 2021-08-10 17:17:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Marec

Created: 2021-08-10 17:17:04 UTC

Size: 1.80 KB

patch

obsolete

>diff --git a/editors/pdfedit/Makefile b/editors/pdfedit/Makefile
>index d3c3b51ca9..5186eccf61 100644
>--- a/editors/pdfedit/Makefile
>+++ b/editors/pdfedit/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	pdfedit
> PORTVERSION=	0.4.5
>-PORTREVISION=	15
>+PORTREVISION=	16
> CATEGORIES=	editors
> MASTER_SITES=	SF
> 
>@@ -13,8 +13,6 @@ LICENSE=	GPLv2
> 
> BROKEN_powerpc64=	fails to configure: error: Could not link against boost_program_options
> BROKEN_sparc64=		fails to configure: error: Could not link against boost_program_options
>-BROKEN_FreeBSD_13=	fails to compile: call to 'advance' is ambiguous
>-BROKEN_FreeBSD_14=	fails to compile: call to 'advance' is ambiguous
> 
> LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
> 		libfreetype.so:print/freetype2 \
>diff --git a/editors/pdfedit/files/patch-src-kernel-stateupdater.cc b/editors/pdfedit/files/patch-src-kernel-stateupdater.cc
>index ffeb6bd5ca..4c5547b003 100644
>--- a/editors/pdfedit/files/patch-src-kernel-stateupdater.cc
>+++ b/editors/pdfedit/files/patch-src-kernel-stateupdater.cc
>@@ -1,6 +1,15 @@
> --- src/kernel/stateupdater.cc.orig	2009-09-11 12:02:56 UTC
> +++ src/kernel/stateupdater.cc
>-@@ -1227,7 +1227,7 @@ bool checkAndFixOperator (const StateUpd
>+@@ -1207,7 +1207,7 @@ bool checkAndFixOperator (const StateUpdater::CheckTyp
>+ 	PdfOperator::Operands::reverse_iterator rit = operands.rbegin ();
>+ 	// Be careful -- buffer overflow
>+ 	argNum = std::min (argNum, operands.size());
>+-	advance (rit, argNum);
>++	boost::advance (rit, argNum);
>+ 	PdfOperator::Operands::iterator it = rit.base ();
>+ 	// Loop from the first operator to the end
>+ 	for (int pos = 0; it != operands.end (); ++it, ++pos)
>+@@ -1227,7 +1227,7 @@ bool checkAndFixOperator (const StateUpdater::CheckTyp
>  			{ // Convert it to real
>  				double dval = 0.0;
>  				dval = IProperty::getSmartCObjectPtr<CInt>(*it)->getValue();

Flags:

david: maintainer-approval? (hrs)

Actions: View | Diff

Attachments on bug 257625: 226954 | 227089