| 1 |
jlec 10/07/04 19:57:27 |
| 2 |
|
| 3 |
Added: gdl-0.9_rc4-wxwidgets.patch |
| 4 |
Removed: gdl-0.9_rc1-magick.patch gdl-0.9_rc3-proj4.patch |
| 5 |
gdl-0.9_rc1-gcc4.3.patch gdl-0.9_rc2-antlr.patch |
| 6 |
gdl-0.9_rc1-proj4.patch |
| 7 |
Log: |
| 8 |
Removed python support untils numarray -> numpy is changed by upstream, #326781; removed old, #286634; correcting RDEPEND for imagemagick support, #314237 |
| 9 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 dev-lang/gdl/files/gdl-0.9_rc4-wxwidgets.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc4-wxwidgets.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc4-wxwidgets.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: gdl-0.9_rc4-wxwidgets.patch |
| 18 |
=================================================================== |
| 19 |
diff --git a/configure.in b/configure.in |
| 20 |
index e77afe3..a012c7c 100644 |
| 21 |
--- a/configure.in |
| 22 |
+++ b/configure.in |
| 23 |
@@ -324,21 +324,25 @@ if test "x$with_wxWidgets" != "xno"; then |
| 24 |
dnl LDFLAGS="$LDFLAGS -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" |
| 25 |
fi |
| 26 |
|
| 27 |
- tmp="`wx-config --basename`-`wx-config --release`" |
| 28 |
- AC_CHECK_LIB($tmp, wxFatalSignalHandler, |
| 29 |
- [AC_DEFINE([HAVE_LIBWXWIDGETS], [1], [wxWidgets library])], [ |
| 30 |
- dnl SA: handling the multi-port wxWidgets installation case |
| 31 |
- tmp="`wx-config --basename --toolkit=base`-`wx-config --release`" |
| 32 |
- AC_CHECK_LIB($tmp, wxInteger_compare, [AC_DEFINE([HAVE_LIBWXWIDGETS], [1])], [ |
| 33 |
- echo "" |
| 34 |
- echo "Error! wxWidgets version 2.8 or later is required but was not found" |
| 35 |
- echo " Use --with-wxWidgets=DIR to specify the wxWidgets directory tree" |
| 36 |
- echo " Use --with-wxWidgets=no to not use it" |
| 37 |
- echo " Check the README or use configure --help for other libraries needed" |
| 38 |
- echo " (--with-xxxdir = obligatory, --with-xxx = optional (--with-xxx=no to disable))" |
| 39 |
- exit -1 |
| 40 |
- ]) |
| 41 |
- ]) |
| 42 |
+ AC_DEFINE([HAVE_LIBWXWIDGETS], [1], [wxWidgets library]) |
| 43 |
+ |
| 44 |
+ # SA: the code below worked for me on Ubuntu and Macports... but it does not work e.g. on Fedora |
| 45 |
+ # |
| 46 |
+ #tmp="`wx-config --basename`-`wx-config --release`" |
| 47 |
+ #AC_CHECK_LIB($tmp, wxFatalSignalHandler, |
| 48 |
+ # [AC_DEFINE([HAVE_LIBWXWIDGETS], [1], [wxWidgets library])], [ |
| 49 |
+ # dnl SA: handling the multi-port wxWidgets installation case |
| 50 |
+ # tmp="`wx-config --basename --toolkit=base`-`wx-config --release`" |
| 51 |
+ # AC_CHECK_LIB($tmp, wxInteger_compare, [AC_DEFINE([HAVE_LIBWXWIDGETS], [1])], [ |
| 52 |
+ # echo "" |
| 53 |
+ # echo "Error! wxWidgets version 2.8 or later is required but was not found" |
| 54 |
+ # echo " Use --with-wxWidgets=DIR to specify the wxWidgets directory tree" |
| 55 |
+ # echo " Use --with-wxWidgets=no to not use it" |
| 56 |
+ # echo " Check the README or use configure --help for other libraries needed" |
| 57 |
+ # echo " (--with-xxxdir = obligatory, --with-xxx = optional (--with-xxx=no to disable))" |
| 58 |
+ # exit -1 |
| 59 |
+ # ]) |
| 60 |
+ #]) |
| 61 |
fi |
| 62 |
|
| 63 |
dnl == ImageMagick ========================================= |
| 64 |
diff --git a/src/widget.cpp b/src/widget.cpp |
| 65 |
index dc65ad1..316d599 100644 |
| 66 |
--- a/src/widget.cpp |
| 67 |
+++ b/src/widget.cpp |
| 68 |
@@ -589,7 +589,7 @@ namespace lib { |
| 69 |
|
| 70 |
RefDNode theAST; |
| 71 |
|
| 72 |
- GDLLexer lexer(istr, ""); |
| 73 |
+ GDLLexer lexer(istr, "", GDLParser::NONE); |
| 74 |
GDLParser& parser = lexer.Parser(); |
| 75 |
parser.interactive(); |
Archives