gcc3 fixes from upstream CVS

This commit is contained in:
naddy 2004-01-30 15:00:45 +00:00
parent e988b58aca
commit 5dffb0ec3c
3 changed files with 43 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2002/12/29 20:31:41 fgsch Exp $
# $OpenBSD: Makefile,v 1.13 2004/01/30 15:00:45 naddy Exp $
COMMENT= "small, fast window manager"
@ -23,7 +23,8 @@ LIB_DEPENDS= Imlib.19::graphics/imlib
USE_X11= Yes
NO_REGRESS= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu dest
CONFIGURE_STYLE= autoconf dest
AUTOCONF_VERSION= 2.52
CONFIGURE_ARGS= --with-imlib=${PREFIX}/bin \
--with-docdir=${PREFIX}/share/doc \
--with-libdir=${PREFIX}/share/icewm \

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-configure_in,v 1.1 2004/01/30 15:00:46 naddy Exp $
--- configure.in.orig 2001-10-09 16:54:02.000000000 +0200
+++ configure.in 2004-01-30 15:18:38.000000000 +0100
@@ -27,7 +27,7 @@ if test x"$ac_cv_prog_gxx" != x; then
fi
if test x"$ac_cv_prog_gxx" != x; then
- ICE_CXX_FLAG_ACCEPT(warn_xxx, -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Winline -Woverloaded-virtual -W)
+ ICE_CXX_FLAG_ACCEPT(warn_xxx, -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Winline -Woverloaded-virtual -W)
ICE_CXX_FLAG_ACCEPT(permissive, -fpermissive)
fi
@@ -193,8 +193,8 @@ AC_ARG_ENABLE(nls,
[ --disable-nls Disable internationalized message])
if test "$enable_nls" != "no"; then
- AC_CHECK_FUNC(gettext,,
- [ AC_CHECK_LIB(intl, gettext,,
+ AC_CHECK_FUNC(bindtextdomain,,
+ [ AC_CHECK_LIB(intl, bindtextdomain,,
[ AC_MSG_ERROR([NLS support has been requested but libintl wasn´t found.
*** Install your vendor´s version or GNU gettext available at
*** ftp://ftp.gnu.org/pub/gnu/gettext/.])])])

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_wmclient_h,v 1.1 2004/01/30 15:00:46 naddy Exp $
--- src/wmclient.h.orig 2004-01-30 15:45:59.000000000 +0100
+++ src/wmclient.h 2004-01-30 15:46:08.000000000 +0100
@@ -10,13 +10,6 @@ class WindowListItem;
typedef int FrameState;
-#ifndef __YIMP_UTIL__
-//!!! remove these if possible
-typedef struct XWMHints;
-typedef struct XSizeHints;
-typedef struct XClassHint;
-#endif
-
class ClientData {
public:
#ifdef CONFIG_WINLIST