[libchamplain: 8/39] The Perl bindings for champlain-gtk will be in a different package
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain: 8/39] The Perl bindings for champlain-gtk will be in a different package
- Date: Mon, 21 Sep 2009 16:24:24 +0000 (UTC)
commit 86d74620e2bb7877b1963be95977a9b4f63f3b3e
Author: Emmanuel Rodriguez <emmanuel rodriguez booking com>
Date: Tue Sep 15 20:26:25 2009 +0200
The Perl bindings for champlain-gtk will be in a different package
bindings/perl/Champlain/Makefile.PL | 21 +--
bindings/perl/Champlain/champlain-perl.h | 7 -
bindings/perl/Champlain/examples/gtk2.pl | 208 ----------------------
bindings/perl/Champlain/maps-gtk | 1 -
bindings/perl/Champlain/t/Gtk2ChamplainEmbed.t | 27 ---
bindings/perl/Champlain/xs/Gtk2ChamplainEmbed.xs | 13 --
6 files changed, 3 insertions(+), 274 deletions(-)
---
diff --git a/bindings/perl/Champlain/Makefile.PL b/bindings/perl/Champlain/Makefile.PL
index 09e95c5..bf4c9e3 100644
--- a/bindings/perl/Champlain/Makefile.PL
+++ b/bindings/perl/Champlain/Makefile.PL
@@ -6,7 +6,7 @@ use ExtUtils::MakeMaker;
use Cwd;
use File::Spec;
-use Gtk2::CodeGen;
+use Glib::CodeGen;
use Glib::MakeHelper;
use ExtUtils::Depends;
use ExtUtils::PkgConfig;
@@ -41,21 +41,6 @@ sub main {
return;
}
- # If libchamplain-gtk is installed the GTK bindings will be generated
- eval {
- my %conf = ExtUtils::PkgConfig->find("champlain-gtk-$champlain_version");
- $pkgconfig{cflags} .= $conf{cflags} . ' -DCHAMPLAINPERL_GTK';
- $pkgconfig{libs} .= $conf{libs};
-
- # All XS files that start with Gtk2Champlain are for libchamplain-gtk
- push @XS_FILES, <xs/Gtk2Champlain*.xs>;
- push @typemaps, 'maps-gtk';
- push @deps, 'Gtk2';
- };
- if (my $error = $@) {
- warn "Ignoring the Gtk2 bindings ($error)";
- }
-
$DEPENDS = ExtUtils::Depends->new('Champlain', @deps);
$DEPENDS->add_pm(
@@ -64,8 +49,8 @@ sub main {
);
# Code generation
- Gtk2::CodeGen->parse_maps('champlain', input => [ @typemaps ]);
- Gtk2::CodeGen->write_boot(xs_files => [ @XS_FILES ]);
+ Glib::CodeGen->parse_maps('champlain', input => [ @typemaps ]);
+ Glib::CodeGen->write_boot(xs_files => [ @XS_FILES ]);
$DEPENDS->set_inc($pkgconfig{cflags} . ' -I./build');
diff --git a/bindings/perl/Champlain/champlain-perl.h b/bindings/perl/Champlain/champlain-perl.h
index b0c7d9e..41d29a3 100644
--- a/bindings/perl/Champlain/champlain-perl.h
+++ b/bindings/perl/Champlain/champlain-perl.h
@@ -2,15 +2,8 @@
#include <clutter-perl.h>
-
#include <champlain/champlain.h>
-#ifdef CHAMPLAINPERL_GTK
-#include <gtk2perl.h>
-#include <champlain-gtk/champlain-gtk.h>
-#endif
-
-
#include "champlain-autogen.h"
#endif /* _CHAMPLAIN_PERL_H_ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]