Re: gtkada and gnat-gps
Ludovic, thanks for correcting the error about GPS.
Libgtkada-2.24.4 compiles, with two work-arounds:
* control (Build-Depends): remove gnat, replace gnat-4.6 with gnat-4.9
until gnat depends on gnat-4.9
* rules: set "CC=gcc-4.9" after "include debian_packaging.mk"
until gnat-4.9 provides the gnatgcc symlink instead of gnat.
Jacob: in case you decide to work on 3.8.3, the attached diff contains
trivial steps and may gain you some time.
#
# old_revision [789d86360174903f4a7c24b15c3e1db19b561045]
#
# patch "debian/changelog"
# from [03eee6af7ea281102b4c4b367ee350f0e3599a1c]
# to [7d5028a1770c2245fd989ea4c2c2c3082b0bf26a]
#
# patch "debian/control"
# from [9d9918aa3fb6099be5d1a279088f76965fbac006]
# to [60bbe2fdbac257067ecc53965b3c430e7372c4c5]
#
# patch "debian/patches/01-doc.patch"
# from [9d8fb4b335849dee791de3b1aea52a48d51124c0]
# to [0852ad63f79e26958b35fb09ca5d7ef950285241]
#
# patch "debian/patches/04-testgtk.patch"
# from [f8184212fe68511116ef4050833a15ad1ab73f63]
# to [b5c9fca089baab81e95b553b0e4ecf236ea1f6ce]
#
# patch "debian/patches/avoid_hardening_flags_errors.patch"
# from [f74add151f16ff8492ecb582586764774b8b7f6f]
# to [f4a6d7e473045af08f00b5ef19f46d4d406d1595]
#
# patch "debian/patches/include_only_glib_h.patch"
# from [288e55c9ff517fd6c396f5f05b0224eba4819f31]
# to [db91975b81c1554c18c3077a86fa7dda94dc2185]
#
# patch "debian/patches/series"
# from [0364ccca886b8c401db13ae41f0b23a9c5ca5287]
# to [1843afb67271916b7e68bc61a4000dcba50b5fc8]
#
# patch "debian/rules"
# from [7106769d73b59b5c390f50742fb24c1e0e5ab701]
# to [a80f02c8bc0ebcf7fc8ebcd9b9ae0285c62cbdf4]
#
============================================================
--- debian/changelog 03eee6af7ea281102b4c4b367ee350f0e3599a1c
+++ debian/changelog 7d5028a1770c2245fd989ea4c2c2c3082b0bf26a
@@ -1,4 +1,4 @@
-libgtkada (2.24.4-1) unstable; urgency=medium
+libgtkada (3.8.3-1) unstable; urgency=medium
* New upstream release. Updated repackaging (xz), patches, README.source.
* Package renamings per Ada policy. Versioned preinst not needed anymore.
============================================================
--- debian/control 9d9918aa3fb6099be5d1a279088f76965fbac006
+++ debian/control 60bbe2fdbac257067ecc53965b3c430e7372c4c5
@@ -11,13 +11,12 @@ Build-Depends: debhelper (>= 9), dpkg-de
# *-dev are detailed in rules, and shoud be repeated in Depends: *-dev below.
libgnomeui-dev,
libbonoboui2-dev,
- libgtk2.0-dev (>= 2.24.0),
+ libgtk-3-dev,
libgtkgl2.0-dev,
libgdk-pixbuf2.0-dev,
- libcairo-dev,
+ libcairo2-dev,
libpango1.0-dev,
libglib2.0-dev,
- libx11-dev,
libglu1-mesa-dev | libglu-dev,
libgl1-mesa-dev | libgl-dev
Build-Depends-Indep:
@@ -31,20 +30,19 @@ XS-Testsuite: autopkgtest
Vcs-Mtn: www.ada-france.org org.debian.libgtkada2
XS-Testsuite: autopkgtest
-Package: libgtkada2.24.4-dev
+Package: libgtkada3.8.3-dev
Section: libdevel
Architecture: any
Depends: ${ada:Depends},
libgtkada-bin (=${binary:Version}),
- libcairo-dev,
+ libcairo2-dev,
libgdk-pixbuf2.0-dev,
libglib2.0-dev,
- libgtk2.0-dev (>= 2.24.0),
+ libgtk-3-dev,
libpango1.0-dev,
- libx11-dev,
${misc:Depends}
-Suggests: libgnomeada2.24.4-dev (= ${binary:Version}),
- libgtkglada2.24.4-dev (= ${binary:Version}),
+Suggests: libgnomeada3.8.3-dev (= ${binary:Version}),
+ libgtkglada3.8.3-dev (= ${binary:Version}),
libgtkada-doc (= ${binary:Version})
Description: Ada binding for the GTK+ GUI (development files)
GtkAda is a library that allows programmers to write GTK+ applications in the
@@ -52,7 +50,7 @@ Description: Ada binding for the GTK+ GU
.
This package contains the development files and static libraries.
-Package: libgnomeada2.24.4-dev
+Package: libgnomeada3.8.3-dev
Section: libdevel
Architecture: any
Depends: ${ada:Depends},
@@ -66,7 +64,7 @@ Description: Ada binding for the GNOME G
This package contains the development files and static libraries for
GNOME extensions.
-Package: libgtkglada2.24.4-dev
+Package: libgtkglada3.8.3-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends}, ${ada:Depends},
@@ -123,7 +121,7 @@ Description: Ada binding for GTK+ OpenGL
.
This package contains the debugging symbols for the OpenGL extensions.
-Package: libgtkada2.24.4
+Package: libgtkada3.8.3
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -134,7 +132,7 @@ Description: Ada binding for the GTK+ GU
.
This library will let you run Ada applications compiled with GTK+.
-Package: libgnomeada2.24.4
+Package: libgnomeada3.8.3
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -145,7 +143,7 @@ Description: Ada binding for the GNOME G
.
This library will let you run Ada applications compiled with GNOME.
-Package: libgtkglada2.24.4
+Package: libgtkglada3.8.3
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
============================================================
--- debian/patches/01-doc.patch 9d8fb4b335849dee791de3b1aea52a48d51124c0
+++ debian/patches/01-doc.patch 0852ad63f79e26958b35fb09ca5d7ef950285241
@@ -20,7 +20,7 @@ Description: adapt documentation to Debi
.SH NAME
gtkada-config - script to get information about the installed version of GTKADA
.SH SYNOPSIS
-@@ -6,36 +6,40 @@
+@@ -6,35 +6,40 @@
[\-\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] [\-\-static]
.SH DESCRIPTION
.PP
@@ -36,7 +36,6 @@ Description: adapt documentation to Debi
+ gnatmake my_prog `gtkada-config`
+
.SH OPTIONS
--.l
-\fIgtkada-config\fP accepts the following options:
+\fBgtkada-config\fR accepts the following options:
.TP 8
@@ -78,7 +77,7 @@ Description: adapt documentation to Debi
by the GtkAda authors Emmanuel Briot, Joel Brobecker and Arnaud Charlet.
Permission to use, copy, modify, and distribute this documentation
-@@ -43,4 +47,3 @@
+@@ -42,4 +47,3 @@
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation.
============================================================
--- debian/patches/04-testgtk.patch f8184212fe68511116ef4050833a15ad1ab73f63
+++ debian/patches/04-testgtk.patch b5c9fca089baab81e95b553b0e4ecf236ea1f6ce
@@ -6,11 +6,9 @@ every user may build a program depending
so that the tarball provided by the doc package demonstrates how
every user may build a program depending on gtkada.
-Index: b/testgtk/testgtk.gpr
-===================================================================
---- a/testgtk/testgtk.gpr 2011-09-04 00:53:42.000000000 +0200
-+++ b/testgtk/testgtk.gpr 2011-09-04 01:27:43.000000000 +0200
-@@ -1,25 +1,18 @@
+--- a/testgtk/testgtk.gpr
++++ b/testgtk/testgtk.gpr
+@@ -1,26 +1,20 @@
-with "../src/gtkada_src";
-with "../shared";
-with "opengl/testgtk_opengl";
@@ -18,13 +16,12 @@ Index: b/testgtk/testgtk.gpr
+with "gtkada";
+with "gtkglada";
project TestGtk is
--
-- for Languages use ("Ada");
- for Main use ("testgtk.adb", "testcairo.adb");
+
+ for Languages use ("Ada");
+ for Main use ("testgtk.adb");
- for Source_Dirs use ("./");
-- for Object_Dir use "obj/";
+ for Source_Dirs use (".", "opengl");
-+ for Object_Dir use "obj";
+ for Object_Dir use "obj/";
for Exec_Dir use ".";
- package Builder is
@@ -33,7 +30,8 @@ Index: b/testgtk/testgtk.gpr
-
package Compiler is
- for Default_Switches ("Ada") use
-- ("-gnatQ", "-gnatwa", "-gnatay3abcefhiklmnprt", "-g", "-O1");
+- ("-gnatQ", "-gnatwae", "-gnatay3abcefhiklmnprt", "-g", "-O0",
+- "-gnat05");
+ for Default_Switches ("Ada") use ("-g", "-O1", "-gnatafo");
end Compiler;
-
@@ -47,10 +45,8 @@ Index: b/testgtk/testgtk.gpr
+ for Default_Switches ("Ada") use ("-lgtkglada", "-lGLU", "obj/lw.o");
+ end Linker;
end TestGtk;
-Index: b/testgtk/testgtk.mak
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/testgtk/testgtk.mak 2011-09-04 01:17:38.000000000 +0200
+--- /dev/null
++++ b/testgtk/testgtk.mak
@@ -0,0 +1,47 @@
+# -*- Makefile -*- to build testgtk
+# Copyright (c) 2004 Ludovic Brenta <ludovic.brenta@insalien.org>
============================================================
--- debian/patches/avoid_hardening_flags_errors.patch f74add151f16ff8492ecb582586764774b8b7f6f
+++ debian/patches/avoid_hardening_flags_errors.patch f4a6d7e473045af08f00b5ef19f46d4d406d1595
@@ -5,7 +5,7 @@ Author: Nicolas Boulenguez <nicolas@debi
--- a/src/misc.c
+++ b/src/misc.c
-@@ -407,7 +407,7 @@
+@@ -235,7 +235,7 @@
GLogLevelFlags log_level,
const gchar *format)
{
@@ -14,38 +14,3 @@ Author: Nicolas Boulenguez <nicolas@debi
}
void
-@@ -4161,14 +4161,14 @@
- ada_gtk_message_dialog_format_secondary_markup
- (GtkMessageDialog* dialog, gchar* msg)
- {
-- gtk_message_dialog_format_secondary_markup (dialog, msg);
-+ gtk_message_dialog_format_secondary_markup (dialog, "%s", msg);
- }
-
- void
- ada_gtk_message_dialog_format_secondary_text
- (GtkMessageDialog* dialog, gchar* msg)
- {
-- gtk_message_dialog_format_secondary_text (dialog, msg);
-+ gtk_message_dialog_format_secondary_text (dialog, "%s", msg);
- }
-
- GtkWidget*
-@@ -4179,7 +4179,7 @@
- GtkButtonsType buttons,
- const gchar *message)
- {
-- return gtk_message_dialog_new (parent, flags, type, buttons, message);
-+ return gtk_message_dialog_new (parent, flags, type, buttons, "%s", message);
- }
-
- GtkWidget*
-@@ -4191,7 +4191,7 @@
- const gchar *message)
- {
- return gtk_message_dialog_new_with_markup
-- (parent, flags, type, buttons, message);
-+ (parent, flags, type, buttons, "%s", message);
- }
-
- /**************************************************************
============================================================
--- debian/patches/include_only_glib_h.patch 288e55c9ff517fd6c396f5f05b0224eba4819f31
+++ debian/patches/include_only_glib_h.patch db91975b81c1554c18c3077a86fa7dda94dc2185
@@ -1,17 +1,13 @@ Bug-Debian: http://bugs.debian.org/66557
Author: Ludovic Brenta <lbrenta@debian.org>
Subject: Including invidiual glib headers has been deprecated for several years.
Bug-Debian: http://bugs.debian.org/665570
-Index: b/src/misc.c
-===================================================================
--- a/src/misc.c
+++ b/src/misc.c
-@@ -29,8 +29,8 @@
+@@ -34,7 +34,6 @@
+ #include <stdlib.h>
#include <string.h>
-
#include <glib.h>
-#include <glib-object.h>
-+//#include <glib-object.h>
- //#include <glib/gmain.h>
-
#include <pango/pango.h>
-
+ #include <gdk/gdk.h>
+ #include <gtk/gtk.h>
============================================================
--- debian/patches/series 0364ccca886b8c401db13ae41f0b23a9c5ca5287
+++ debian/patches/series 1843afb67271916b7e68bc61a4000dcba50b5fc8
@@ -3,5 +3,5 @@ include_only_glib_h.patch
example_makefiles.patch
avoid_hardening_flags_errors.patch
include_only_glib_h.patch
-avoid_repeating_whole_gpl.diff
+# avoid_repeating_whole_gpl.diff
clean_forgotten_files.diff
============================================================
--- debian/rules 7106769d73b59b5c390f50742fb24c1e0e5ab701
+++ debian/rules a80f02c8bc0ebcf7fc8ebcd9b9ae0285c62cbdf4
@@ -103,12 +103,12 @@ endef # library_template
##########
# The sources, Ada and C, call these C functions:
-# cairo_* gdk_* g_* g_module_* gtk_* pango_* XWarpPointer
+# cairo_* gdk_* g_* g_module_* gtk_* pango_*
# When this list changes, update:
# control: Build-Depends
# control: Depends for libgtkada*-dev
# and this variable:
-gtkada_pkg_config := cairo gdk-2.0 glib-2.0 gmodule-2.0 gtk+-2.0 pango x11
+gtkada_pkg_config := cairo gdk-2.0 glib-2.0 gmodule-2.0 gtk+-3.0 pango
# In case you are wondering, gmodule is part of libglib-dev.
# Compile C files into the object directory, so that gnatlink embeds
Reply to: