1
Change the command names: gate to gate2, dgate to dgate2,
2
gtkada-config to gtkada2-config.
7
===================================================================
8
--- src/gate.in.orig 2006-07-04 07:48:24.000000000 +0200
9
+++ src/gate.in 2006-07-04 08:05:31.000000000 +0200
14
- echo "Usage: gate project-file"
15
+ echo "Usage: gate2 project-file"
22
file=`cd $dir; pwd`/`basename $1`
23
-info=`gate-in.exe -p -s -x $file`
24
+info=`/usr/lib/ada/adalib/gtkada2/bin/gate2-in.exe -p -s -x $file`
27
if [ $stat != 0 ]; then
34
mkdir -p $gt > /dev/null 2>&1
39
-gate-in.exe $file > $tmp/gate.ada
40
+/usr/lib/ada/adalib/gtkada2/bin/gate2-in.exe $file > $tmp/gate.ada
43
echo "Couldn't generate Ada code. Exiting."
47
if [ $conflicts = 1 ]; then
48
- cat $gt/conflicts.txt | gdialog error justify_left
49
+ cat $gt/conflicts.txt | gdialog2 error justify_left
54
===================================================================
55
--- src/gate.sh.orig 2006-07-04 07:48:24.000000000 +0200
56
+++ src/gate.sh 2006-07-04 08:05:31.000000000 +0200
61
- echo "Usage: gate project-file" | gdialog error justify_left
62
+ echo "Usage: gate2 project-file" | gdialog2 error justify_left
66
dir=`dirname $1|sed -e 's$\\\\$/$g'`
67
file=`cd $dir; pwd`/`basename $1`
68
-info=`gate-in.exe -p -s -x $file`
69
+info=`gate2-in.exe -p -s -x $file`
72
- echo "Couldn't parse $file. Exiting." | gdialog error justify_left
73
+ echo "Couldn't parse $file. Exiting." | gdialog2 error justify_left
81
- echo "Couldn't change to $dir/$srcdir, aborting." | gdialog error justify_left
82
+ echo "Couldn't change to $dir/$srcdir, aborting." | gdialog2 error justify_left
87
-mkdir -p .gate > /dev/null 2>&1
89
+mkdir -p .gate2 > /dev/null 2>&1
90
mkdir -p $gt > /dev/null 2>&1
97
-gate-in.exe $file | grep -v Gtk-WARNING > $tmp/gate.ada
98
+gate2-in.exe $file | grep -v Gtk-WARNING > $tmp/gate.ada
101
- echo "Couldn't generate Ada code. Exiting." | gdialog error justify_left
102
+ echo "Couldn't generate Ada code. Exiting." | gdialog2 error justify_left
110
- # cat $out | gdialog information justify_fill
111
+ # cat $out | gdialog2 information justify_fill
113
echo "The following files have been updated in $psrcdir:" > $out
116
echo Files with the ".rej" extension have been generated to help merging>>$out
117
echo manually if needed.>> $out
119
- cat $out | gdialog error justify_fill
120
+ cat $out | gdialog2 error justify_fill
124
Index: src/generate.pl
125
===================================================================
126
--- src/generate.pl.orig 2006-07-04 07:48:24.000000000 +0200
127
+++ src/generate.pl 2006-07-04 08:05:31.000000000 +0200
129
-#! /usr/bin/env perl
135
- print "Syntax : generate.pl [switches] file_name [definition-file unit_name]\n";
136
+ print "Syntax : generate2.pl [switches] file_name [definition-file unit_name]\n";
137
print " -l : simply list the functions defined in the file (c or Ada)\n";
138
print " The arguments are then file_name_1 file_name_2]\n";
139
print " If file_name_2 is present, the output will only show the difference\n";
141
print " definition_file : file to parse for the struct definition\n";
142
print " unit_name : if present, only the functions including this name will be \n";
143
print " generated\n";
144
- print " ex/ generate.pl ../include/gdk/gdk.h ../include/gdk/gdktypes.h window\n";
145
- print " ex/ generate.pl ../include/gtk/gtkframe.h\n";
146
+ print " ex/ generate2.pl ../include/gdk/gdk.h ../include/gdk/gdktypes.h window\n";
147
+ print " ex/ generate2.pl ../include/gtk/gtkframe.h\n";
151
Index: src/glade/glade.ads
152
===================================================================
153
--- src/glade/glade.ads.orig 2006-07-04 07:48:24.000000000 +0200
154
+++ src/glade/glade.ads 2006-07-04 08:05:31.000000000 +0200
159
- pragma Linker_Options ("-lgtkada_glade");
160
+ pragma Linker_Options ("-lgtkada2_glade");
162
--------------------------------------------
163
-- dynamic loading of libglade extensions --
164
Index: src/gtkada-config.in
165
===================================================================
166
--- src/gtkada-config.in.orig 2006-07-04 07:48:24.000000000 +0200
167
+++ src/gtkada-config.in 2006-07-04 08:07:51.000000000 +0200
171
gtk_libs="@GTK_LIBS@"
172
-gtkada_libs="-L$prefix/lib/gtkada"
173
-gtkada_cflags="-aI$prefix/include/gtkada -aO$prefix/lib/gtkada"
174
-gtkada_lflags="-lgtkada"
175
+gtkada_libs="-L$prefix/lib"
176
+gtkada_cflags="-aI$prefix/share/ada/adainclude/gtkada2 -aO$prefix/lib/adalib/gtkada2"
177
+gtkada_lflags="-lgtkada2"
185
- gtkada_libs="$prefix/lib/gtkada/libgtkada.a"
186
+ gtkada_libs="$prefix/lib/libgtkada2.a"
190
Index: src/opengl/gdk-gl.adb
191
===================================================================
192
--- src/opengl/gdk-gl.adb.orig 2006-07-04 07:48:24.000000000 +0200
193
+++ src/opengl/gdk-gl.adb 2006-07-04 08:05:31.000000000 +0200
196
package body Gdk.GL is
198
- pragma Linker_Options ("-lgtkada_gl");
199
+ pragma Linker_Options ("-lgtkada2_gl");
added
removed
patches/02-commands.patch
