[gtkada] [PATCH] Rename gdialog to gtkada-dialog
Michael Trim
mike.trim at gmail.com
Fri Jun 19 01:20:22 CEST 2009
The patch below renames the gdialog executable to gtkada-dialog. This
avoids a conflict with the gdialog binary provided by Zenity on GNOME
systems. See the following bug reports for more information.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=497464
https://bugs.launchpad.net/bugs/280188
--
Index: src/tools/Makefile.in
===================================================================
--- src/tools/Makefile.in (revision 146019)
+++ src/tools/Makefile.in (working copy)
@@ -7,7 +7,7 @@
GATE = gate
endif
-GDIALOG = gdialog
+GDIALOG = gtkada-dialog
GTKADA_CONFIG = gtkada-config
GNATMAKELDFLAGS = -largs -L../lib-obj -lgtkada $(GTK_LIBS)
Index: src/tools/gate.in
===================================================================
--- src/tools/gate.in (revision 146019)
+++ src/tools/gate.in (working copy)
@@ -105,7 +105,7 @@
done
if [ $conflicts = 1 ]; then
- cat $gt/conflicts.txt | gdialog error justify_left
+ cat $gt/conflicts.txt | gtkada-dialog error justify_left
fi
echo done.
@@ -136,7 +136,7 @@
echo " "$j
done
- cat << EOF | gdialog error justify_left
+ cat << EOF | gtkada-dialog error justify_left
Merge of some changes failed. It usually means that some modified code
is obsolete in the current project file.
.rej files have been generated to help merging manually if needed.
Index: src/tools/tools.gpr
===================================================================
--- src/tools/tools.gpr (revision 146019)
+++ src/tools/tools.gpr (working copy)
@@ -8,6 +8,7 @@
package Builder is
for Default_Switches ("Ada") use Shared.Builder'Default_Switches ("Ada");
for Executable ("gate.adb") use "gate-in.exe";
+ for Executable ("gdialog.adb") use "gtkada-dialog";
end Builder;
package Compiler renames Shared.Compiler;
Index: src/tools/gdialog.adb
===================================================================
--- src/tools/gdialog.adb (revision 146019)
+++ src/tools/gdialog.adb (working copy)
@@ -23,7 +23,7 @@
--
-- Example using a unix-like shell:
--
--- $ cat << EOF | gdialog error justify_fill
+-- $ cat << EOF | gtkada-dialog error justify_fill
-- > Merge of some changes failed. It usually means that some modified code
-- > is obsolete in the current project file.
-- >
More information about the gtkada
mailing list