summaryrefslogtreecommitdiff
path: root/x11-wm/flwm/files/patch-ab
diff options
context:
space:
mode:
authorGary Jennejohn <gj@FreeBSD.org>2004-08-27 20:18:10 +0000
committerGary Jennejohn <gj@FreeBSD.org>2004-08-27 20:18:10 +0000
commit94abe2a5a9c235366174fc910cf60063114927d6 (patch)
tree62de6376fd6221e1ed00e8a01ca6c65478c4e247 /x11-wm/flwm/files/patch-ab
parentUpgrade to version 2.1.3. (diff)
Take over maintainership from demon.
Work around an incompatibility between fltk (a dependency) and libXft version 2 which results in flwm getting a SIGSEGV at startup. This basically prevents the vertical labels from being drawn in the vertical title bar on the left of the window. Otherwise there is no change in functionality. I tried using newer versions of fltk but they either had the same problem or were so new that flwm could not be linked.
Diffstat (limited to 'x11-wm/flwm/files/patch-ab')
-rw-r--r--x11-wm/flwm/files/patch-ab11
1 files changed, 11 insertions, 0 deletions
diff --git a/x11-wm/flwm/files/patch-ab b/x11-wm/flwm/files/patch-ab
index 78a7d4e4cd2e..912962717c6e 100644
--- a/x11-wm/flwm/files/patch-ab
+++ b/x11-wm/flwm/files/patch-ab
@@ -36,3 +36,14 @@
CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
else
if test "`(uname) 2>/dev/null`" = IRIX; then
+--- configure.orig Fri Aug 27 21:44:46 2004
++++ configure Fri Aug 27 21:49:27 2004
+@@ -1807,7 +1807,7 @@
+ # -Wno-return-type is necessary for Xlib header files on many systems:
+ CFLAGS="$CFLAGS -Wall -Wno-return-type $CFLAGS $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+- CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type $CXXFLAGS $X_CFLAGS"
++ CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type $includedir $CXXFLAGS $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+ else
+ if test "`(uname) 2>/dev/null`" = IRIX; then