diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2004-03-30 17:02:58 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2004-03-30 17:02:58 +0000 |
| commit | 7ad012e1d9fc4e62211b50c38b45e788773e4611 (patch) | |
| tree | ed1a8e636328bba0fe70f24f4ac79950a778c364 /math/xgfe/files/patch-barOp.cpp | |
| parent | Unbeak for 5.005 (diff) | |
Unfortunately, the recent changes to math/xgfe (PR 59024) broke its
compilation on FreeBSD 4 with GCC 2.95.4:
http://bento.freebsd.org/errorlogs/i386-4-latest/xgfe-2.1.log
The patch below fixes this.
During testing it on FreeBSD 4 and 5 with QT 3.3.1 I noticed that the
Advanced -> Multiple Files and Advanced -> Multiple Functions dialogs
were broken. I'm not sure if this is a new breakage with QT 3.3.1 or
if I didn't notice these when testing the previous patch on FreeBSD 5
with QT 3.2.1. Anyway, these are also fixed and as a precaution
PORTREVISION is bumped.
The patch also adds SIZE info.
PR: 64390
Submitted by: Marius Strobl <marius@alchemy.franken.de>
Approved by: maintainer
Diffstat (limited to 'math/xgfe/files/patch-barOp.cpp')
| -rw-r--r-- | math/xgfe/files/patch-barOp.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/math/xgfe/files/patch-barOp.cpp b/math/xgfe/files/patch-barOp.cpp index b0d15f301243..3898f4ecd178 100644 --- a/math/xgfe/files/patch-barOp.cpp +++ b/math/xgfe/files/patch-barOp.cpp @@ -1,4 +1,3 @@ -diff -u barOp.cpp.orig barOp.cpp --- barOp.cpp.orig Thu May 7 07:46:39 1998 +++ barOp.cpp Thu Oct 30 21:42:04 2003 @@ -59,7 +59,7 @@ @@ -6,7 +5,16 @@ diff -u barOp.cpp.orig barOp.cpp void barOp::setBarOption() { - string barSize = barSizeEdit->text(); -+ string barSize = string(barSizeEdit->text()); ++ string barSize = barSizeEdit->text().ascii(); if (barSize != "") { +@@ -67,7 +67,7 @@ + } + else + { +- barSize = synList->currentText(); ++ barSize = synList->currentText().ascii(); + gnuInt->setBarSizeOption(barSize); + } + |