Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 436400 | Differences between
and this patch

Collapse All | Expand All

(-)TeXmacs-1.99.9-src.orig/CMakeLists.txt (-2 / +1 lines)
Lines 274-280 Link Here
274
elseif(Guile_VERSION_STRING VERSION_LESS 3.0)
274
elseif(Guile_VERSION_STRING VERSION_LESS 3.0)
275
  set(CONFIG_GUILE_SERIAL "D")
275
  set(CONFIG_GUILE_SERIAL "D")
276
  set(GUILE_D 1)
276
  set(GUILE_D 1)
277
  set(SCM_SIZET size_t)
278
else(Guile_VERSION_STRING VERSION_LESS 1.6)
277
else(Guile_VERSION_STRING VERSION_LESS 1.6)
279
  message(ERROR "Not Guile serial A,B,C or D???")
278
  message(ERROR "Not Guile serial A,B,C or D???")
280
endif(Guile_VERSION_STRING VERSION_LESS 1.6)
279
endif(Guile_VERSION_STRING VERSION_LESS 1.6)
Lines 286-292 Link Here
286
285
287
MESSAGE(STATUS "Checking the size_t of guile strings")
286
MESSAGE(STATUS "Checking the size_t of guile strings")
288
287
289
CHECK_C_SOURCE_COMPILES(  "#include <guile/gh.h>
288
CHECK_CXX_SOURCE_COMPILES(  "#include <guile/gh.h>
290
  #include <libguile.h>
289
  #include <libguile.h>
291
  void print_string (SCM s) {
290
  void print_string (SCM s) {
292
    int len_r;
291
    int len_r;
(-)TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.orig (+32 lines)
Line 0 Link Here
1
2
add_library(texmacs_body STATIC ${TeXmacs_All_SRCS})
3
4
add_executable (${TeXmacs_binary_name}
5
  ./Texmacs/Texmacs/texmacs.cpp
6
)
7
8
target_link_libraries (${TeXmacs_binary_name}
9
  texmacs_body
10
  ${TeXmacs_Libraries}
11
)
12
13
if (APPLE)
14
  set(MACOSX_BUNDLE_DISPLAY_NAME TeXmacs)
15
  set_target_properties (${TeXmacs_binary_name}
16
    PROPERTIES
17
    MACOSX_BUNDLE TRUE
18
    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in
19
    DEBUG_OUTPUT_NAME ${TeXmacs_binary_name}${EXE_DEBUG_EXTENSION}
20
    RELEASE_OUTPUT_NAME ${TeXmacs_binary_name}
21
    RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
22
  )
23
else (APPLE)
24
  set_target_properties (${TeXmacs_binary_name}
25
    PROPERTIES
26
    DEBUG_OUTPUT_NAME ${TeXmacs_binary_name}${EXE_DEBUG_EXTENSION}
27
    RELEASE_OUTPUT_NAME ${TeXmacs_binary_name}
28
    RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
29
  )
30
  install (TARGETS ${TeXmacs_binary_name} DESTINATION lib/texmacs/TeXmacs/bin)
31
endif (APPLE)
32
(-)TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.cpp (-1 / +51 lines)
Line 0 Link Here
1
--- CMakeLists.txt	(revision 11761)
Lines 85-103 Link Here
85
#ifndef DEBUG_ON
85
#ifndef DEBUG_ON
86
static SCM
86
static SCM
87
TeXmacs_lazy_eval_file (char *file) {
87
TeXmacs_lazy_eval_file (char *file) {
88
#if (defined(GUILE_A) || defined(GUILE_B))
88
  return scm_internal_lazy_catch (SCM_BOOL_T,
89
  return scm_internal_lazy_catch (SCM_BOOL_T,
89
                                  (scm_t_catch_body) scm_c_primitive_load, file,
90
                                  (scm_t_catch_body) scm_c_primitive_load, file,
90
                                  (scm_t_catch_handler) TeXmacs_lazy_catcher, file);
91
                                  (scm_t_catch_handler) TeXmacs_lazy_catcher, file);
92
#else
93
  return scm_c_with_throw_handler (SCM_BOOL_T,
94
                                   (scm_t_catch_body) scm_c_primitive_load, file,
95
                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
96
                                   file, 0);
97
#endif
91
}
98
}
92
#endif
99
#endif
93
100
94
static SCM
101
static SCM
95
TeXmacs_eval_file (char *file) {
102
TeXmacs_eval_file (char *file) {
96
#ifndef DEBUG_ON
103
#ifndef DEBUG_ON
104
#if (defined(GUILE_A) || defined(GUILE_B))
97
  return scm_internal_catch (SCM_BOOL_T,
105
  return scm_internal_catch (SCM_BOOL_T,
98
                             (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
106
                             (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
99
                             (scm_t_catch_handler) TeXmacs_catcher, file);
107
                             (scm_t_catch_handler) TeXmacs_catcher, file);
100
#else
108
#else
109
  return scm_c_catch (SCM_BOOL_T,
110
                      (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
111
                      (scm_t_catch_handler) TeXmacs_catcher, file, NULL, NULL);
112
113
#endif
114
115
#else
101
  return 	scm_c_primitive_load (file);										 
116
  return 	scm_c_primitive_load (file);										 
102
#endif
117
#endif
103
}
118
}
Lines 121-139 Link Here
121
#ifndef DEBUG_ON
136
#ifndef DEBUG_ON
122
static SCM
137
static SCM
123
TeXmacs_lazy_eval_string (char *s) {
138
TeXmacs_lazy_eval_string (char *s) {
139
#if (defined(GUILE_A) || defined(GUILE_B))
124
  return scm_internal_lazy_catch (SCM_BOOL_T,
140
  return scm_internal_lazy_catch (SCM_BOOL_T,
125
                                  (scm_t_catch_body) scm_c_eval_string, s,
141
                                  (scm_t_catch_body) scm_c_eval_string, s,
126
                                  (scm_t_catch_handler) TeXmacs_lazy_catcher, s);
142
                                  (scm_t_catch_handler) TeXmacs_lazy_catcher, s);
143
#else
144
  return scm_c_with_throw_handler (SCM_BOOL_T,
145
                                   (scm_t_catch_body) scm_c_eval_string, s,
146
                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
147
                                   s, 0);
148
#endif
127
}
149
}
128
#endif
150
#endif
129
151
130
static SCM
152
static SCM
131
TeXmacs_eval_string (char *s) {
153
TeXmacs_eval_string (char *s) {
132
#ifndef DEBUG_ON
154
#ifndef DEBUG_ON
155
#if (defined(GUILE_A) || defined(GUILE_B))
133
  return scm_internal_catch (SCM_BOOL_T,
156
  return scm_internal_catch (SCM_BOOL_T,
134
                             (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
157
                             (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
135
                             (scm_t_catch_handler) TeXmacs_catcher, s);
158
                             (scm_t_catch_handler) TeXmacs_catcher, s);
136
#else
159
#else
160
  return scm_c_catch (SCM_BOOL_T,
161
                      (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
162
                      (scm_t_catch_handler) TeXmacs_catcher, s, NULL, NULL);
163
164
#endif
165
#else
137
  return  scm_c_eval_string(s);
166
  return  scm_c_eval_string(s);
138
#endif
167
#endif
139
}
168
}
Lines 180-198 Link Here
180
#ifndef DEBUG_ON
209
#ifndef DEBUG_ON
181
static SCM
210
static SCM
182
TeXmacs_lazy_call_scm (arg_list* args) {
211
TeXmacs_lazy_call_scm (arg_list* args) {
212
#if (defined(GUILE_A) || defined(GUILE_B))
183
  return scm_internal_lazy_catch (SCM_BOOL_T,
213
  return scm_internal_lazy_catch (SCM_BOOL_T,
184
                                  (scm_t_catch_body) TeXmacs_call, (void*) args,
214
                                  (scm_t_catch_body) TeXmacs_call, (void*) args,
185
                                  (scm_t_catch_handler) TeXmacs_lazy_catcher, (void*) args);
215
                                  (scm_t_catch_handler) TeXmacs_lazy_catcher,
216
                                  (void*) args);
217
#else
218
  return scm_c_with_throw_handler (SCM_BOOL_T,
219
                                   (scm_t_catch_body) TeXmacs_call, (void*) args,
220
                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
221
                                   (void*) args, 0);
222
223
#endif
186
}
224
}
187
#endif
225
#endif
188
226
189
static SCM
227
static SCM
190
TeXmacs_call_scm (arg_list *args) {
228
TeXmacs_call_scm (arg_list *args) {
191
#ifndef DEBUG_ON
229
#ifndef DEBUG_ON
230
#if (defined(GUILE_A) || defined(GUILE_B))
192
  return scm_internal_catch (SCM_BOOL_T,
231
  return scm_internal_catch (SCM_BOOL_T,
193
                             (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
232
                             (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
194
                             (scm_t_catch_handler) TeXmacs_catcher, (void*) args);
233
                             (scm_t_catch_handler) TeXmacs_catcher, (void*) args);
195
#else
234
#else
235
  return scm_c_catch (SCM_BOOL_T,
236
                      (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
237
                      (scm_t_catch_handler) TeXmacs_catcher, (void*) args,
238
                      NULL, NULL);
239
#endif
240
#else
196
  return TeXmacs_call(args);
241
  return TeXmacs_call(args);
197
#endif
242
#endif
198
}
243
}
Lines 443-449 Link Here
443
  return SCM_BOOL_F;
488
  return SCM_BOOL_F;
444
}
489
}
445
490
491
#ifdef GUILE_A
446
static scm_sizet
492
static scm_sizet
493
#else
494
static size_t
495
#endif
447
free_blackbox (SCM blackbox_smob) {
496
free_blackbox (SCM blackbox_smob) {
448
  blackbox *ptr = (blackbox *) SCM_CDR (blackbox_smob);
497
  blackbox *ptr = (blackbox *) SCM_CDR (blackbox_smob);
449
#ifdef DEBUG_ON
498
#ifdef DEBUG_ON
(-)TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.hpp (-4 / +4 lines)
Lines 83-90 Link Here
83
#define scm_is_double scm_is_real
83
#define scm_is_double scm_is_real
84
#define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,(scm_t_subr)r)
84
#define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,(scm_t_subr)r)
85
#define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
85
#define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
86
#define scm_long2scm scm_long2num
86
#define scm_long2scm scm_from_long
87
#define scm_scm2long(x) scm_num2long(x,SCM_ARG1,"scm2long")
87
#define scm_scm2long(x) scm_to_long(x,SCM_ARG1,"scm2long")
88
#define scm_double2scm scm_from_double
88
#define scm_double2scm scm_from_double
89
#define scm_scm2double scm_to_double
89
#define scm_scm2double scm_to_double
90
#define scm_str2scm scm_from_locale_stringn
90
#define scm_str2scm scm_from_locale_stringn
Lines 103-110 Link Here
103
#define scm_is_double scm_is_real
103
#define scm_is_double scm_is_real
104
#define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,r)
104
#define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,r)
105
#define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
105
#define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
106
#define scm_long2scm scm_long2num
106
#define scm_long2scm scm_from_long
107
#define scm_scm2long(x) scm_num2long(x,SCM_ARG1,"scm2long")
107
#define scm_scm2long(x) scm_to_long(x,SCM_ARG1,"scm2long")
108
#define scm_double2scm scm_from_double
108
#define scm_double2scm scm_from_double
109
#define scm_scm2double scm_to_double
109
#define scm_scm2double scm_to_double
110
#define scm_str2scm scm_from_locale_stringn
110
#define scm_str2scm scm_from_locale_stringn
(-)TeXmacs-1.99.9-src.orig/src/Scheme/Tiny/tinyscheme_tm.cpp (-45 lines)
Lines 139-160 Link Here
139
/******************************************************************************
139
/******************************************************************************
140
 * Evaluation of files
140
 * Evaluation of files
141
 ******************************************************************************/
141
 ******************************************************************************/
142
#if 0
143
static scm
144
TeXmacs_lazy_eval_file (char *file) {
145
	
146
	return scm_internal_lazy_catch (scm_BOOL_T,
147
									(scm_t_catch_body) scm_c_primitive_load, file,
148
									(scm_t_catch_handler) TeXmacs_lazy_catcher, file);
149
}
150
151
static scm
152
TeXmacs_eval_file (char *file) {
153
	return scm_internal_catch (scm_BOOL_T,
154
							   (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
155
							   (scm_t_catch_handler) TeXmacs_catcher, file);
156
}
157
#endif 
158
scm
142
scm
159
eval_scheme_file (string file) {
143
eval_scheme_file (string file) {
160
	//static int cumul= 0;
144
	//static int cumul= 0;
Lines 172-192 Link Here
172
/******************************************************************************
156
/******************************************************************************
173
 * Evaluation of strings
157
 * Evaluation of strings
174
 ******************************************************************************/
158
 ******************************************************************************/
175
#if 0
176
static scm
177
TeXmacs_lazy_eval_string (char *s) {
178
	return scm_internal_lazy_catch (scm_BOOL_T,
179
									(scm_t_catch_body) scm_c_eval_string, s,
180
									(scm_t_catch_handler) TeXmacs_lazy_catcher, s);
181
}
182
183
static scm
184
TeXmacs_eval_string (char *s) {
185
	return scm_internal_catch (scm_BOOL_T,
186
							   (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
187
							   (scm_t_catch_handler) TeXmacs_catcher, s);
188
}
189
#endif
190
scm
159
scm
191
eval_scheme (string s) {
160
eval_scheme (string s) {
192
	// cout << "Eval] " << s << "\n";
161
	// cout << "Eval] " << s << "\n";
Lines 214-234 Link Here
214
		}
183
		}
215
	}
184
	}
216
}
185
}
217
#if 0
218
static scm
219
TeXmacs_lazy_call_scm (arg_list* args) {
220
	return scm_internal_lazy_catch (scm_BOOL_T,
221
									(scm_t_catch_body) TeXmacs_call, (void*) args,
222
									(scm_t_catch_handler) TeXmacs_lazy_catcher, (void*) args);
223
}
224
186
225
static scm
226
TeXmacs_call_scm (arg_list *args) {
227
	return scm_internal_catch (scm_BOOL_T,
228
							   (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
229
							   (scm_t_catch_handler) TeXmacs_catcher, (void*) args);
230
}
231
#endif
232
scm
187
scm
233
call_scheme (scm fun) {
188
call_scheme (scm fun) {
234
	scm a[]= { fun }; arg_list args= { 0, a };
189
	scm a[]= { fun }; arg_list args= { 0, a };

Return to bug 436400