summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-02-09 16:06:02 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-02-09 16:06:02 +0000
commit5677fb3acb5f14e8a54fc304d7c0828d73092e7b (patch)
treed59c78c32c0f63b1efaaf5890509ccce02cb8008 /sci-libs/gaul-devel/files
parentMissing patch... (diff)
downloadhistorical-5677fb3acb5f14e8a54fc304d7c0828d73092e7b.tar.gz
historical-5677fb3acb5f14e8a54fc304d7c0828d73092e7b.tar.bz2
historical-5677fb3acb5f14e8a54fc304d7c0828d73092e7b.zip
Removed old version and re-added slang-2 support.
Package-Manager: portage-2.1.4.1
Diffstat (limited to 'sci-libs/gaul-devel/files')
-rw-r--r--sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-config.patch18
-rw-r--r--sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-error.patch30
2 files changed, 48 insertions, 0 deletions
diff --git a/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-config.patch b/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-config.patch
new file mode 100644
index 000000000000..c46bf0d1a5e8
--- /dev/null
+++ b/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-config.patch
@@ -0,0 +1,18 @@
+diff -Naur gaul-devel-0.1849-0/configure.in gaul-devel-0.1849-0.new/configure.in
+--- gaul-devel-0.1849-0/configure.in 2005-04-20 12:09:15.000000000 -0400
++++ gaul-devel-0.1849-0.new/configure.in 2008-02-09 09:59:13.000000000 -0500
+@@ -397,10 +397,10 @@
+ AC_MSG_RESULT(yes)
+ WILL_USE_SLANG="yes"
+ HAVE_SLANG=1
+- LIBS="$LIBS -lslang -lm"
+- INCLUDES="$INCLUDES -I/usr/include/slang/" # FIXME: Need to detect slang.h location properly.
+- AC_CHECK_LIB(slang, SLang_init_slang,
+- [LIBS="$LIBS -lslang"],
++ LIBS="$LIBS -lslang-2 -lm"
++ INCLUDES="$INCLUDES -I/usr/include/slang-2/" # FIXME: Need to detect slang.h location properly.
++ AC_CHECK_LIB(slang-2, SLang_init_slang,
++ [LIBS="$LIBS -lslang-2"],
+ [AC_MSG_ERROR(GAUL requires the S-Lang library for full functionality. see http://space.mit.edu/pub/davis/slang/ Or configure with '--enable-slang=no' for reduced version.)])
+ result=1
+ else
diff --git a/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-error.patch b/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-error.patch
new file mode 100644
index 000000000000..64b3c59a28bb
--- /dev/null
+++ b/sci-libs/gaul-devel/files/gaul-devel-0.1849-slang2-error.patch
@@ -0,0 +1,30 @@
+diff -Naur gaul-devel-0.1849-0/tests/test_slang.c gaul-devel-0.1849-0.new/tests/test_slang.c
+--- gaul-devel-0.1849-0/tests/test_slang.c 2003-08-19 17:41:20.000000000 -0400
++++ gaul-devel-0.1849-0.new/tests/test_slang.c 2008-02-09 10:42:43.000000000 -0500
+@@ -287,10 +287,11 @@
+ */
+ if (-1 == SLang_load_file(script_fname))
+ {
++ int error = SLang_get_error();
+ dief("Error %d interpreting the S-Lang script \"%s\".",
+- SLang_Error, script_fname);
++ error, script_fname);
+ SLang_restart(1); /* reset interpreter. */
+- SLang_Error = 0;
++ SLang_set_error(0);
+ return FALSE;
+ }
+
+@@ -315,9 +316,10 @@
+ */
+ if (-1 == SLang_load_file(NULL))
+ {
+- dief("Error %d interpreting the SLang script from stdin.", SLang_Error);
++ int error = SLang_get_error();
++ dief("Error %d interpreting the SLang script from stdin.", error);
+ SLang_restart(1);
+- SLang_Error = 0;
++ SLang_set_error(0);
+ return FALSE;
+ }
+