Package: derivations / 0.53.20120414-1.2

build_fixes Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
diff -u derivations-0.52.20100310/debian/changelog derivations-0.52.20100310/debian/changelog
--- derivations-0.52.20100310.orig/btool/Makefile-optim
+++ derivations-0.52.20100310/btool/Makefile-optim
@@ -1,2 +1,2 @@
 optim  := -O2
-werror := $(if $(BUILD_FOR_PACKAGING), , -Werror)
+#werror := $(if $(BUILD_FOR_PACKAGING), , -Werror)
only in patch2:
unchanged:
--- derivations-0.52.20100310.orig/btool/Makefile
+++ derivations-0.52.20100310/btool/Makefile
@@ -33,16 +33,16 @@
 allobj: $(allobj)
 $(foreach dir, $(srcdir), $(dir)/%): FORCE; $(MAKE) -C $(@D) $(@F)
 %.d: %.cc; g++ -MM $< | sed -e 's/:/ $*.d:/' >$@
-%.o:; g++ $(warn) $(optim) -c $< -o $*.o
+%.o: %.cc; g++ $(warn) $(optim) -c $< -o $*.o
 
 complete-pdf: complete-pdf.o $(allobj)
-	g++ $(warn) $(optim) -lpoppler $^ -o $@
+	g++ $(warn) $(optim) $^ -lpoppler -o $@
 
 romanize: romanize.o Util/roman_numeral.o
 	g++ $(warn) $(optim) $^ -o $@
 
 a.out: test.o $(allobj)
-	g++ $(warn) $(optim) -lpoppler $^ -o $@
+	g++ $(warn) $(optim) $^ -lpoppler -o $@
 
 cleanless:
 	$(foreach dir, $(srcdir), $(MAKE) -C $(dir) clean ;)
only in patch2:
unchanged:
--- derivations-0.52.20100310.orig/btool/Util/TeX_atom.cc
+++ derivations-0.52.20100310/btool/Util/TeX_atom.cc
@@ -76,11 +76,11 @@
 }
 
 void Util::TeX_atom_nonterminal::init(
-  vector      ::const_iterator p,
-  const vector::const_iterator end
+  vector<std::string>      ::const_iterator p,
+  const vector<std::string>::const_iterator end
 ) {
   int level = 0;
-  vector::const_iterator q = end;
+  vector<std::string>::const_iterator q = end;
   for ( ; p != end; ++p ) {
     if      ( *p == "{" ) {
       if ( !level ) q = p+1;
@@ -114,20 +114,20 @@
 Util::TeX_atom_nonterminal::TeX_atom_nonterminal(
   const string &line
 ) {
-  vector tokens;
+  vector<std::string> tokens;
   tokenize_TeX( line, &tokens, TRANSLATE_NOBREAKSPACE );
   init( tokens.begin(), tokens.end() );
 }
 
 Util::TeX_atom_nonterminal::TeX_atom_nonterminal(
-  const vector &tokens
+  const vector<std::string> &tokens
 ) {
   init( tokens.begin(), tokens.end() );
 }
 
 Util::TeX_atom_nonterminal::TeX_atom_nonterminal(
-  const vector::const_iterator begin,
-  const vector::const_iterator end
+  const vector<std::string>::const_iterator begin,
+  const vector<std::string>::const_iterator end
 ) {
   init( begin, end );
 }