diff options
| author | clsung <clsung@FreeBSD.org> | 2004-08-26 12:29:03 +0800 |
|---|---|---|
| committer | clsung <clsung@FreeBSD.org> | 2004-08-26 12:29:03 +0800 |
| commit | 1044dd7c4add00d44e8e28ac6fce2d2d79e87d29 (patch) | |
| tree | c01c5a0a0b9b8e2fe7dfa7c00281693dffdc335b | |
| parent | e5f3b6222059e7aac3647336685458c2dd4d29cd (diff) | |
| download | freebsd-ports-gnome-1044dd7c4add00d44e8e28ac6fce2d2d79e87d29.tar.gz freebsd-ports-gnome-1044dd7c4add00d44e8e28ac6fce2d2d79e87d29.tar.zst freebsd-ports-gnome-1044dd7c4add00d44e8e28ac6fce2d2d79e87d29.zip | |
fix build error under gcc 3.4.2.
PR: ports/70443
Approved by: vanilla (co-mentor)
| -rw-r--r-- | textproc/rtfx/Makefile | 4 | ||||
| -rw-r--r-- | textproc/rtfx/files/extra-patch-src::reference.h-gcc342 | 15 | ||||
| -rw-r--r-- | textproc/rtfx/files/extra-patch-src::sablo.h-gcc342 | 15 |
3 files changed, 34 insertions, 0 deletions
diff --git a/textproc/rtfx/Makefile b/textproc/rtfx/Makefile index b8e18814eda8..f486476051ff 100644 --- a/textproc/rtfx/Makefile +++ b/textproc/rtfx/Makefile @@ -28,5 +28,9 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src::domhelpers.h-gcc295 post-patch: @${REINPLACE_CMD} -e "s/
//g" ${WRKSRC}/src/xmlcomposer.cpp .endif +.if ${OSVERSION} >= 502124 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src::reference.h-gcc342 \ + ${FILESDIR}/extra-patch-src::sablo.h-gcc342 +.endif .include <bsd.port.post.mk> diff --git a/textproc/rtfx/files/extra-patch-src::reference.h-gcc342 b/textproc/rtfx/files/extra-patch-src::reference.h-gcc342 new file mode 100644 index 000000000000..bf185cd5dc7c --- /dev/null +++ b/textproc/rtfx/files/extra-patch-src::reference.h-gcc342 @@ -0,0 +1,15 @@ +--- src/reference.h.orig Fri Jul 23 05:03:03 2004 ++++ src/reference.h Sat Aug 14 14:41:14 2004 +@@ -57,10 +57,10 @@ + addref(); + } + +- Reference(C* ptr, bool addref) ++ Reference(C* ptr, bool has_addref) + { + m_ptr = ptr; +- if(addref) ++ if(has_addref) + addref(); + } + diff --git a/textproc/rtfx/files/extra-patch-src::sablo.h-gcc342 b/textproc/rtfx/files/extra-patch-src::sablo.h-gcc342 new file mode 100644 index 000000000000..7d1148923b08 --- /dev/null +++ b/textproc/rtfx/files/extra-patch-src::sablo.h-gcc342 @@ -0,0 +1,15 @@ +--- src/sablo.h.orig Sat Jul 24 12:18:06 2004 ++++ src/sablo.h Sat Aug 14 14:42:45 2004 +@@ -146,10 +146,10 @@ + addref(); + } + +- Ref(C* ptr, bool addref) ++ Ref(C* ptr, bool has_addref) + { + m_ptr = ptr; +- if(addref) ++ if(has_addref) + addref(); + } + |