diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-01-25 04:44:27 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-01-25 04:44:27 +0000 |
| commit | 64bea0f23fb740770854a60720d1af1d57c2726d (patch) | |
| tree | 7e6cd3250be91d71d564171cc468b4d6047a95b7 /x11-wm/icewm | |
| parent | dd65a4e8e6432e6e8987deb09f475f3c8b4c5dc2 (diff) | |
| download | ports-64bea0f23fb740770854a60720d1af1d57c2726d.tar.gz ports-64bea0f23fb740770854a60720d1af1d57c2726d.zip | |
- Fix build with clang [1]
- Pet portlint by removing excess whitespace
PR: ports/175467 [1]
Reported by: Pavel Timofeev <timp87@gmail.com> [1]
Approved by: eadler (maintainer, implicit)
Obtained from: Upstream CVS [1]
Notes
Notes:
svn path=/head/; revision=310960
Diffstat (limited to 'x11-wm/icewm')
| -rw-r--r-- | x11-wm/icewm/Makefile | 3 | ||||
| -rw-r--r-- | x11-wm/icewm/files/patch-src__apppstatus.cc | 17 | ||||
| -rw-r--r-- | x11-wm/icewm/files/patch-src__yarray.h | 16 |
3 files changed, 34 insertions, 2 deletions
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index ddfd8dc3ac56..8c956b5e9f51 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -30,7 +30,6 @@ OPTIONS_DEFAULT= XFT XINERAMA ASM BEASTIE NLS MENUFIX BEASTIE_DESC= Use Beastie'fied startup button MENUFIX_DESC= MenuIconSize fix - # Restrict to stable (even) versions, indicated by the second component. #PORTSCOUT= limitw:1,even @@ -39,7 +38,7 @@ MENUFIX_DESC= MenuIconSize fix .if ${PORT_OPTIONS:MGNOME} USE_GNOME+= gnomedesktop libgnomeui CONFIGURE_ARGS+=--enable-menus-gnome2 -INSTALL_TARGET= install +INSTALL_TARGET= install PLIST_SUB+= GNOMEDESKTOP="" .else PLIST_SUB+= GNOMEDESKTOP="@comment " diff --git a/x11-wm/icewm/files/patch-src__apppstatus.cc b/x11-wm/icewm/files/patch-src__apppstatus.cc new file mode 100644 index 000000000000..f3251b866b8a --- /dev/null +++ b/x11-wm/icewm/files/patch-src__apppstatus.cc @@ -0,0 +1,17 @@ +Fix clang build errors + +http://icewm.cvs.sourceforge.net/viewvc/icewm/icewm-1.2/src/apppstatus.cc?r1=1.24.2.1.2.4&r2=1.24.2.1.2.5&pathrev=icewm-1-3-BRANCH + +--- src/apppstatus.cc 2009/11/08 19:24:08 1.24.2.1.2.4 ++++ src/apppstatus.cc 2010/12/25 15:29:53 1.24.2.1.2.5 +@@ -82,7 +82,9 @@ + } + + NetStatus::~NetStatus() { +- delete[] color; ++ delete color[0]; ++ delete color[1]; ++ delete color[2]; + delete[] ppp_in; + delete[] ppp_out; + delete fUpdateTimer; diff --git a/x11-wm/icewm/files/patch-src__yarray.h b/x11-wm/icewm/files/patch-src__yarray.h new file mode 100644 index 000000000000..72137a4b3fc9 --- /dev/null +++ b/x11-wm/icewm/files/patch-src__yarray.h @@ -0,0 +1,16 @@ +Fix build with clang + +http://icewm.cvs.sourceforge.net/viewvc/icewm/icewm-1.2/src/yarray.h?r1=1.5.4.3&r2=1.5.4.4&pathrev=icewm-1-3-BRANCH + +--- src/yarray.h 2009/06/01 17:10:07 1.5.4.3 ++++ src/yarray.h 2010/12/25 15:29:53 1.5.4.4 +@@ -152,7 +152,8 @@ + } + + virtual void remove(const typename YArray<DataType *>::SizeType index) { +- if (index < YArray<DataType *>::getCount()) delete getItem(index); ++ if (index < YArray<DataType *>::getCount()) ++ delete YArray<DataType *>::getItem(index); + YArray<DataType *>::remove(index); + } + |