diff options
| author | Gary Jennejohn <gj@FreeBSD.org> | 2004-08-27 20:18:10 +0000 |
|---|---|---|
| committer | Gary Jennejohn <gj@FreeBSD.org> | 2004-08-27 20:18:10 +0000 |
| commit | 94abe2a5a9c235366174fc910cf60063114927d6 (patch) | |
| tree | 62de6376fd6221e1ed00e8a01ca6c65478c4e247 /x11-wm | |
| parent | Upgrade 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.
Notes
Notes:
svn path=/head/; revision=117460
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/flwm/Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/flwm/files/patch-Rotate.C | 26 | ||||
| -rw-r--r-- | x11-wm/flwm/files/patch-ab | 11 |
3 files changed, 40 insertions, 1 deletions
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile index 6d90c82f698b..12c222cca3e8 100644 --- a/x11-wm/flwm/Makefile +++ b/x11-wm/flwm/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://flwm.sourceforge.net/ \ ftp://ftp.sai.msu.su/pub/X11/win_man/ EXTRACT_SUFX= .tgz -MAINTAINER= demon@FreeBSD.org +MAINTAINER= gj@FreeBSD.org COMMENT= The Fast Light Window Manager LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk @@ -25,4 +25,6 @@ GNU_CONFIGURE= yes MAN1= flwm.1 PLIST_FILES= bin/flwm +CONFIGURE_ARGS?=--includedir="-I/usr/local/include -I/usr/local/include/freetype2" + .include <bsd.port.mk> diff --git a/x11-wm/flwm/files/patch-Rotate.C b/x11-wm/flwm/files/patch-Rotate.C new file mode 100644 index 000000000000..0dc6e545de1a --- /dev/null +++ b/x11-wm/flwm/files/patch-Rotate.C @@ -0,0 +1,26 @@ +--- Rotated.C.orig Fri Aug 27 21:53:28 2004 ++++ Rotated.C Fri Aug 27 12:02:59 2004 +@@ -27,6 +27,7 @@ + /* ********************************************************************** */ + + #include <FL/x.H> ++#include <X11/Xft/Xft.h> + #include <FL/fl_draw.H> + #include "Rotated.H" + #include <stdlib.h> +@@ -352,6 +353,7 @@ + static XRotFontStruct* font; + + void draw_rotated(const char* text, int n, int x, int y, int angle) { ++#if XFT_MAJOR < 2 + if (!text || !*text) return; + /* make angle positive ... */ + if (angle < 0) do angle += 360; while (angle < 0); +@@ -365,6 +367,7 @@ + font = XRotLoadFont(fl_display, fl_xfont, dir); + } + XRotDrawString(fl_display, font, fl_window, fl_gc, x, y, text, n); ++#endif + } + + #ifndef FLWM 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 |