diff options
| author | bapt <bapt@FreeBSD.org> | 2013-05-24 22:17:38 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-05-24 22:17:38 +0800 |
| commit | a8711033044a3f451294cc8be556fb4ca5e8856d (patch) | |
| tree | 81fd9a9f80b1955818d75d4556e8d96f209019fb | |
| parent | 131491b98c9394ec6f0c802ca1adad9af310d6b3 (diff) | |
| download | freebsd-ports-gnome-a8711033044a3f451294cc8be556fb4ca5e8856d.tar.gz freebsd-ports-gnome-a8711033044a3f451294cc8be556fb4ca5e8856d.tar.zst freebsd-ports-gnome-a8711033044a3f451294cc8be556fb4ca5e8856d.zip | |
Fix build with clang: this unbreak gnome2 with clang
While here:
- Trim headers
- Remove test for unsupported FreeBSD versions
| -rw-r--r-- | accessibility/dasher/Makefile | 8 | ||||
| -rw-r--r-- | accessibility/dasher/files/patch-clang | 37 |
2 files changed, 38 insertions, 7 deletions
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile index c16edcc91ae1..692c11159d45 100644 --- a/accessibility/dasher/Makefile +++ b/accessibility/dasher/Makefile @@ -1,10 +1,6 @@ -# Ports collection Makefile for: dasher -# Date created: 5 July 2003 -# Whom: lewiz <purple@lewiz.net> -# +# Created by: lewiz <purple@lewiz.net> # $FreeBSD$ # $MCom: ports/accessibility/dasher/Makefile,v 1.66 2009/03/18 04:59:21 marcus Exp $ -# PORTNAME= dasher PORTVERSION= 4.10.1 @@ -48,9 +44,7 @@ post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-O2||g' -.if ${OSVERSION} >= 700042 @${REINPLACE_CMD} -e 's|__gnu_cxx::lldiv|lldiv|' \ ${WRKSRC}/Src/DasherCore/DasherViewSquare.cpp -.endif .include <bsd.port.post.mk> diff --git a/accessibility/dasher/files/patch-clang b/accessibility/dasher/files/patch-clang new file mode 100644 index 000000000000..0f0ef1be5609 --- /dev/null +++ b/accessibility/dasher/files/patch-clang @@ -0,0 +1,37 @@ +--- ./Src/DasherCore/DasherViewSquare.h.orig 2013-05-24 17:03:27.185956866 +0200 ++++ ./Src/DasherCore/DasherViewSquare.h 2013-05-24 17:03:36.904410678 +0200 +@@ -20,11 +20,6 @@ + class CDasherNode; + } + +-class Dasher::CDasherViewSquare; +-class Dasher::CDasherModel; +-class Dasher::CDelayedDraw; +-class Dasher::CDasherNode; +- + /// \ingroup View + /// @{ + +--- ./Src/DasherCore/SettingsStore.h.orig 2013-05-24 16:53:08.087996232 +0200 ++++ ./Src/DasherCore/SettingsStore.h 2013-05-24 16:53:40.137994206 +0200 +@@ -18,9 +18,6 @@ + class CParameterNotificationEvent; + } + +-class Dasher::CEventHandler; +-class Dasher::CParameterNotificationEvent; +- + // Types that are parameters can be + enum ParameterType + { +--- ./Src/DasherCore/View/DelayedDraw.h.orig 2013-05-24 17:00:06.589967502 +0200 ++++ ./Src/DasherCore/View/DelayedDraw.h 2013-05-24 16:57:01.492979337 +0200 +@@ -15,8 +15,6 @@ + class CDasherScreen; + } + +-class Dasher::CDasherScreen; +- + namespace Dasher { + /// \ingroup View + /// @{ |